- 证件号码: {{ formData.idNumber || '-' }}
+
+ 证件号码: {{ formData.identityNo || '-' }}
+
+
+ 护理等级: {{ dicsStore.getDictLabel('Care_Level', formData.archive.nursingLevel) ||
+ '-' }}
+
+
+ 健康状况: {{ dicsStore.getDictLabel('Health_Condition',
+ formData.archive.healthStatus) || '-' }}
+
+
+
+ 生存状态: {{ dicsStore.getDictLabel('LIVING_STATUS',
+ formData.archive.survivalStatus) || '-' }}
+
+
+ 服务状态: {{ dicsStore.getDictLabel('SERVICE_STATUS',
+ formData.archive.serviceStatus) || '-' }}
+
+
+
+ 服务形式: {{ dicsStore.getDictLabel('Service_Format', formData.archive.serviceForm)
+ || '-' }}
+
+
+
+
+ 居住情况: {{ dicsStore.getDictLabel('Living_Situation',
+ formData.archive.livingSituation) || '-' }}
+
+
+ 子女情况: {{ dicsStore.getDictLabel('CHILDREN_STATE',
+ formData.archive.childrenSituation) || '-' }}
+
+
+ 统计分类: {{ dicsStore.getDictLabel('Statistical_Classification',
+ formData.archive.statisticsCategory) || '-' }}
+
+
+
+ 智力情况: {{ dicsStore.getDictLabel('Intellectual_Condition',
+ formData.archive.intellectualSituation) || '-' }}
+
+
+ 长期照料失能子女: {{ dicsStore.getDictLabel('Disabled_Child',
+ formData.archive.longTermCareForDisabledChildren) || '-' }}
+
+
+ 子女探望情况: {{ dicsStore.getDictLabel('Frequency_Visits',
+ formData.archive.childrenVisitStatus) || '-' }}
+
+
+
+ 人户分离: {{ dicsStore.getDictLabel('Separation',
+ formData.archive.householdResidenceSeparation) || '-' }}
+
+
+ 民族: {{ dicsStore.getDictLabel('Ethnicity', formData.archive.ethnicity) || '-' }}
+
+
+
+ 完成能力评估: {{ dicsStore.getDictLabel('Capability_Assessment',
+ formData.archive.completedCapacityAssessment) || '-' }}
+
+
+
+ 住出租屋/地下室: {{ dicsStore.getDictLabel('Property_Basement',
+ formData.archive.livesInRentedRoomOrBasement) || '-' }}
+
+
+ 经济来源: {{ dicsStore.getDictLabel('Source_Income',
+ formData.archive.economicSource) || '-' }}
+
+
+ 文化程度: {{ dicsStore.getDictLabel('Level_Education',
+ formData.archive.educationLevel) || '-' }}
+
+
+
+ 宗教信仰: {{ dicsStore.getDictLabel('Religious_belief', formData.archive.religion)
+ || '-' }}
+
+
+ 职业情况: {{ dicsStore.getDictLabel('Employment_Status',
+ formData.archive.occupation) || '-' }}
+
+
+ 政治面貌: {{ dicsStore.getDictLabel('Political_affiliation',
+ formData.archive.politicalAffiliation) || '-' }}
+
+
+
+ 婚姻情况: {{ dicsStore.getDictLabel('Marital_Status',
+ formData.archive.maritalStatus) || '-' }}
+
+
+
+
+ 政府购买服务时间:
+ {{ formatDate(formData.archive.starGovernmentService) }}- {{ formatDate(formData.archive.endGovernmentService)
+ }}
+
+
-
+
家庭地址:
- {{ formatArea(formData.homeAreaLabels) }} {{ formData.homeDetailAddress || '' }}
+ {{ formatArea(formData.archive.homeAreaLabels) }} {{ formData.archive.homeDetailAddress || '' }}
(经度: {{ formData.lag }}, 纬度: {{ formData.lat }})
-
- 护理等级: {{ formData.nursingLevel || '-' }}
-
-
- 健康状况: {{ formData.healthStatus || '-' }}
-
-
-
- 生存状态: {{ formData.survivalStatus || '-' }}
-
-
- 服务状态: {{ formData.serviceStatus || '-' }}
-
-
-
- 服务形式: {{ formData.serviceForm || '-' }}
-
-
+
户籍地址:
- {{ formatArea(formData.houseAreaLabels) }} {{ formData.householdDetailAddress || '' }}
+ {{ formatArea(formData.archive.houseAreaLabels) }} {{ formData.archive.householdDetailAddress || '' }}
-
-
-
-
- 政府购买服务开始时间(起):
- {{ formatDate(formData.governmentPurchasedServiceStartDateStart) }}
-
-
-
-
- 政府购买服务开始时间(止):
- {{ formatDate(formData.governmentPurchasedServiceStartDateEnd) }}
-
-
-
-
-
- 居住情况: {{ formData.livingSituation || '-' }}
-
-
- 子女情况: {{ formData.childrenSituation || '-' }}
-
-
- 统计分类: {{ formData.statisticsCategory || '-' }}
-
-
-
- 智力情况: {{ formData.intellectualSituation || '-' }}
-
-
-
- 长期照料失能子女:
- {{ formData.longTermCareForDisabledChildren === 'true' ? '是' : formData.longTermCareForDisabledChildren === 'false' ? '否' : '-' }}
-
-
-
- 子女探望情况: {{ formData.childrenVisitStatus || '-' }}
-
-
-
-
- 人户分离:
- {{ formData.householdResidenceSeparation === 'true' ? '是' : formData.householdResidenceSeparation === 'false' ? '否' : '-' }}
-
-
-
- 民族: {{ formData.ethnicity || '-' }}
-
-
-
- 完成能力评估:
- {{ formData.completedCapacityAssessment === 'true' ? '是' : formData.completedCapacityAssessment === 'false' ? '否' : '-' }}
-
-
-
-
-
- 住出租屋/地下室:
- {{ formData.livesInRentedRoomOrBasement === 'true' ? '是' : formData.livesInRentedRoomOrBasement === 'false' ? '否' : '-' }}
-
-
-
- 经济来源: {{ formData.economicSource || '-' }}
-
-
- 文化程度: {{ formData.educationLevel || '-' }}
-
-
-
- 宗教信仰: {{ formData.religion || '-' }}
-
-
- 职业情况: {{ formData.occupation || '-' }}
-
-
- 政治面貌: {{ formData.politicalAffiliation || '-' }}
-
-
-
- 婚姻情况: {{ formData.maritalStatus || '-' }}
-
-
-
-
+
+
\ No newline at end of file
diff --git a/src/views/serverObj/serverList/components/detail.vue b/src/views/serverObj/serverList/components/detail.vue
index 6b89834..be89579 100644
--- a/src/views/serverObj/serverList/components/detail.vue
+++ b/src/views/serverObj/serverList/components/detail.vue
@@ -1,31 +1,40 @@
-
-
-
+
+
+
-
-
{{ formData.name }}{{ formData.gender }}{{ formData.age }}
-
身份证号:{{ formData.idNumber }}
-
手机号:{{ formData.contact1 }}
-
-
{{ value }}
+
+
+ {{ formData.name }}
+ {{ formData.gender === '1' ? '男' : '女' }}
+ {{ formData.age }}
+
+
+ 身份证号:{{ formData.idNumber }}
+ 手机号:{{ formData.contact1 }}
+
+
+
+ {{ value }}
+
+
-
-
-
+
+
+
@@ -37,21 +46,43 @@
-
-
+
\ No newline at end of file
diff --git a/src/views/serverObj/serverList/index.vue b/src/views/serverObj/serverList/index.vue
index 24418c9..93aca76 100644
--- a/src/views/serverObj/serverList/index.vue
+++ b/src/views/serverObj/serverList/index.vue
@@ -353,7 +353,7 @@
-
+