diff --git a/src/views/processManagement/components/addTemplateDialog.vue b/src/views/processManagement/components/addTemplateDialog.vue index f377bfa..e96f143 100644 --- a/src/views/processManagement/components/addTemplateDialog.vue +++ b/src/views/processManagement/components/addTemplateDialog.vue @@ -343,9 +343,13 @@ import { update, getDetail, getProcessAbilityList, - getPlatingList + getPlatingList, } from '@/api/processManagement/processTemplate'; -import { getProject, getStandardList,getCraftAbilityList } from '@/api/processManagement/taskProcessing'; +import { + getProject, + getStandardList, + getCraftAbilityList, +} from '@/api/processManagement/taskProcessing'; import { getList } from '@/api/processManagement/basicProcesses'; import { getWorkCenterList } from '@/api/processManagement/addQuantity'; import pinyin from 'pinyin'; @@ -632,7 +636,7 @@ export default { getDetail(this.updateRow.id).then(res => { this.ruleForm.promodel = res.data.data.dsProModelEntity; // 确保字段名匹配 - + this.ruleForm.promodel.platingType = this.ruleForm.promodel.platingType + ''; this.ruleForm.tableData = res.data.data.proDetailVOList; this.ruleForm.tableData.forEach(item => { item.ppsId = item.ppsId + ''; @@ -678,7 +682,7 @@ export default { _tempId: this.tempId, // 临时唯一标识 id: null, processNo: this.getProcessNo(this.ruleForm.tableData), - isMain:'2' + isMain: '2', }); } if (this.activeName == '2') { @@ -797,7 +801,7 @@ export default { console.log('提交数据:', query); // 修改 - if (this.title=='修改') { + if (this.title == '修改') { update() .then(res => { this.formLoading = false; diff --git a/src/views/processManagement/processTemplate.vue b/src/views/processManagement/processTemplate.vue index 52e7a97..254c5c8 100644 --- a/src/views/processManagement/processTemplate.vue +++ b/src/views/processManagement/processTemplate.vue @@ -266,6 +266,7 @@ export default { updateFn(row) { this.isTemplateOpen = true; this.moldAddMore = true; + row.platingType = row.platingType+'' this.updateRow = row; this.title = '修改'; }, diff --git a/src/views/processManagement/sinTer/index.vue b/src/views/processManagement/sinTer/index.vue index 1040d2b..099a79b 100644 --- a/src/views/processManagement/sinTer/index.vue +++ b/src/views/processManagement/sinTer/index.vue @@ -295,8 +295,8 @@ export default { color: '#fff', formatter: params => { const nodeData = params.data || params; - const quotaText = - nodeData.quota >= 0 || nodeData.quota != null ? `${nodeData.quota}个` : ''; + nodeData.quota = nodeData.quota==-1?null:nodeData.quota + const quotaText = nodeData.quota != null ? `${nodeData.quota}个` : ''; let result = `${nodeData.partCode}\n${nodeData.name}`; if (quotaText) { result += '\n' + quotaText;