From 4e8020dceb5fdf16f22914caef4d5c2d00c08863 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Mon, 23 Mar 2026 10:59:26 +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/BaseInfoFormPackage.vue      |  7 ++-----
 src/components/Template/CustomTable.vue              | 16 ++++++++--------
 src/views/business/comps/template/comps/yp/YP005.vue |  4 ++++
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/components/Template/BaseInfoFormPackage.vue b/src/components/Template/BaseInfoFormPackage.vue
index 6ded5ec..b02a9df 100644
--- a/src/components/Template/BaseInfoFormPackage.vue
+++ b/src/components/Template/BaseInfoFormPackage.vue
@@ -453,11 +453,8 @@ export default {
             if(sItem.hasOwnProperty("subDisabled")){
                 o.disabled = sItem.subDisabled;
             }
-            return {
-                ...sItem,
-                key: sItem.subKey,
-                fillType: sItem.subFillType || sItem.fillType
-            }
+            return o;
+        
         },
         // 获取按钮项
         getThirdButtonItem(sItem) {
diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue
index 8ed469f..c7f930e 100644
--- a/src/components/Template/CustomTable.vue
+++ b/src/components/Template/CustomTable.vue
@@ -200,7 +200,7 @@
 										:orange-bg="hasOrangeBg(rowIndex, colIndex, col.otherCode)" />
 								</div>
 							</div>
-							<div class="m-l-5" :class="{ 'flex1': col.bodySubType !== 'button' }"
+							<div class="m-l-5 flex" :class="{ 'flex1': col.bodySubType !== 'button' }"
 								v-if="isShowBodySub(col, row)">
 								<template
 									v-if="col.bodySubType === 'inputNumber' || col.bodySubType === 'input' || col.bodySubType === 'select'">
@@ -224,11 +224,6 @@
 										:value="row[col.bodySubKey]"
 										@clickButton="(e, data) => handleClickButton(e, data, col.bodySubKey, rowIndex, colIndex)" />
 								</template>
-								<template v-else-if="col.bodyThirdType === 'button'">
-									<HandleFormItem class="ml-10" type="button" :item="getBodyThirdButtonItem(col, rowIndex)"
-										:value="row[col.bodyThirdKey]"
-										@clickButton="(e, data) => handleClickButton(e, data, col.bodyThirdKey, rowIndex, colIndex)" />
-								</template>
 								<div class="flex flex1" v-else-if="isRegent(col, 'bodySubType')">
 									<HandleFormItem :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + row.id"
 										:fieldItemLabel="fieldItemLabel" :type="col.bodySubType" class="body-clickable"
@@ -240,6 +235,11 @@
 										@update:error="onErrorUpdate(rowIndex, colIndex, col.bodySubKey, $event)"
 										:orange-bg="hasOrangeBg(rowIndex, colIndex, col.bodySubKey)" />
 								</div>
+								<template v-if="col.bodyThirdType === 'button'">
+									<HandleFormItem class="ml-10" type="button" :item="getBodyThirdButtonItem(col, rowIndex)"
+										:value="row[col.bodyThirdKey]"
+										@clickButton="(e, data) => handleClickButton(e, data, col.bodyThirdKey, rowIndex, colIndex)" />
+								</template>
 							</div>
 						</div>
 					</div>
@@ -461,7 +461,7 @@ export default {
 				isValid = value && value.some(tag => tag.checked === true);
 			} else if (this.templateFillType === "preFill") {
 				// preFill时，检查所有tagValue是否不为空
-				isValid = value && value.every(tag => tag.tagValue && tag.tagValue.trim() !== '');
+				isValid = value && value.every(tag => tag.tagValue && (tag.tagValue+'').trim() !== '');
 			}
 			this.onErrorUpdate(rowIndex, colIndex, col.prop, !isValid);
 			this.$emit("onCheckboxTagChange", rowIndex, col, value)
@@ -675,7 +675,7 @@ export default {
 								}
 							} else if (this.templateFillType === "preFill") {
 								// preFill时，检查所有tagValue是否不为空
-								const allTagValuesFilled = mainValue && mainValue.every(tag => tag.tagValue && tag.tagValue.trim() !== '');
+								const allTagValuesFilled = mainValue && mainValue.every(tag => tag.tagValue && (tag.tagValue+'').trim() !== '');
 								if (!allTagValuesFilled && !col.bodyDisabled) {
 									const errorItem = {
 										rowIndex,
diff --git a/src/views/business/comps/template/comps/yp/YP005.vue b/src/views/business/comps/template/comps/yp/YP005.vue
index 82cb9c7..f336e57 100644
--- a/src/views/business/comps/template/comps/yp/YP005.vue
+++ b/src/views/business/comps/template/comps/yp/YP005.vue
@@ -172,6 +172,10 @@ export default {
 				bodySubButtonName:"template.yp.yp005.ks",
 				bodySubKey:"startBtn",
 				showBodySub:this.fillType === "actFill",
+				bodyThirdType:"button",
+				bodyThirdButtonName:"结束",
+				bodyThirdKey:"endBtn",
+				bodyThirdFillType:"actFill",
 				width: 280,
 				bodyDisabled:true,
 				bodySubDisabled:false,