From 97c9b824664f634cbccb56a0cfe673f3d7b1f48d Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Fri, 3 Apr 2026 11:23:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][upd?=
 =?UTF-8?q?ate]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/StepComponents/ry/zlfz.vue | 90 +++++++++++++++-------
 .../business/comps/template/comps/dl/DL020.vue     | 25 +++---
 .../business/comps/template/comps/dl/DL021.vue     |  1 -
 .../template/dialog/SelectMixReagentDialog.vue     |  2 +
 4 files changed, 77 insertions(+), 41 deletions(-)

diff --git a/src/components/Template/StepComponents/ry/zlfz.vue b/src/components/Template/StepComponents/ry/zlfz.vue
index 1400862..ff5a65b 100644
--- a/src/components/Template/StepComponents/ry/zlfz.vue
+++ b/src/components/Template/StepComponents/ry/zlfz.vue
@@ -1,16 +1,14 @@
 <!-- 质量分装 -->
 <template>
-    <StepFormPackage :fieldItemLabel = "fieldItemLabel"
-    @onRegentSubmit = "onRegentSubmit"
-     ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_zlfz'" @resetRecord="resetRecord" :form-config="formConfig"
-     @onSubPackageSubmit="onSubPackageSubmit"
-        :formData="formData" />
+    <StepFormPackage :fieldItemLabel="fieldItemLabel" @onRegentSubmit="onRegentSubmit" ref="stepFormPackageRef"
+        :prefixKey="stepIndex + '_' + 'ry_zlfz'" @resetRecord="resetRecord" :form-config="formConfig"
+        @onSubPackageSubmit="onSubPackageSubmit" :formData="formData" />
 </template>
 
 <script>
 import StepFormPackage from '@/components/Template/StepFormPackage.vue';
 import stepMixins from '@/components/Template/mixins/stepMixins.js';
-
+import { compareVolume } from '@/utils/volumeTools.js';
 export default {
     mixins: [stepMixins],
     components: {
@@ -40,8 +38,8 @@ export default {
                     }
                 },
                 {
-                    config:{
-                        zlfz:{
+                    config: {
+                        zlfz: {
                             type: "zlfz",
                         }
                     }
@@ -50,31 +48,67 @@ export default {
         }
     },
     methods: {
-        onRegentSubmit(data){
-            console.log(data,"onRegentSubmit")
-            const {key,selectInfo} = data;
-            if(key === 'gsp'){//供试品弹窗确定
-                this.$refs.stepFormPackageRef.updateZlfzData("zlfz",{mybh:selectInfo.selectedId});
+        onRegentSubmit(data) {
+            console.log(data, "onRegentSubmit")
+            const { key, selectInfo } = data;
+
+            if (key === 'gsp') {//供试品弹窗确定
+                const { row = {} } = selectInfo;
+                const gspInfo = {//供试品信息
+                    max: row.kc,//最大库存数量
+                    maxUnit: row.kcdw,//最大库存单位
+                }
+                
+                this.$refs.stepFormPackageRef.updateFormData("gspInfo", gspInfo);
+                this.$refs.stepFormPackageRef.updateZlfzData("zlfz", { mybh: selectInfo.selectedId });
                 // this.formData[key] = data;
 
             }
         },
-        async onSubPackageSubmit(data){
-            const {key} = data;
-            if(key === 'zlfz'){
-                const formData = await this.$refs.stepFormPackageRef.getFormData();
-                if(formData){
-                    const {zlfz} = formData;
-                    const fzInfo = {
-                        ...zlfz.formData,
-                        fzList:zlfz.fzList,
-                    };
-                    this.$refs.stepFormPackageRef.updateFormData("fzInfo",fzInfo);
-                    this.$message.success("质量分装成功");
-                    this.justUpdateFilledFormData();
-                }
-                
+        async onSubPackageSubmit(data) {
+            const { key } = data;
+            if (key === 'zlfz') {
+                this.$refs.stepFormPackageRef.getFormData().then(res => {
+                    console.log(res, "res")
+                    if (res) {
+                        const { zlfz } = res;
+                        const gspInfo = res.gspInfo || this.formData.gspInfo || {};
+                        const { max, maxUnit } = gspInfo;
+                        const dw = zlfz.formData.dw;
+                        const errMsg = "分装后小份容量之和大于母液容量，是否确认分装？"
+                        const totalVolume = zlfz.fzList.reduce((acc, cur) => acc + Number(cur.actnum), 0);
+                        const compareResult = compareVolume(totalVolume, dw, max, maxUnit);
+                        const fzInfo = {
+                            ...zlfz.formData,
+                            fzList: zlfz.fzList,
+                        };
+                        if (compareResult > 0 || !max) {//没有填写实际溶液体积的也需要提示错误信息
+                            this.$modal.confirm(errMsg, '提示', {
+                                confirmButtonText: this.$t('form.saveConfirm'),
+                                cancelButtonText: this.$t('form.cancel'),
+                                type: 'warning'
+                            }).then(() => {
+                                this.submitEmit(fzInfo);
+                            }).catch(() => {
+                                // 取消操作，不执行任何操作
+                            });
+                            return;
+                        }
+                        this.submitEmit(fzInfo);
+
+                    }
+                }).catch(err => {
+                    console.log(err, "err")
+                    this.$message.error("请填写分装信息");
+                })
+
+
             }
+        },
+        submitEmit(fzInfo) {
+            this.$refs.stepFormPackageRef.updateFormData("fzInfo", fzInfo);
+            this.$message.success("质量分装成功");
+            this.justUpdateFilledFormData();
         }
     }
 }
diff --git a/src/views/business/comps/template/comps/dl/DL020.vue b/src/views/business/comps/template/comps/dl/DL020.vue
index ca60b8e..abe5d69 100644
--- a/src/views/business/comps/template/comps/dl/DL020.vue
+++ b/src/views/business/comps/template/comps/dl/DL020.vue
@@ -2,21 +2,21 @@
 <template>
 	<div>
 		<div class="detail-container">
-			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc }}<img src="@/assets/images/detail-title.png" /></div>
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc }}<img
+					src="@/assets/images/detail-title.png" /></div>
 			<div class="detail-content">
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
 
-          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
 					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.xbxx" label="template.dl.dl020.xbxx"
-						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData"
-						/>
+						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData" />
 
-          <LineLabel label="template.dl.dl020.czbz" />
-          <Step ref="stepRef" :formData="formData.stepData"></Step>
+					<LineLabel label="template.dl.dl020.czbz" />
+					<Step ref="stepRef" :formData="formData.stepData"></Step>
 					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.dlbz" label="template.dl.dl020.dlbz"
 						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
 				</div>
@@ -116,11 +116,11 @@ export default {
 					type: "cellItem",
 					config: {
 						qxbd: {
-							span:1,
+							span: 1,
 							label: 'template.dl.dl020.qxbd',
 							type: 'qxbd',
 							fillType: 'actFill',
-							filledCodes:['bdmc','bdbh'],
+							filledCodes: ['bdmc', 'bdbh'],
 						},
 					}
 				},
@@ -129,16 +129,16 @@ export default {
 	},
 	data() {
 		return {
-			formData: {},
 		};
 	},
 	mounted() {
+		console.log(this.formData,"formData")
 	},
 	methods: {
 		//获取已填写的表单数据
-		async getFilledFormData() {
-      let content = await this.validFormFields(["baseInfoRef", "swypyjInfoRef", "stepRef", "remarkRef"]);
-			return content;
+		getFilledFormData() {
+			return this.getFilledFormDataByRefs(["baseInfoRef", "swypyjInfoRef", "stepRef", "remarkRef"]);
+		
 		},
 		//获取填写完成的表单数据
 		async getFormData() {
@@ -180,6 +180,7 @@ export default {
 .print-btn {
 	margin-bottom: 20px;
 }
+
 .config-header-end {
 	display: flex;
 	justify-content: flex-end;
diff --git a/src/views/business/comps/template/comps/dl/DL021.vue b/src/views/business/comps/template/comps/dl/DL021.vue
index 325998f..9901c82 100644
--- a/src/views/business/comps/template/comps/dl/DL021.vue
+++ b/src/views/business/comps/template/comps/dl/DL021.vue
@@ -176,7 +176,6 @@ export default {
 	},
 	data() {
 		return {
-			formData: {},
 		};
 	},
 	mounted() {
diff --git a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue
index 2ab9f8f..ff36f99 100644
--- a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue
+++ b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue
@@ -187,6 +187,8 @@ export default {
                 sxrq: row.sxr,
                 ndz: (row.nd||"")+(row.nddw||""),
                 type: Number(this.selectType),
+                kc: row.kc,
+                kcdw: row.kcdw,
             }
             const {qxbdType,checkType} = this;
             if(qxbdType){