From c47d21763653902cdb70d527b823e6db16ba683a Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Tue, 31 Mar 2026 16:55:20 +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/JcbComp.vue | 10 ++++++++-
 .../Template/StepComponents/jcb/jzks.vue           |  8 +++++--
 src/components/Template/StepComponents/jcb/qb.vue  |  1 -
 src/components/Template/StepFormPackage.vue        |  4 ++--
 src/components/Template/mixins/stepMixins.js       | 26 ++++++++++++++++++++++
 5 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/src/components/Template/StepComponents/JcbComp.vue b/src/components/Template/StepComponents/JcbComp.vue
index 9237439..a5f8adc 100644
--- a/src/components/Template/StepComponents/JcbComp.vue
+++ b/src/components/Template/StepComponents/JcbComp.vue
@@ -34,13 +34,21 @@ export default {
             type: String,
             default: '',
         },
+        item:{
+            type: Object,
+            default: () => { },
+        }
     },
     data() {
         return {
         };
     },
+    mounted() {
+        console.log(this.prefixKey,"prefixKey")
+    },
     computed: {
         jcbColumns() {
+            const { buttonName = "取出" } = this.item;
             return [
                 {
                     label: '处理批',
@@ -58,7 +66,7 @@ export default {
                     bodyDisabled: true,
                     bodyFillType: "actFill",
                     bodySubType: "button",
-                    bodySubButtonName: "取出",
+                    bodySubButtonName: buttonName,
                     bodySubKey: "timeClick",
                     bodySubFillType: "actFill",
                 },
diff --git a/src/components/Template/StepComponents/jcb/jzks.vue b/src/components/Template/StepComponents/jcb/jzks.vue
index c03f4a9..1c29f62 100644
--- a/src/components/Template/StepComponents/jcb/jzks.vue
+++ b/src/components/Template/StepComponents/jcb/jzks.vue
@@ -1,7 +1,7 @@
 <!-- 静置开始  -->
 <template>
     <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_jzks'" @resetRecord="resetRecord" :form-config="formConfig"
-        :formData="formData" />
+        :formData="localFormData" />
 </template>
 
 <script>
@@ -20,7 +20,7 @@ export default {
         StepFormPackage
     },
     mounted() {
-        console.log(this.getStepData(),"getStepData()")
+        this.commonHandleJcbUpdate();
     },
     computed: {
         formConfig() {
@@ -68,6 +68,10 @@ export default {
                         fillType: "preFill",
                         type: "input",
                     },
+                    jcb:{
+                        type:"dcjcb",
+                        buttonName:"开始"
+                    }
                 }
             }]
             return config
diff --git a/src/components/Template/StepComponents/jcb/qb.vue b/src/components/Template/StepComponents/jcb/qb.vue
index af1d92a..fb4a456 100644
--- a/src/components/Template/StepComponents/jcb/qb.vue
+++ b/src/components/Template/StepComponents/jcb/qb.vue
@@ -23,7 +23,6 @@ export default {
             let config =  [{
                 config: {
                     qb: {
-                        label: "待处理。。。。",
                         type: "qb",
                     },
                 }
diff --git a/src/components/Template/StepFormPackage.vue b/src/components/Template/StepFormPackage.vue
index e3cd49a..2bc757f 100644
--- a/src/components/Template/StepFormPackage.vue
+++ b/src/components/Template/StepFormPackage.vue
@@ -53,8 +53,8 @@
                         @onSubPackageSubmit="onSubPackageSubmit(key) "
                         :stepIndex="stepIndex" :prefixKey="prefixKey+'_'+index" @update="(data)=>onSubPackageUpdate(data,key)" :subData = "formFields[key]" :ref="'zlSubPackageRef_'+key" />
                 </template>
-                <template v-else-if="sItem.type === 'qb'">
-                    <JcbComp @update="(data)=>onJcbUpdate(data,key)" :ref="'jcbComp_'+key" :stepIndex="stepIndex" :prefixKey="prefixKey+'_'+index" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData.qb" />
+                <template v-else-if="sItem.type === 'qb' || (sItem.type === 'dcjcb' && templateFillType === 'actFill')">
+                    <JcbComp @update="(data)=>onJcbUpdate(data,key)"  :ref="'jcbComp_'+key" :stepIndex="stepIndex" :prefixKey="prefixKey+'_'+index" @resetRecord = "resetRecord" :item="sItem" :formData="formData[key]" />
                 </template>
             
                 <div v-show="isShowOther(formFields[key])" class="flex flex1">
diff --git a/src/components/Template/mixins/stepMixins.js b/src/components/Template/mixins/stepMixins.js
index bcead71..153d787 100644
--- a/src/components/Template/mixins/stepMixins.js
+++ b/src/components/Template/mixins/stepMixins.js
@@ -38,6 +38,7 @@ export default {
 		return {
 			uuid: getuuid(),
 			fzInfo: {},
+			localFormData: {},
 		}
 	},
 	mounted() {
@@ -54,6 +55,31 @@ export default {
 	},
 
 	methods: {
+		//处理jcb更新
+		commonHandleJcbUpdate(){
+			this.localFormData = this.formData;
+			if(!this.formData.jcb){
+				const qbData = this.getQbData();
+				this.localFormData = {...this.localFormData, jcb: qbData};
+				justUpdateFilledFormData();
+			}
+		},
+		//获取取板数据
+		getQbData(){
+			let qbData = [];
+			if(this.templateFillType === 'actFill'){
+				const stepData = this.getStepData() || [];
+				const filterData = stepData.filter((item)=>item.type === "qb");
+				const allQbData = [];
+				filterData.forEach((item)=>{
+					const {stepTableFormData = []} = item.formData.qb || {};
+					allQbData.push(...stepTableFormData);
+				})
+				qbData = [...new Map(allQbData.map(item => [item.clp, item])).values()]
+
+			}
+			return {stepTableFormData: qbData}
+		},
 		//回填编号 preField 前缀 updateField 需要更新的字段
 		async handleBackfillCode(preField, updateField) {
 			const updateValue = this.formData[updateField];