diff --git a/src/pu/dhjyd/dhjydmaster/main/index.js b/src/pu/dhjyd/dhjydmaster/main/index.js index 9dc3fa7..86f51dd 100644 --- a/src/pu/dhjyd/dhjydmaster/main/index.js +++ b/src/pu/dhjyd/dhjydmaster/main/index.js @@ -250,7 +250,8 @@ const FIELDS = { // 字段编码 CODE: 'code', PK_ORG: 'pk_org', PRIMARYKEY: 'pk_chekbill_h', - BRECHECK: 'brecheck' + BRECHECK: 'brecheck', //不合格数量 + NNUM: 'nnum' //检验数量 } //2 编辑模式变量 @@ -2025,7 +2026,7 @@ export class ApplicationPage extends Component { }); //控制修改的合格数量/不合格数量不能大于原数量 - let bodyList = saveData.bodys['dhjydSlave0Sub'].rows || [] + /*let bodyList = saveData.bodys['dhjydSlave0Sub'].rows || [] let info = this.props.getUrlParam('info') ? JSON.parse(this.props.getUrlParam('info')).bodys['dhjydSlave0Sub'].rows : [] let oldNum = info.map(item => { return { @@ -2034,8 +2035,8 @@ export class ApplicationPage extends Component { def2: item.values['def2'], // 数量 nchecknum: item.values['nchecknum'], // 检验数量 } - }) - let msg = '' + })*/ + // let msg = '' // 只有不合格检验单才需要判断数量 // bodyList.forEach((row, i) => { // oldNum.forEach(old => { @@ -2046,9 +2047,23 @@ export class ApplicationPage extends Component { // } // }) // }) - if (msg.length > 1) { + /*if (msg.length > 1) { toast({color: 'danger', content: msg}); return false + }*/ + //控制[不合格检验单]的子表的数量之和需要等于检验数量 + if (this.config.appcode == '4004012H9400') { + let bodyList = saveData.bodys['dhjydSlave0Sub'].rows || [] + let nnum = saveData.head['dhjydMasterForm'].rows[0].values[FIELDS.NNUM].value + let def2Total = 0 + bodyList.forEach((row, i) => { + //todo qualifiednum临时用合格数量, 后面模板修改后需替换成def2 + def2Total += row.values['qualifiednum'].value * 1 + }) + if (def2Total != nnum * 1) { + toast({color: 'danger', content: '子表数量之和需要等于检验数量,请检查'}); + return false + } } // 保存前执行校验公式 @@ -2118,6 +2133,21 @@ export class ApplicationPage extends Component { areaInfo.tableId.forEach(areacode => { tableTypeObj[areacode] = 'editTable' }); + + //控制[不合格检验单]的子表的数量之和需要等于检验数量 + if (this.config.appcode == '4004012H9400') { + let bodyList = saveData.bodys['dhjydSlave0Sub'].rows || [] + let nnum = saveData.head['dhjydMasterForm'].rows[0].values[FIELDS.NNUM].value + let def2Total = 0 + bodyList.forEach((row, i) => { + //todo qualifiednum临时用合格数量, 后面模板修改后需替换成def2 + def2Total += row.values['qualifiednum'].value * 1 + }) + if (def2Total != nnum * 1) { + toast({color: 'danger', content: '子表数量之和需要等于检验数量,请检查'}); + return false + } + } // 保存前执行校验公式 this.props.validateToSave(saveData, () => { // 保存请求