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 @@
-
+
-
+
@@ -24,19 +24,19 @@
-
+
-
+
-
+
@@ -44,13 +44,13 @@
+ />
-
+
@@ -61,6 +61,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -78,28 +94,28 @@
-
+
-
+
-
+
@@ -138,22 +154,22 @@
+ />
-
+
+ />
-
+
@@ -211,6 +227,9 @@ const formData = reactive>({
guardianNational: '',
guardianCardHome: '',
guardianIdCardPositive: '',
+ yblxName: '',
+ sndjName: '',
+ jfztName: '',
});
const { createMessage } = useMessage();
const labelCol = ref({ 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 @@
-
+
@@ -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'
);
});