From a3e239d88737780dda619be762ae258f7faf8656 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Wed, 29 Oct 2025 16:34:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=9B=B8=E5=85=B3=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E7=9B=91=E6=8A=A4=E4=BA=BA=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=E8=AF=81=E6=AD=A3=E9=9D=A2=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/elder/elderinfo/ElderInfo.data.ts   |  1 +
 .../elderinfo/components/ElderInfoForm.vue    | 50 +++++++++++++++----
 .../elderinfo/components/ElderUpInfoForm.vue  |  8 ++-
 .../elderinfo/components/GuaUpInfoForm.vue    |  6 ++-
 4 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/src/views/elder/elderinfo/ElderInfo.data.ts b/src/views/elder/elderinfo/ElderInfo.data.ts
index fc48164..9218d40 100644
--- a/src/views/elder/elderinfo/ElderInfo.data.ts
+++ b/src/views/elder/elderinfo/ElderInfo.data.ts
@@ -197,4 +197,5 @@ export const applyObj = {
   elderModifyStatus: '长者信息变更状态  1修改申请中 2通过 3驳回',
   elderModifyContent: '长者信息变更驳回原因',
   elderModifyId: '长者变更信息对应子表id nu_biz_elder_modify_info.id',
+  guardianIdCardPositive:'监护人身份证正面',
 };
diff --git a/src/views/elder/elderinfo/components/ElderInfoForm.vue b/src/views/elder/elderinfo/components/ElderInfoForm.vue
index 2cb027d..f180e95 100644
--- a/src/views/elder/elderinfo/components/ElderInfoForm.vue
+++ b/src/views/elder/elderinfo/components/ElderInfoForm.vue
@@ -4,8 +4,8 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
           name="ElderInfoForm">
-          <a-row>
-            <a-col :span="24">
+          <a-row class="card-class">
+            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'长者信息'" />
             </a-col>
             <a-col :span="12">
@@ -61,15 +61,18 @@
                 <span>{{ formData.houseAddress }}</span>
               </a-form-item>
             </a-col>
-            <a-col :span="24">
+          </a-row>
+          <a-row class="card-class">
+            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'监护人信息'" />
             </a-col>
-            <a-col :span="12">
-              <a-form-item label="关系" v-bind="validateInfos.relationship" id="ElderInfoForm-relationship"
-                name="relationship">
-                <!-- <a-input v-model:value="formData.relationship" placeholder="请输入关系" allow-clear></a-input> -->
-                <span>{{ formData.relationship }}</span>
-              </a-form-item>
+            <a-col :span="24">
+              <a-col :span="12">
+                <a-form-item label="身份证正面" v-bind="validateInfos.guardianIdCardPositive" id="ElderInfoForm-guardianIdCardPositive"
+                  name="guardianIdCardPositive">
+                  <j-image-upload :fileMax="1" :value="opeMediaAddress + formData.guardianIdCardPositive"></j-image-upload>
+                </a-form-item>
+              </a-col>
             </a-col>
             <a-col :span="12">
               <a-form-item label="姓名" v-bind="validateInfos.guardianName" id="ElderInfoForm-guardianName"
@@ -78,6 +81,13 @@
                 <span>{{ formData.guardianName }}</span>
               </a-form-item>
             </a-col>
+            <a-col :span="12">
+              <a-form-item label="关系" v-bind="validateInfos.relationship" id="ElderInfoForm-relationship"
+                name="relationship">
+                <!-- <a-input v-model:value="formData.relationship" placeholder="请输入关系" allow-clear></a-input> -->
+                <span>{{ formData.relationship }}</span>
+              </a-form-item>
+            </a-col>
             <a-col :span="12">
               <a-form-item label="身份证号" v-bind="validateInfos.guardianIdCard" id="ElderInfoForm-guardianIdCard"
                 name="guardianIdCard">
@@ -106,7 +116,9 @@
                 <span>{{ formData.guardianWorkUnit }}</span>
               </a-form-item>
             </a-col>
-            <a-col :span="24">
+          </a-row>
+          <a-row class="card-class">
+            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'长者身份证'" />
             </a-col>
             <a-col :span="12">
@@ -192,6 +204,11 @@ const formData = reactive<Record<string, any>>({
   issuingAuthority: '',
   startTime: '',
   endTime: '',
+  guardianBirthDate: '',
+  guardianSex: '',
+  guardianNational: '',
+  guardianCardHome: '',
+  guardianIdCardPositive: '',
 });
 const { createMessage } = useMessage();
 const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 8 } });
@@ -311,4 +328,17 @@ defineExpose({
 .antd-modal-form {
   // padding: 14px;
 }
+
+.card-class {
+  padding-top: 24px;
+  padding-bottom: 24px;
+  padding-left: 14px;
+  padding-right: 14px;
+  // background-color: rgba(255, 255, 255, 0.9);
+  background-color: #fcfdff;
+  border-radius: 10px;
+  // box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px;
+  margin-bottom: 14px;
+
+}
 </style>
diff --git a/src/views/elder/elderinfo/components/ElderUpInfoForm.vue b/src/views/elder/elderinfo/components/ElderUpInfoForm.vue
index 1ead282..a54c0c4 100644
--- a/src/views/elder/elderinfo/components/ElderUpInfoForm.vue
+++ b/src/views/elder/elderinfo/components/ElderUpInfoForm.vue
@@ -38,7 +38,8 @@
         </a-table>
       </a-col>
     </a-row>
-    <a-form style="margin-top: 14px;height: 100px;" ref="formRef" layout="horizontal" :model="formData" :label-col="labelCol" :wrapper-col="wrapperCol">
+    <a-form style="margin-top: 14px;height: 100px;" ref="formRef" layout="horizontal" :model="formData"
+      :label-col="labelCol" :wrapper-col="wrapperCol">
       <a-row :gutter="16">
         <a-col :span="12">
           <a-form-item label="审核结果" name="status" v-bind="validateInfos.status">
@@ -156,6 +157,11 @@ const filteredTableData = computed(() => {
     // && item.d1 !== 'elderModifyStatus'
     // && item.d1 !== 'elderModifyContent'
     // && item.d1 !== 'elderModifyId'
+    && item.d1 !== 'guardianBirthDate'
+    && item.d1 !== 'guardianSex'
+    && item.d1 !== 'guardianNational'
+    && item.d1 !== 'guardianCardHome'
+    && item.d1 !== 'guardianIdCardPositive'
   );
 });
 
diff --git a/src/views/elder/elderinfo/components/GuaUpInfoForm.vue b/src/views/elder/elderinfo/components/GuaUpInfoForm.vue
index 4b8945f..76f6bd7 100644
--- a/src/views/elder/elderinfo/components/GuaUpInfoForm.vue
+++ b/src/views/elder/elderinfo/components/GuaUpInfoForm.vue
@@ -77,7 +77,7 @@ const { createMessage } = useMessage();
 const labelCol = { span: 4 };  // 标签宽度
 const wrapperCol = { span: 18 }; // 控件宽度
 const isImg = (v_) => {
-  return v_ == 'idCardPositive' || v_ == 'idCardNegative' || v_ == 'healthCertificatePositive' || v_ == 'bankPositive' || v_ == 'bankNegative' || v_ == 'qualification' || v_ == 'noCrimeCertificate'
+  return v_ == 'guardianIdCardPositive' || v_ == 'idCardNegative' || v_ == 'healthCertificatePositive' || v_ == 'bankPositive' || v_ == 'bankNegative' || v_ == 'qualification' || v_ == 'noCrimeCertificate'
 }
 const provinceOptions = ref({})
 const formData = reactive<Record<string, any>>({
@@ -155,6 +155,10 @@ const filteredTableData = computed(() => {
     && item.d1 !== 'elderModifyStatus'
     && item.d1 !== 'elderModifyContent'
     && item.d1 !== 'elderModifyId'
+    && item.d1 !== 'guardianBirthDate'
+    && item.d1 !== 'guardianSex'
+    && item.d1 !== 'guardianNational'
+    && item.d1 !== 'guardianCardHome'
   );
 });