From 5e5928cdd3cd985a18890412506222263ffc0802 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Fri, 23 Jan 2026 20:15:03 +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/BaseInfoFormPcakge.vue     | 15 +++--
 src/components/Template/HandleFormItem.vue         |  2 +-
 .../Template/operation/TableOpertaion.vue          | 70 ++++++++++++----------
 .../comps/template/comps/sp/SWYPBQGZYZBB.vue       |  8 +--
 .../comps/template/dialog/SelectReagentDialog.vue  |  2 +-
 .../comps/template/dialog/SubPackageDialog.vue     |  9 ++-
 6 files changed, 58 insertions(+), 48 deletions(-)

diff --git a/src/components/Template/BaseInfoFormPcakge.vue b/src/components/Template/BaseInfoFormPcakge.vue
index 36dc68c..c7598b3 100644
--- a/src/components/Template/BaseInfoFormPcakge.vue
+++ b/src/components/Template/BaseInfoFormPcakge.vue
@@ -31,7 +31,7 @@
                             <div class="form-title">{{ $t( sItem.label) }}</div>
                             <div class="flex flex1">
                                 <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey+'_'+key" type="select" :item="sItem" v-model="formFields[key]"
-                                    @copy="onCopy(sItem, key)" @change="onSelectChange(key, $event)"
+                                    @copy="onCopy(sItem, key)" @change="(e,type)=>onSelectChange(key, e,type)"
                                     :error="errors[key]" @update:error="errors[key] = false"
                                     :orange-bg="orangeBgFields[key]" />
 
@@ -66,7 +66,7 @@
                             </div>
                             <div v-else-if="sItem.type === 'select'">
                                 <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey+'_'+key" type="select" :item="sItem" v-model="formFields[key]"
-                                    @copy="onCopy(sItem, key)" @change="onSelectChange(key, $event)"
+                                    @copy="onCopy(sItem, key)" @change="(e,type)=>onSelectChange(key, e,type)"
                                     :error="errors[key]" @update:error="errors[key] = false"
                                     :orange-bg="orangeBgFields[key]" />
                             </div>
@@ -105,7 +105,7 @@
                         <div v-else-if="sItem.type === 'select'" class="flex flex1">
                             <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey+'_'+key" type="select" :item="sItem" style="width: auto;flex:1"
                                 v-model="formFields[key]" @copy="onCopy(sItem, key)"
-                                @change="onSelectChange(key, $event)" :error="errors[key]"
+                                @change="(e,type)=>onSelectChange(key, e,type)" :error="errors[key]"
                                 @update:error="errors[key] = false" :orange-bg="orangeBgFields[key]" />
                             <div v-show="isShowOther(formFields[key])" class="flex flex1">
                                 <div class="other-title">{{sItem.otherLabel ? $t(sItem.otherLabel) :  $t("template.common.other") }}</div>
@@ -123,7 +123,7 @@
                                 @update:error="errors[key] = false" :orange-bg="orangeBgFields[key]" />
                             <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey+'_'+sItem.subKey" class="ml-10" v-if="sItem.subType === 'select'" type="select"
                                 :item="getSubItem(sItem)" v-model="formFields[sItem.subKey]" @copy="onCopy(sItem, key)"
-                                @change="onSelectChange(sItem.subKey, $event)" :error="errors[sItem.subKey]"
+                                @change="(e,type)=>onSelectChange(sItem.subKey, e,type)" :error="errors[sItem.subKey]"
                                 @update:error="errors[sItem.subKey] = false"
                                 :orange-bg="orangeBgFields[sItem.subKey]" />
                             <div class="ml-10 item-span" v-else-if="sItem.subType === 'span'">{{ formFields[sItem.subKey] }}</div>
@@ -153,7 +153,7 @@
                                 :orange-bg="orangeBgFields[key]" />
                             <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey+'_'+sItem.subKey" class="ml-10" v-if="sItem.subType === 'select'" type="select"
                                 :item="getSubItem(sItem)" v-model="formFields[sItem.subKey]" @copy="onCopy(sItem, key)"
-                                @change="onSelectChange(sItem.subKey, $event)" :error="errors[sItem.subKey]"
+                                @change="(e,type)=>onSelectChange(sItem.subKey, e,type)" :error="errors[sItem.subKey]"
                                 @update:error="errors[sItem.subKey] = false"
                                 :orange-bg="orangeBgFields[sItem.subKey]" />
                             <div class="ml-10 item-span" v-else-if="sItem.subType === 'span'">{{ formFields[sItem.subKey] }}</div>
@@ -543,16 +543,15 @@ export default {
                 this.compareFieldsIsEqual(val,compareToValue,key);
             }
         },
-        onSelectChange(key, val) {
+        onSelectChange(key, val, type) {
             // 获取对应的配置
             const currentConfig = this.allFieldsConfig[key];
-            console.log(currentConfig,"currentConfig")
             if(currentConfig.selectTo){
                 this.formFields[currentConfig.selectTo] = val;
             }
             this.onValueChangeCompareTo(key, val);
             this.formFields[key] = val;
-            this.$emit("select", { key, value: val });
+            this.$emit("select", { key, value: val, type });
             // 清除该表单项的错误状态
             if (this.errors[key]) {
                 this.$set(this.errors, key, false);
diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index 6561d4f..fe82e8d 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -407,7 +407,7 @@ export default {
             this.inputValue = this.oldValue;
             this.$emit('input', this.inputValue); // 触发 v-model 更新
             this.$emit("blur", this.oldValue);
-            this.$emit("change", this.oldValue);
+            this.$emit("change", this.oldValue,"cancel");
             if(this.item.type === "clickable"){
                 this.$emit("resetRecord");
             }
diff --git a/src/components/Template/operation/TableOpertaion.vue b/src/components/Template/operation/TableOpertaion.vue
index 0118fae..fa02457 100644
--- a/src/components/Template/operation/TableOpertaion.vue
+++ b/src/components/Template/operation/TableOpertaion.vue
@@ -5,19 +5,20 @@
             <el-button v-if="fillType === 'preFill'" slot="reference" type="text" size="small" class="delete-button">
                 删除
             </el-button>
-            
+
         </el-popconfirm>
         <template v-if="fillType === 'actFill'">
-            <el-button  type="text" size="small" @click = "onSubPackage">分装</el-button>
-            <el-button  type="text" size="small" @click = "onStartConfig">开始配置</el-button>
-            <el-button  type="text" size="small" @click = "onConfigComplete">配置完成</el-button>
-            <el-button  type="text" size="small" @click = "onPrintLabel">打印标签</el-button>
+            <el-button type="text" size="small" @click="onSubPackage">分装</el-button>
+            <el-button type="text" size="small" @click="onStartConfig">开始配置</el-button>
+            <el-button type="text" size="small" @click="onConfigComplete">配置完成</el-button>
+            <el-button type="text" size="small" @click="onPrintLabel">打印标签</el-button>
         </template>
     </div>
 </template>
 
 <script>
 import { EventBus } from "@/utils/eventBus";
+import { addTj } from "@/utils/calUnitTools";
 
 export default {
     name: "TableOpertaion",
@@ -39,7 +40,7 @@ export default {
             default: "preFill",
         },
     },
-    
+
     mounted() {
         EventBus.$on("dialogSubPackageSubmit", (data) => {
             this.onSubPackageSubmit(data)
@@ -53,51 +54,58 @@ export default {
             deep: true,
         }
     },
-    data(){
-        return{
+    data() {
+        return {
             innerRow: this.row,
         }
     },
     methods: {
         // 开始配置
         onStartConfig() {
-            this.$emit("startConfig", {rowData:this.innerRow,rowIndex:this.rowIndex,headerSelectFields:this.columns.headerSelectFields})
+            this.$emit("startConfig", { rowData: this.innerRow, rowIndex: this.rowIndex, headerSelectFields: this.columns.headerSelectFields })
         },
         // 配置完成
         onConfigComplete() {
-            this.$emit("configComplete", {rowData:this.innerRow,rowIndex:this.rowIndex,headerSelectFields:this.columns.headerSelectFields})
+            this.$emit("configComplete", { rowData: this.innerRow, rowIndex: this.rowIndex, headerSelectFields: this.columns.headerSelectFields })
         },
         // 打印标签
         onPrintLabel() {
-            this.$emit("printLabel", {rowData:this.innerRow,rowIndex:this.rowIndex,headerSelectFields:this.columns.headerSelectFields})
+            this.$emit("printLabel", { rowData: this.innerRow, rowIndex: this.rowIndex, headerSelectFields: this.columns.headerSelectFields })
         },
         // 分装
         onSubPackage() {
-            const {columns,innerRow} = this;
-            const {headerSelectFields,columnsData} = columns;
-            const col = columnsData.find((item)=>item.myCodeFields);
-            const {myCodeFields,maxVolumeField,maxVolumeFieldUnit} = col;
-            const fields = [];
-            myCodeFields.forEach((key)=>{
+            const { columns, innerRow } = this;
+            const { headerSelectFields, columnsData } = columns;
+            const col = columnsData.find((item) => item.myCodeFields);
+            const { myCodeFields, maxVolumeField, maxVolumeFieldUnit } = col;
+            const fields = [], cols = [], units = [];
+            myCodeFields.forEach((key) => {
                 fields.push(innerRow[key])
             });
-            let defaultData = {mybh:fields.join(""),maxVolume:innerRow[maxVolumeField],maxVolumeUnit:headerSelectFields[maxVolumeFieldUnit],rowIndex:this.rowIndex}
-            if(innerRow.fzsj){
+            maxVolumeField.split(",").forEach((key) => {
+                cols.push(innerRow[key] || 0)
+            })
+            maxVolumeFieldUnit.split(",").forEach((key) => {
+                units.push(headerSelectFields[key])
+            })
+            const {total,unit} = addTj(cols,units)
+            let defaultData = { mybh: fields.join(""), maxVolume: total, maxVolumeUnit: unit, rowIndex: this.rowIndex }
+            if (innerRow.fzsj) {
                 defaultData = innerRow.fzsj
             }
-            EventBus.$emit("showSubPackageDialog",defaultData)
+            EventBus.$emit("showSubPackageDialog", defaultData)
         },
-        onSubPackageSubmit(data){
-            if(data.rowIndex === this.rowIndex){
+        onSubPackageSubmit(data) {
+            if (data.rowIndex === this.rowIndex) {
                 this.innerRow.fzsj = data;
                 //通知后端保存数据
-				const params = {
-					type: "fieldChanged",
-					newRecord: null,
-					resourceList: null,
-				}
-				EventBus.$emit('onModifyRecord', params);
-                this.$emit("subPackageSubmit", {fzsj:data,rowData:this.innerRow,headerSelectFields:this.columns.headerSelectFields});
+                const params = {
+                    type: "fieldChanged",
+                    newRecord: null,
+                    resourceList: null,
+                }
+                EventBus.$emit('onModifyRecord', params);
+                this.$emit("subPackageSubmit", { fzsj: data, rowData: this.innerRow, headerSelectFields: this.columns.headerSelectFields });
             }
         },
         // 删除行
@@ -109,7 +117,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.delete-button{
-  color: red;
+.delete-button {
+    color: red;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
index c780701..165e694 100644
--- a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
@@ -270,10 +270,10 @@ export default {
 					bodyFillType: "preFill",
 					width: 280,
 					myCodeFields: ["targetSolutionCode", "subTargetSolutionCode"],//分装的母液编号字段
-					// maxVolumeField: "actSolutionVolume",//分装的最大量字段
-					// maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段
-					maxVolumeField: "targetSolutionVolume,targetDiluentVolume",//分装的最大量字段
-					maxVolumeFieldUnit: "targetSolutionVolumeUnit,targetDiluentVolumeUnit",//分装的最大量单位字段
+					maxVolumeField: "actSolutionVolume",//分装的最大量字段
+					maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段
+					// maxVolumeField: "targetSolutionVolume,targetDiluentVolume",//分装的最大量字段
+					// maxVolumeFieldUnit: "targetSolutionVolumeUnit,targetDiluentVolumeUnit",//分装的最大量单位字段
 				},
 				{
 					label: "起始溶液编号",
diff --git a/src/views/business/comps/template/dialog/SelectReagentDialog.vue b/src/views/business/comps/template/dialog/SelectReagentDialog.vue
index a98688e..2adeec2 100644
--- a/src/views/business/comps/template/dialog/SelectReagentDialog.vue
+++ b/src/views/business/comps/template/dialog/SelectReagentDialog.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog :title="$t(title)" @close="onCancel" :visible.sync="visible" append-to-body width="80%">
+    <el-dialog  :close-on-click-modal="false" :close-on-press-escape="false" :title="$t(title)" @close="onCancel" :visible.sync="visible" append-to-body width="80%">
         <!-- 麻醉/精神药品配制/领取申请单 -->
          <div  v-if="type === 'MJYLQSQD'" class="header-row">
             <el-radio-group v-model="radio" @input="changeRadio">
diff --git a/src/views/business/comps/template/dialog/SubPackageDialog.vue b/src/views/business/comps/template/dialog/SubPackageDialog.vue
index fbbd28a..a1b30e5 100644
--- a/src/views/business/comps/template/dialog/SubPackageDialog.vue
+++ b/src/views/business/comps/template/dialog/SubPackageDialog.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="分装（分装后的编号可用于下一步关联选择）" append-to-body :visible.sync="visible" @close="close" width="1100px">
+    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" title="分装（分装后的编号可用于下一步关联选择）" append-to-body :visible.sync="visible" @close="close" width="1100px">
         <div class="dialog-content">
             <div class="header-container">
                 <div class="header-item">
@@ -130,6 +130,7 @@ export default {
                 const {maxVolume,maxVolumeUnit,dw} = this.formData;
                 const totalVolume = this.fzList.reduce((acc, cur) => acc + Number(cur.num), 0);
                 const compareResult = compareVolume(totalVolume,dw,maxVolume, maxVolumeUnit);
+                console.log(compareResult,totalVolume,dw,maxVolume, maxVolumeUnit,"比较结果");
                 if(compareResult > 0||!maxVolume){//没有填写实际溶液体积的也需要提示错误信息
                     this.$modal.confirm(errMsg, '提示', {
                         confirmButtonText: this.$t('form.saveConfirm'),
@@ -150,8 +151,10 @@ export default {
         },
         submitEmit(){
             EventBus.$emit('dialogSubPackageSubmit', {...this.formData, fzList: this.fzList});
-
-            this.close();
+            this.$message.success('分装成功');
+            setTimeout(() => {
+                this.close();
+            }, 500);
         },
         validateFormData() {
             let isValid = true;