From e2ae0fb3f28ea3d5a4772256f80000f6f8557d7c Mon Sep 17 00:00:00 2001
From: xyz <747050115@qq.com>
Date: Thu, 24 Oct 2024 14:23:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E5=8D=95=20=E6=A0=A1=E9=AA=8C=E5=AD=90=E8=A1=A8=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E4=B9=8B=E5=90=8E=E9=9C=80=E7=AD=89=E4=BA=8E=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pu/dhjyd/dhjydmaster/main/index.js | 40 ++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 5 deletions(-)

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, () => {
 			// 保存请求