|
|
@ -942,8 +942,8 @@ |
|
|
itemRemark: row.itemRemark, |
|
|
itemRemark: row.itemRemark, |
|
|
itemType: 'A', |
|
|
itemType: 'A', |
|
|
updateBy: this.$store.state.user.name, |
|
|
updateBy: this.$store.state.user.name, |
|
|
imageFlag: row.imageFlag, |
|
|
|
|
|
produceControlFlag: row.produceControlFlag, |
|
|
|
|
|
|
|
|
imageFlag: row.imageFlag === 'Y' ? 'Y' : '', |
|
|
|
|
|
produceControlFlag: row.produceControlFlag === 'Y' ? 'Y' : '', |
|
|
checkType: row.checkType |
|
|
checkType: row.checkType |
|
|
} |
|
|
} |
|
|
this.modalDisableFlag = true |
|
|
this.modalDisableFlag = true |
|
|
@ -1021,8 +1021,9 @@ |
|
|
Rule2 += obj2[i].value + ',' |
|
|
Rule2 += obj2[i].value + ',' |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
Rule1 = Rule1.substring(0,Rule1.length-1) |
|
|
|
|
|
Rule2 = Rule2.substring(0,Rule2.length-1) |
|
|
|
|
|
|
|
|
// 处理复选框值:勾选为Y,未勾选为N |
|
|
|
|
|
Rule1 = Rule1.length > 0 ? Rule1.substring(0, Rule1.length - 1) : 'N' |
|
|
|
|
|
Rule2 = Rule2.length > 0 ? Rule2.substring(0, Rule2.length - 1) : 'N' |
|
|
this.modalData.imageFlag = Rule1 |
|
|
this.modalData.imageFlag = Rule1 |
|
|
this.modalData.produceControlFlag = Rule2 |
|
|
this.modalData.produceControlFlag = Rule2 |
|
|
if (this.modalData.flag === '1') { |
|
|
if (this.modalData.flag === '1') { |
|
|
|