diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue
index 7a606f0..5fd8dad 100644
--- a/src/views/modules/changeManagement/changeRecord.vue
+++ b/src/views/modules/changeManagement/changeRecord.vue
@@ -469,11 +469,50 @@
-
-
- 制造成本变更
-
+
+
+
制造成本变更
+
+
+
+
+
+
+
+
+
+
+
+ 工艺变更费用
+ 材料变更费用
+ 模具变更费用
+ 其他
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4184,9 +4223,12 @@
requestDetailSearch(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.chooseDataList = data.rows
-
this.$set(this.modalData,'manuFacturingFlag',data.rows[0].manuFacturingFlag)
- this.selectedOptions1 = data.rows[0].manuFacturingType.split(';')
+ this.$set(this.modalData,'manuFacturingType',data.rows[0].manuFacturingType)
+ // 回显多选框
+ if (data.rows[0].manuFacturingType != null) {
+ this.selectedOptions1 = data.rows[0].manuFacturingType.split(';')
+ }
this.$set(this.modalData,'manuFacturingCostRemark1',data.rows[0].manuFacturingCostRemark1)
this.$set(this.modalData,'quotationFlag',data.rows[0].quotationFlag)
this.$set(this.modalData,'manuFacturingCostRemark2',data.rows[0].manuFacturingCostRemark2)
diff --git a/src/views/modules/changeManagement/changeRequest.vue b/src/views/modules/changeManagement/changeRequest.vue
index 701abfb..c9a9770 100644
--- a/src/views/modules/changeManagement/changeRequest.vue
+++ b/src/views/modules/changeManagement/changeRequest.vue
@@ -460,11 +460,49 @@
-
-
- 制造成本变更
-
+
+
制造成本变更
+
+
+
+
+
+
+
+
+
+
+
+ 工艺变更费用
+ 材料变更费用
+ 模具变更费用
+ 其他
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2572,8 +2610,14 @@
cqcOperatorId: '',
cqcOperatorName: '',
faiOperatorId: '',
- faiOperatorName: ''
+ faiOperatorName: '',
+ manuFacturingFlag: 'N',
+ manuFacturingType: '',
+ manuFacturingCostRemark1: '',
+ quotationFlag: 'N',
+ manuFacturingCostRemark2: ''
}
+ this.selectedOptions1 = []
this.changeTitle = '变更申请-' + this.modalData.changeNo
this.costImpactData = {
site: this.$store.state.user.site,
@@ -2805,6 +2849,14 @@
return
}
}
+ if (this.modalData.manuFacturingFlag === 'Y' && !this.selectedOptions1.length > 0){
+ this.$message.warning('请选择制造费用变更项！')
+ return
+ }
+ if (this.modalData.quotationFlag === 'Y' && (this.modalData.manuFacturingCostRemark2 == '' ||this.modalData.manuFacturingCostRemark2 == null)) {
+ this.$message.warning('请填写重新报价说明！')
+ return
+ }
this.saveDataLoading = true
this.costImpactData.changeTotalCost = this.totalCost