diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue
index ccf72bb..6052c36 100644
--- a/src/views/modules/changeManagement/changeRecord.vue
+++ b/src/views/modules/changeManagement/changeRecord.vue
@@ -469,6 +469,11 @@
+
+
+ 制造成本变更
+
+
@@ -688,6 +693,46 @@
+
+
+
+
+
+
+
+
+
+
+
+ 工艺变更费用
+ 材料变更费用
+ 模具变更费用
+ 其他
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 关闭
+
+
@@ -1671,6 +1716,7 @@
plmChangeExecutionInfoArr: [],
plmChangeItemArr: [],
plmChangeCountersignatureItemArr: [],
+ selectedOptions1:[],
// ======== 数据对象 ========
modalData: {
site: this.$store.state.user.site,
@@ -3079,6 +3125,7 @@
modalFlag: false,
showModalFlag: false,
modalDisableFlag: false,
+ manuFacturingCostFlag: false,
ecnTypeModalFlag: false,
chooseModelFlag: false,
chooseModelFlag2: false,
@@ -3252,6 +3299,30 @@
})
this.chooseModelFlag2 = true
},
+ chooseManuFacturingCostModal () {
+ this.manuFacturingCostFlag = true
+ },
+ // 选择变更费用
+ selectedOptions1Change(){
+ this.modalData.manuFacturingType = this.selectedOptions1.join(';')
+ },
+ // 保存 制造费用变更
+ saveManuFacturingCostData(){
+ 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.manuFacturingCostFlag = false
+ console.log(this.modalData.manuFacturingFlag)
+ console.log(this.modalData.manuFacturingType)
+ console.log(this.modalData.manuFacturingCostRemark1)
+ console.log(this.modalData.quotationFlag)
+ console.log(this.modalData.manuFacturingCostRemark2)
+ },
// 选择会签模板属性
chooseCSModel () {
@@ -4113,6 +4184,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,'manuFacturingCostRemark1',data.rows[0].manuFacturingCostRemark1)
+ this.$set(this.modalData,'quotationFlag',data.rows[0].quotationFlag)
+ this.$set(this.modalData,'manuFacturingCostRemark2',data.rows[0].manuFacturingCostRemark2)
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
diff --git a/src/views/modules/changeManagement/changeRequest.vue b/src/views/modules/changeManagement/changeRequest.vue
index 5e778b7..9b64515 100644
--- a/src/views/modules/changeManagement/changeRequest.vue
+++ b/src/views/modules/changeManagement/changeRequest.vue
@@ -460,6 +460,11 @@
+
+
+ 制造成本变更
+
+
@@ -643,6 +648,47 @@
+
+
+
+
+
+
+
+
+
+
+
+ 工艺变更费用
+ 材料变更费用
+ 模具变更费用
+ 其他
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 关闭
+
+
+
@@ -1171,6 +1217,8 @@
codeNo: '',
buNo: '',
},
+ // 多选框
+ selectedOptions1: [],
// ======== 数据对象 ========
modalData: {
site: this.$store.state.user.site,
@@ -1207,7 +1255,12 @@
cqcOperatorName: '',
faiOperatorId: '',
faiOperatorName: '',
- showInQueryFlag: ''
+ showInQueryFlag: '',
+ manuFacturingType: '',
+ manuFacturingFlag: 'N',
+ quotationFlag: 'N',
+ manuFacturingCostRemark1: '',
+ manuFacturingCostRemark2: ''
},
costImpactData: {
site: this.$store.state.user.site,
@@ -2211,6 +2264,7 @@
modalFlag: false,
modalDisableFlag: false,
EcnTypeModalFlag: false,
+ manuFacturingCostFlag: false,
chooseModelFlag: false,
chooseModelFlag2: false,
chooseCSModelFlag: false,
@@ -2617,6 +2671,22 @@
this.saveDataLoading = false
})
},
+ // 选择变更费用
+ selectedOptions1Change(){
+ this.modalData.manuFacturingType = this.selectedOptions1.join(';')
+ },
+ // 保存 制造费用变更
+ saveManuFacturingCostData(){
+ 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.manuFacturingCostFlag = false
+ },
// 跳转变更申请
toMenu () {
@@ -2832,6 +2902,10 @@
chooseEcnTypeModal () {
this.EcnTypeModalFlag = true
},
+ // 制造成本变更模态框
+ chooseManuFacturingCostModal () {
+ this.manuFacturingCostFlag = true
+ },
// 查询ECN种类数据
getEcnTypeData () {