From dd3ce637aeab8098e60f3198cb605b918307cb7b Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Thu, 9 Apr 2026 16:54:45 +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

---
 .../Template/StepComponents/ZLSubPackage.vue       | 24 +++++++++++++++-------
 src/components/Template/StepComponents/ry/bdzl.vue |  6 +++++-
 src/components/Template/mixins/stepMixins.js       |  2 ++
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/components/Template/StepComponents/ZLSubPackage.vue b/src/components/Template/StepComponents/ZLSubPackage.vue
index 48454f3..9d262f1 100644
--- a/src/components/Template/StepComponents/ZLSubPackage.vue
+++ b/src/components/Template/StepComponents/ZLSubPackage.vue
@@ -22,7 +22,7 @@
                 <div class="header-item">
                     <div class="header-title">预设每份容量</div>
                     <div class="unit-select">
-                        <HandleFormItem :fieldKey="prefixKey + stepIndex + formData.mybh + '_mfbzl'" type="inputNumber"
+                        <HandleFormItem :fieldKey="prefixKey + stepIndex  + '_mfbzl'" type="inputNumber"
                             :error="formErrors.mfbzl" :isFieldsRecord="false" :item="preInputNumberItem"
                             v-model="formData.mfbzl" />
                     </div>
@@ -34,7 +34,7 @@
                 <div class="header-item">
                     <div class="header-title">电子天平</div>
                     <div class="unit-select">
-                        <HandleFormItem :fieldKey="prefixKey + stepIndex + formData.dztp + '_dztp'" type="yq"
+                        <HandleFormItem :fieldKey="prefixKey + stepIndex + '_dztp'" type="yq"
                             @onRegentSubmit="(data) => onRegentSubmit(data, 'dztp')" :error="formErrors.dztp"
                             :item="yqItem" v-model="formData.dztp" />
                     </div>
@@ -56,9 +56,14 @@
                         <HandleFormItem fieldItemLabel="质量分装"
                             :fieldKey="prefixKey + stepIndex + 'clfz_set' + index + '_actnum'" class="ml-5"
                             :item="inputNumberItem" :error="hasError(index, 'actnum')" type="inputNumber"
+                            :ref = "prefixKey + stepIndex + '_actnum'+index"
                             @blur="onBlurFzNum(index, 'actnum')" v-model="item.actnum" />
-                        <el-button class="ml-5" v-if="templateFillType == 'actFill'" type="primary" plain
-                            @click="onGetValue(item)">获取值</el-button>
+                        <HandleFormItem 
+                            :fieldKey="prefixKey + stepIndex + 'clfz_set' + index + '_hqz'" class="ml-5"
+                            :item="getButtonItem()" @clickButton="(e,v,d) => onGetValue(d, item,index)"  type="button" v-model="item.hqz" />
+                        
+                        <!-- <el-button class="ml-5" v-if="templateFillType == 'actFill'" type="primary" plain
+                            @click="onGetValue(item)">获取值</el-button> -->
                         <el-button class="ml-5" v-if="templateFillType == 'actFill'" type="primary" plain
                             @click="onPrint(item)">打印</el-button>
                     </div>
@@ -119,7 +124,8 @@ export default {
             inputNumberItem: {
                 type: "inputNumber",
                 fillType: "actFill",
-                label: "实际称量"
+                label: "实际称量",
+                disabled: true,
             },
             preInputNumberItem: {
                 type: "inputNumber",
@@ -391,17 +397,21 @@ export default {
             this.formData[field] = selectedId;
             this.formData.dztpInfo = data.row;
         },
-        async onGetValue(item) {
+        async onGetValue(signData, item, index) {
             const { dztp,dztpInfo,dw } = this.formData;
             if (isValueEmpty(dztp)) {
                 this.$message.error("请选择电子天平");
                 return;
             }
+            const oldItem = JSON.parse(JSON.stringify(item));
             const result = await getBalance({yq:dztpInfo,dw});
             if(result.success){
                 item.actnum = result.value;
                 this.fzList = [...this.fzList];
-                justUpdateFilledFormData()
+                this.$refs[this.prefixKey + this.stepIndex + '_actnum'+index][0].handleUpdateRecord(signData,{
+                    oldValue: oldItem.actnum,
+                    inputValue: result.value
+                })
             }else{
                 this.$message.error(result.message || "获取值失败");
             }
diff --git a/src/components/Template/StepComponents/ry/bdzl.vue b/src/components/Template/StepComponents/ry/bdzl.vue
index fff483b..8c72742 100644
--- a/src/components/Template/StepComponents/ry/bdzl.vue
+++ b/src/components/Template/StepComponents/ry/bdzl.vue
@@ -1,6 +1,6 @@
 <!-- 标定(质量) -->
 <template>
-    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_bdzl'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage @clickButton="onHandleClickButton" :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_bdzl'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
@@ -52,6 +52,10 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                         },
                         button1:{
                             type:"button",
+                            dataSource:"tp",//数据来源
+                            yqCode:"yq",//选择天平的字段
+                            fillField:"sjbdtj",//回填的字段
+                            dwField:"bdtjdw",//单位字段
                             buttonName:"获取值",
                         },
                         text5:{
diff --git a/src/components/Template/mixins/stepMixins.js b/src/components/Template/mixins/stepMixins.js
index f038245..3cb1110 100644
--- a/src/components/Template/mixins/stepMixins.js
+++ b/src/components/Template/mixins/stepMixins.js
@@ -201,6 +201,8 @@ export default {
 					maxVolumeUnit,
 					uuid: this.uuid,
 				})
+			}else if(buttonName === '获取值'){
+				console.log(e,"iii")
 			}
 		},