From 3dfb33a5b63c7051afdfe9620766a965e69e42e3 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Sun, 1 Mar 2026 12:35:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][?=
 =?UTF-8?q?=E6=9A=82=E5=AD=98]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/BaseInfoFormPackage.vue    | 31 +++++++++++++---------
 src/components/Template/HandleFormItem.vue         | 25 ++++++++++++++++-
 .../business/comps/template/comps/yp/YP003.vue     | 22 +++++++++++++--
 3 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/src/components/Template/BaseInfoFormPackage.vue b/src/components/Template/BaseInfoFormPackage.vue
index 7d17fa5..7692db7 100644
--- a/src/components/Template/BaseInfoFormPackage.vue
+++ b/src/components/Template/BaseInfoFormPackage.vue
@@ -114,13 +114,7 @@
                                     @update:error="errors[key] = false" @resetRecord="resetRecord(key)" :item="sItem"
                                     :value="formFields[key]" />
                             </div>
-                            <div v-else-if="sItem.type === 'checkboxTag'" class="flex1">
-                                <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
-                                    type="checkboxTag" :item="sItem" :value="formFields[key]"
-                                    @copy="onCopy(sItem, key)" @change="(e) => onAttachmentChange(key, e)"
-                                    :error="errors[key]" @update:error="errors[key] = false"
-                                    :orange-bg="orangeBgFields[key]" />
-                            </div>
+
                             <div v-else-if="sItem.type === 'checkboxList'" class="flex1">
                                 <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
                                     type="checkboxList" :item="sItem" :value="formFields[key]"
@@ -154,6 +148,12 @@
                                         :orange-bg="orangeBgFields[sItem.otherCode]" />
                                 </div>
                             </div>
+                            <div v-else-if="sItem.type === 'fqyq'" class="flex1" :class="{ 'form-error-border': errors[key] }">
+                                <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
+                                    type="fqyq" :item="sItem" :value="formFields[key]"
+                                    @change="(e) => onFqyqChange(key, e)"
+                                    :error="errors[key]" @update:error="errors[key] = false" />
+                            </div>
 
 
                         </div>
@@ -275,12 +275,6 @@
                                 @update:error="errors[key] = false" @resetRecord="resetRecord(key)" :item="sItem"
                                 :value="formFields[key]" />
                         </div>
-                        <div v-else-if="sItem.type === 'checkboxTag'" class="flex flex1">
-                            <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
-                                type="checkboxTag" :item="sItem" :value="formFields[key]" @copy="onCopy(sItem, key)"
-                                @change="(e) => onAttachmentChange(key, e)" :error="errors[key]"
-                                @update:error="errors[key] = false" :orange-bg="orangeBgFields[key]" />
-                        </div>
                         <div v-else-if="sItem.type === 'checkboxList'" class="flex flex1">
                             <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
                                 type="checkboxList" :item="sItem" :value="formFields[key]" @copy="onCopy(sItem, key)"
@@ -390,6 +384,11 @@ export default {
                 fillType: sItem.subFillType || sItem.fillType
             }
         },
+        // 处理fqyq变化
+        onFqyqChange(key, e){
+            console.log(e,key,'fqyq');
+            this.formFields[key] = e;
+        }
 
     }
 }
@@ -552,4 +551,10 @@ export default {
 .mr-20 {
     margin-right: 20px;
 }
+.form-error-border{
+    box-shadow: 0 0 6px #ffc3c3;
+	padding: 8px;
+	border-radius: 4px;
+	border: 1px solid #ff5d5d;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index 25be34a..b64b8eb 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -109,6 +109,25 @@
                     </div>
                 </div>
             </div>
+            <div v-else-if="type === 'fqyq'" :class="getFillTypeStyle()">
+                <div class="item-center">
+                    <el-checkbox v-model="inputValue" :disabled="getDisabled()"
+                        @change="(val) => onFqyqChange(val, 'yyyy/MM/DD')">
+                        是
+                    </el-checkbox>
+                     <el-input class="fqyq-input" maxlength="100" v-model="inputValue" :disabled="getDisabled()" placeholder="请输入"></el-input>
+                     <el-checkbox-group v-model="inputValue">
+                        <el-checkbox label="是"></el-checkbox>
+                        <el-checkbox label="否"></el-checkbox>
+                    </el-checkbox-group>
+                </div>
+                <div>
+                    <el-checkbox v-model="inputValue" :disabled="getDisabled()"
+                        @change="(val) => onFqyqChange(val, 'yyyy/MM/DD')">
+                        否
+                    </el-checkbox>
+                </div>
+            </div>
 
         </div>
         <div class="handle-row" v-if="isShowHandle()">
@@ -1168,7 +1187,7 @@ export default {
             if (this.getDisabled()) {
                 return ""
             }
-            if (this.regentType.includes(type) || type === "clickable") {
+            if (this.regentType.includes(type) || type === "clickable" || type === "fqyq") {
                 return this.$t("template.common.pleaseSelect")
             }
             let prex = "template.common.pleaseFillIn"
@@ -1731,4 +1750,8 @@ export default {
         }
     }
 }
+.fqyq-input{
+    width: 500px;
+    margin-left: 10px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/business/comps/template/comps/yp/YP003.vue b/src/views/business/comps/template/comps/yp/YP003.vue
index 87a7963..0b9e5e8 100644
--- a/src/views/business/comps/template/comps/yp/YP003.vue
+++ b/src/views/business/comps/template/comps/yp/YP003.vue
@@ -31,6 +31,8 @@
 					
 					<LineLabel label="template.yp.yp003.fqxx" />
 					<Step ref="stepRef" :formData="formData.stepData"></Step>
+					<BaseInfoFormPackage fieldItemLabel="template.yp.yp003.fqyq" label="template.yp.yp003.fqyq"
+						ref="fqyqRef" :formConfig="fqyqConig" :formData="formData" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
 						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
 				</div>
@@ -65,6 +67,22 @@ export default {
 		},
 	},
 	computed: {
+		// 分取要求	
+		fqyqConig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						fqyq: {
+							label: "template.yp.yp003.sfyfzyq",
+							type: "fqyq",
+							fillType: "actFill",
+							span: 1,
+						}
+					}
+				}
+			]
+		},
 		// 备注表单配置
 		remarkConig() {
 			return [
@@ -202,11 +220,11 @@ export default {
 		},
 		//获取已填写的表单数据
 		getFilledFormData() {
-			return this.getFilledFormDataByRefs(["baseInfoRef",  "tableRef", "stepRef", "remarkRef"])
+			return this.getFilledFormDataByRefs(["baseInfoRef",  "tableRef", "stepRef", "fqyqRef","remarkRef"])
 		},
 		//获取填写完成的表单数据
 		async getFormData() {
-			let content = await this.validFormFields(["baseInfoRef",  "tableRef", "stepRef", "remarkRef"]);
+			let content = await this.validFormFields(["baseInfoRef",  "tableRef", "stepRef", "fqyqRef","remarkRef"]);
 			return content;
 		},
 		getResource() {