监测对象

src/apps/AppMonitoringObject/MonitorFamilyMember.vue

@@ -21,23 +21,23 @@
         </div>
         <div class="item-info__item">
           <label>政治面貌</label>
-          <span>{{ $dict.getLabel('fpPoliticalOutlook', item.politicalOutlook) }}</span>
+          <span>{{ $dict.getLabel('fpPoliticalOutlook', item.politicsStatus) }}</span>
         </div>
         <div class="item-info__item">
           <label>文化程度</label>
           <span>{{ $dict.getLabel('fpEducation', item.education) }}</span>
         </div>
         <div class="item-info__item">
-          <label>在校情况</label>
-          <span>{{ $dict.getLabel('fpStudentsInSchool', item.studentsInSchool) }}</span>
+          <label>在校生情况</label>
+          <span>{{ $dict.getLabel('fpStudentsInSchool', item.schoolStatus) }}</span>
         </div>
         <div class="item-info__item">
           <label>健康状况</label>
-          <span>{{ $dict.getLabel('fpHealth', item.health) }}</span>
+          <span>{{ $dict.getLabel('fpHealth', item.healthyStatus) }}</span>
         </div>
         <div class="item-info__item">
           <label>劳动技能</label>
-          <span>{{ $dict.getLabel('fpLaborSkills', item.laborSkills) }}</span>
+          <span>{{ $dict.getLabel('fpLaborSkills', item.labourStatus) }}</span>
         </div>
         <div class="item-info__item">
           <label>务工区域</label>
@@ -45,15 +45,15 @@
         </div>
         <div class="item-info__item">
           <label>务工时间</label>
-          <span>{{ item.workingMonths }}月</span>
+          <span>{{ item.workeMonths }}月</span>
         </div>
         <div class="item-info__item">
           <label>是否参加医疗参保</label>
-          <span>{{ $dict.getLabel('fpYesOrNo', item.medicalInsurance) }}</span>
+          <span>{{ $dict.getLabel('fpYesOrNo', item.basicMedicalTreatment) }}</span>
         </div>
         <div class="item-info__item">
           <label>是否参加大病保险</label>
-          <span>{{ $dict.getLabel('fpYesOrNo', item.sicknessInsurance) }}</span>
+          <span>{{ $dict.getLabel('fpYesOrNo', item.seriousIllnessInsurance) }}</span>
         </div>
         <div class="item-info__item">
           <label>是否参加养老保险</label>
@@ -65,7 +65,7 @@
         </div>
         <div class="item-info__item">
           <label>是否特困供养</label>
-          <span>{{ $dict.getLabel('fpYesOrNo', item.destitute) }}</span>
+          <span>{{ $dict.getLabel('fpYesOrNo', item.specialPovertySupport) }}</span>
         </div>
         <div class="item-info__item">
         </div>
@@ -98,7 +98,9 @@ export default {
       list: [],
       id: '',
       info: {},
-      pageShow: false
+      pageShow: false,
+      houseIdNumber: '',
+      objectType: '',
     }
   },
 
@@ -107,51 +109,45 @@ export default {
   },
 
   onLoad(query) {
-    uni.showLoading()
-    this.id = query.id
-    this.$dict.load(['fpRelationship', 'sex', 'fpNation', 'fpHealth', 'fpEducation', 'fpYesOrNo', 'fpLaborSkills', 'fpPoliticalOutlook',
-      'fpRelationship', 'fpStudentsInSchool', 'fpFnancialAssistance', 'fpHealthAssistance', 'fpHousingSecurity']).then(() => {
-      this.getInfo(query.id)
+    this.houseIdNumber = query.houseIdNumber
+    this.objectType = query.objectType
+    this.$dict.load(['fpRelationship','riskEliminationMethod', 'fpRiskType', 'fpYesOrNo', 'fpNation', 'fpEducation', 'fpStudentsInSchool', 'fpHealth',
+    'fpLaborSkills', 'fpPoliticalOutlook', 'sex', 'fpHealth']).then(() => {
+      if(query.id) {
+        this.id = query.id
+        this.getInfo()
+      }
     })
 
     uni.$on('reload', () => {
-      this.getInfo(query.id)
+      this.getInfo()
     })
   },
 
   methods: {
     toAdd() {
       uni.navigateTo({
-        url: './MonitorAddFamilyMember?id=' + this.id
+        // url: './MonitorAddFamilyMember?id=' + this.id
+        url: `./MonitorAddFamilyMember?houseIdNumber=${this.houseIdNumber}&objectType=${this.objectType}`
       })
     },
 
     toEdit(index) {
       this.$confirm('确定编辑该数据？').then(() => {
         uni.navigateTo({
-          url: `./MonitorAddFamilyMember?id=${this.id}&index=${index}`
+          url: `./MonitorAddFamilyMember?id=${this.list[index].id}&houseIdNumber=${this.houseIdNumber}&objectType=${this.objectType}`
         })
-      }).catch(() => {
       })
     },
 
     remove(index) {
-      this.$confirm('确定删除该数据？').then(() => {
-        let familyList = JSON.parse(JSON.stringify(this.list))
-        familyList.splice(index, 1)
-        uni.showLoading()
-        this.$http.post('/app/apppreventionreturntopoverty/addOrUpdate', {
-          ...this.info,
-          familyList,
-          id: this.id
-        }).then(res => {
+      this.$confirm('', '确定删除该数据？').then(() => {
+        this.$http.post(`/app/apppreventionreturntopoverty/delete?ids=${this.list[index].id}`).then(res => {
           if (res.code === 0) {
             this.$u.toast('删除成功')
-            this.getInfo(this.id)
+            uni.$emit('reload')
           }
-          uni.hideLoading()
         })
-      }).catch(() => {
       })
     },
 
@@ -159,22 +155,21 @@ export default {
       this.list[index].isShow = !this.list[index].isShow
     },
 
-    getInfo(id) {
-      this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
+    getInfo() {
+      this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${this.id}`).then(res => {
         if (res.code === 0) {
           this.info = res.data
-          this.list = res.data.familyList.map(item => {
-            return {
-              ...item,
-              isShow: false,
-              age: this.$calcAge(item.idNumber)
-            }
-          })
-
+          if(res.data.family && res.data.family.length) {
+            this.list = res.data.family.map(item => {
+              return {
+                ...item,
+                isShow: false,
+                age: this.$calcAge(item.idNumber)
+              }
+            })
+          }
           this.pageShow = true
         }
-
-        uni.hideLoading()
       })
     }
   }