diff --git a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue index 6c9e0e8..1d5149f 100644 --- a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue +++ b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue @@ -611,7 +611,7 @@ export default { rules: { plate: [{ required: true, message: '请输入', trigger: 'blur' }], material: [{ required: true, message: '请输入', trigger: 'blur' }], - isGlassCake: [{ required: true, message: '请选择', trigger: 'blur' }], + // isGlassCake: [{ required: true, message: '请选择', trigger: 'blur' }], isPrint: [{ required: true, message: '请选择', trigger: 'blur' }], dueDate: [{ required: true, message: '请选择', trigger: 'blur' }], partCode: [{ required: true, message: '请选择', trigger: 'blur' }], @@ -844,7 +844,7 @@ export default { this.formData.goldMark = true; } } - this.formData.isClassCake = true; + // this.formData.isClassCake = true; }); }, @@ -993,8 +993,11 @@ export default { authorizedAccomplish({ dsPart: this.formData, partList: this.data }).then(res => { this.$message.success('操作成功'); + this.submitLoading = false; this.cancel(flag, res.data); - }); + }).catch(err => { + this.submitLoading = false; + }) } else { this.submitLoading = false; } diff --git a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue index b69380c..10a5762 100644 --- a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue +++ b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue @@ -931,7 +931,7 @@ export default { return { ...process, - label: ppsName, + label: ppsNo+'-'+ppsName, rawData: { partCode: partInfo.partCode, partId: partInfo.id,