From 3b4e0f47e27bb0ee5ef8a1c7b1e31b29983513d1 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Wed, 7 Jan 2026 14:08:23 +0800
Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF=E9=95=BF=E8=80=85=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E3=80=81=E9=95=BF=E8=80=85=E4=BF=A1=E6=81=AF=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=B1=95=E7=A4=BA=E5=8C=BB=E4=BF=9D=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=81=E5=A4=B1=E8=83=BD=E7=AD=89=E7=BA=A7=E3=80=81?=
 =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E7=8A=B6=E6=80=81=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/elder/elderinfo/ElderInfo.data.ts   |  6 +-
 .../elderinfo/components/ElderInfoForm.vue    | 50 ++++++++----
 .../elderinfo/components/ElderUpInfoForm.vue  | 78 +++++--------------
 3 files changed, 60 insertions(+), 74 deletions(-)

diff --git a/src/views/elder/elderinfo/ElderInfo.data.ts b/src/views/elder/elderinfo/ElderInfo.data.ts
index d2a3706..ae1d134 100644
--- a/src/views/elder/elderinfo/ElderInfo.data.ts
+++ b/src/views/elder/elderinfo/ElderInfo.data.ts
@@ -157,7 +157,7 @@ export const applyObj = {
   national: '民族',
   houseAddress: '住址',
   avatarPath: '头像',
-  medicalType: '医保类型',
+  yblxName: '医保类型',
   reimbType: '报销类型',
   medicalCard: '医保卡号',
   educationLevel: '文化程度',
@@ -197,5 +197,7 @@ export const applyObj = {
   elderModifyStatus: '长者信息变更状态  1修改申请中 2通过 3驳回',
   elderModifyContent: '长者信息变更驳回原因',
   elderModifyId: '长者变更信息对应子表id nu_biz_elder_modify_info.id',
-  guardianIdCardPositive:'监护人身份证正面',
+  guardianIdCardPositive: '监护人身份证正面',
+  sndjName: '失能等级',
+  jfztName: '缴费状态',
 };
diff --git a/src/views/elder/elderinfo/components/ElderInfoForm.vue b/src/views/elder/elderinfo/components/ElderInfoForm.vue
index 687c759..805386b 100644
--- a/src/views/elder/elderinfo/components/ElderInfoForm.vue
+++ b/src/views/elder/elderinfo/components/ElderInfoForm.vue
@@ -10,13 +10,13 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="NUID" v-bind="validateInfos.nuId" id="ElderInfoForm-nuId" name="nuId">
-                <a-input v-model:value="formData.nuId" allow-clear></a-input>
+                <a-input v-model:value="formData.nuId" ></a-input>
                 <!-- <span>{{ formData.nuId }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="护理单元">
-                <a-input v-model:value="formData.nuId_dictText" allow-clear></a-input>
+                <a-input v-model:value="formData.nuId_dictText" ></a-input>
                 <!-- <j-dict-select-tag type='list' v-model:value="formData.nuId" :dictCode="`nu_base_info,nu_name,nu_id`"
                   placeholder="请选择分类标签" allowClear @upDictCode="upNuNameFunc" />-->
                 <!-- <span>{{ formData.nuId_dictText }}</span> -->
@@ -24,19 +24,19 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="姓名" v-bind="validateInfos.name" id="ElderInfoForm-name" name="name">
-                <a-input v-model:value="formData.name" allow-clear></a-input>
+                <a-input v-model:value="formData.name" ></a-input>
                 <!-- <span>{{ formData.name }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="性别" v-bind="validateInfos.sex" id="ElderInfoForm-sex" name="sex">
-                <a-input v-model:value="formData.sex" allow-clear></a-input>
+                <a-input v-model:value="formData.sex" ></a-input>
                 <!-- <span>{{ formData.sex }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="身份证号码" v-bind="validateInfos.idCard" id="ElderInfoForm-idCard" name="idCard">
-                <a-input v-model:value="formData.idCard" allow-clear></a-input>
+                <a-input v-model:value="formData.idCard" ></a-input>
                 <!-- <span>{{ formData.idCard }}</span> -->
               </a-form-item>
             </a-col>
@@ -44,13 +44,13 @@
               <a-form-item label="出生日期" v-bind="validateInfos.dateOfBirth" id="ElderInfoForm-dateOfBirth"
                 name="dateOfBirth">
                 <a-date-picker v-model:value="formData.dateOfBirth" value-format="YYYY-MM-DD " style="width: 100%"
-                  allow-clear />
+                   />
                 <!-- <span>{{ formData.dateOfBirth }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="民族" v-bind="validateInfos.national" id="ElderInfoForm-national" name="national">
-                <a-input v-model:value="formData.national" allow-clear></a-input>
+                <a-input v-model:value="formData.national" ></a-input>
                 <!-- <span>{{ formData.national }}</span> -->
               </a-form-item>
             </a-col>
@@ -61,6 +61,22 @@
                 <!-- <span>{{ formData.houseAddress }}</span> -->
               </a-form-item>
             </a-col>
+            <a-col :span="12">
+              <a-form-item label="医保类型" v-bind="validateInfos.yblxName">
+                <a-textarea v-model:value="formData.yblxName" :autosize="{ minRows: 1 }" />
+                <!-- <span>{{ formData.houseAddress }}</span> -->
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="失能等级" v-bind="validateInfos.sndjName">
+                <a-textarea v-model:value="formData.sndjName" :autosize="{ minRows: 1 }" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="缴费状态" v-bind="validateInfos.jfztName">
+                <a-textarea v-model:value="formData.jfztName" :autosize="{ minRows: 1 }" />
+              </a-form-item>
+            </a-col>
           </a-row>
           <a-row class="card-class">
             <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
@@ -78,28 +94,28 @@
             <a-col :span="12">
               <a-form-item label="姓名" v-bind="validateInfos.guardianName" id="ElderInfoForm-guardianName"
                 name="guardianName">
-                <a-input v-model:value="formData.guardianName" allow-clear></a-input>
+                <a-input v-model:value="formData.guardianName" ></a-input>
                 <!-- <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" allow-clear></a-input>
+                <a-input v-model:value="formData.relationship" ></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">
-                <a-input v-model:value="formData.guardianIdCard" allow-clear></a-input>
+                <a-input v-model:value="formData.guardianIdCard" ></a-input>
                 <!-- <span>{{ formData.guardianIdCard }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="联系电话" v-bind="validateInfos.guardianPhone" id="ElderInfoForm-guardianPhone"
                 name="guardianPhone">
-                <a-input v-model:value="formData.guardianPhone" allow-clear></a-input>
+                <a-input v-model:value="formData.guardianPhone" ></a-input>
                 <!-- <span>{{ formData.guardianPhone }}</span> -->
               </a-form-item>
             </a-col>
@@ -138,22 +154,22 @@
               <a-form-item label="有效开始日期" v-bind="validateInfos.startTime" id="ElderInfoForm-startTime"
                 name="startTime">
                 <a-date-picker v-model:value="formData.startTime" value-format="YYYY-MM-DD" style="width: 100%"
-                  allow-clear />
+                   />
                 <!-- <span>{{ formData.startTime }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="有效结束日期" v-bind="validateInfos.endTime" id="ElderInfoForm-endTime" name="endTime">
-                <a-input v-if="formData.endTime == '9999-12-31'" :value="'长期'" allow-clear></a-input>
+                <a-input v-if="formData.endTime == '9999-12-31'" :value="'长期'" ></a-input>
                 <a-date-picker v-else v-model:value="formData.endTime" value-format="YYYY-MM-DD" style="width: 100%"
-                  allow-clear />
+                   />
                 <!-- {{ formData.endTime == '9999-12-31' ? '长期' : formData.endTime }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority" id="ElderInfoForm-issuingAuthority"
                 name="issuingAuthority">
-                <a-input v-model:value="formData.issuingAuthority" allow-clear></a-input>
+                <a-input v-model:value="formData.issuingAuthority" ></a-input>
                 <!-- <span>{{ formData.issuingAuthority }}</span> -->
               </a-form-item>
             </a-col>
@@ -211,6 +227,9 @@ const formData = reactive<Record<string, any>>({
   guardianNational: '',
   guardianCardHome: '',
   guardianIdCardPositive: '',
+  yblxName: '',
+  sndjName: '',
+  jfztName: '',
 });
 const { createMessage } = useMessage();
 const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 8 } });
@@ -255,6 +274,7 @@ function edit(record) {
     })
     //赋值
     Object.assign(formData, tmpData);
+    console.log("🌊 ~ edit ~ formData:", formData)
   });
 }
 
diff --git a/src/views/elder/elderinfo/components/ElderUpInfoForm.vue b/src/views/elder/elderinfo/components/ElderUpInfoForm.vue
index 75d82d4..ff9064f 100644
--- a/src/views/elder/elderinfo/components/ElderUpInfoForm.vue
+++ b/src/views/elder/elderinfo/components/ElderUpInfoForm.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container2">
     <a-row>
-      <a-col :span="24" >
+      <a-col :span="24">
         <a-table :dataSource="filteredTableData" :columns="columns" :pagination="false" bordered size="small"
           :rowClassName="setRowClassName">
           <template #bodyCell="{ column, record }">
@@ -104,64 +104,28 @@ const validatorRules = reactive({
 const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
 const tableData = ref([]);
 const emit = defineEmits(['ok']);
-// 计算属性，过滤掉不需要显示的字段
 const filteredTableData = computed(() => {
   return tableData.value.filter(item =>
-    item.d1 !== 'id'
-    && item.d1 !== 'nuId'
-    // && item.d1 !== 'name'
-    // && item.d1 !== 'sex'
-    && item.d1 !== 'age'
-    // && item.d1 !== 'idCard'
-    // && item.d1 !== 'dateOfBirth'
-    // && item.d1 !== 'national'
-    // && item.d1 !== 'houseAddress'
-    && item.d1 !== 'avatarPath'
-    && item.d1 !== 'medicalType'
-    && item.d1 !== 'reimbType'
-    && item.d1 !== 'medicalCard'
-    && item.d1 !== 'educationLevel'
-    && item.d1 !== 'maritalStatus'
-    && item.d1 !== 'religiousBeliefs'
-    // && item.d1 !== 'idCardPositive'
-    // && item.d1 !== 'idCardNegative'
-    && item.d1 !== 'accountBookHimself'
-    && item.d1 !== 'frontMedical'
-    && item.d1 !== 'negaticeMedical'
-    && item.d1 !== 'content'
-    && item.d1 !== 'currentState'
-    && item.d1 !== 'guardianOpenId'
-    && item.d1 !== 'guardianName'
-    && item.d1 !== 'relationship'
-    && item.d1 !== 'guardianIdCard'
-    && item.d1 !== 'guardianPhone'
-    && item.d1 !== 'guardianDateOfBirth'
-    && item.d1 !== 'guardianHomeAddress'
-    && item.d1 !== 'guardianWorkUnit'
-    && item.d1 !== 'homeAddress'
-    && item.d1 !== 'delFlag'
-    && item.d1 !== 'createBy'
-    && item.d1 !== 'createTime'
-    && item.d1 !== 'updateBy'
-    && item.d1 !== 'updateTime'
-    && item.d1 !== 'sysOrgCode'
-    // && item.d1 !== 'issuingAuthority'
-    // && item.d1 !== 'startTime'
-    // && item.d1 !== 'endTime'
-    && item.d1 !== 'cardIssuing'
-    && item.d1 !== 'bloodType'
-    && item.d1 !== 'militaryType'
-    // && item.d1 !== 'guardianModifyStatus'
-    // && item.d1 !== 'guardianModifyContent'
-    // && item.d1 !== 'guardianModifyId'
-    // && item.d1 !== 'elderModifyStatus'
-    // && item.d1 !== 'elderModifyContent'
-    // && item.d1 !== 'elderModifyId'
-    && item.d1 !== 'guardianBirthDate'
-    && item.d1 !== 'guardianSex'
-    && item.d1 !== 'guardianNational'
-    && item.d1 !== 'guardianCardHome'
-    && item.d1 !== 'guardianIdCardPositive'
+    item.d1 == 'name'
+    || item.d1 == 'sex'
+    || item.d1 == 'idCard'
+    || item.d1 == 'dateOfBirth'
+    || item.d1 == 'national'
+    || item.d1 == 'houseAddress'
+    || item.d1 == 'idCardPositive'
+    || item.d1 == 'idCardNegative'
+    || item.d1 == 'issuingAuthority'
+    || item.d1 == 'startTime'
+    || item.d1 == 'endTime'
+    || item.d1 == 'guardianModifyStatus'
+    || item.d1 == 'guardianModifyContent'
+    || item.d1 == 'guardianModifyId'
+    || item.d1 == 'elderModifyStatus'
+    || item.d1 == 'elderModifyContent'
+    || item.d1 == 'elderModifyId'
+    || item.d1 == 'yblxName'
+    || item.d1 == 'sndjName'
+    || item.d1 == 'jfztName'
   );
 });