家庭收支

2022-04-29 09:57:50 +08:00
parent 543f31d60c
commit 26c37b0c03
5 changed files with 84 additions and 40 deletions
--- a/src/apps/AppMonitoringObject/Add.vue
+++ b/src/apps/AppMonitoringObject/Add.vue
@@ -564,8 +564,7 @@ export default {
        {dictName: '是否接受其它健康扶贫', checked: false},
      ],
      guaranteeList: [],
-
-
+      isAdd: 'false',
    }
  },
  computed: {
@@ -601,9 +600,11 @@ export default {
        this.id = query.id
        this.getInfo(this.id)

-      } else {
+        
+      } else if (!query.id) {
        this.form.currentAreaId = this.user.areaId
      } 
+    //   else if (query.id && isAdd)
    })
    console.log(this.helthList);
  },
@@ -699,7 +700,7 @@ export default {
      }

      this.basicsCheckList.map((item, index) => {
-       if (item.checked) {
+      if (item.checked) {
          this.basicsList.push(index)
        }
      })
@@ -707,10 +708,11 @@ export default {
      this.form.basicsCheck = this.basicsList.join(',')

      this.guaranteeCheckList.map((item, index) => {
-       if (item.checked) {
+      if (item.checked) {
          this.guaranteeList.push(index)
        }
      })
+      
      this.form.guaranteeCheck = this.guaranteeList.join(',')

      this.checkInit('jcbxCxyiliao',this.basicsCheckList, 0)
@@ -727,7 +729,6 @@ export default {
      this.checkInit('bzcsYiliaojiuzhu',this.guaranteeCheckList, 3)
      this.checkInit('bzcsQita',this.guaranteeCheckList, 4)

-      
      this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', {
        ...this.form,
        id: this.id || '',
--- a/src/apps/AppMonitoringObject/Detail.vue
+++ b/src/apps/AppMonitoringObject/Detail.vue
@@ -70,11 +70,11 @@
          </div>
          <div class="item-info">
            <label>是否危房</label>
-            <span>{{ $dict.getLabel('fpPrtpStatus', info.status) || '-' }}</span>
+            <span>{{ $dict.getLabel('fpYesOrNo', info.dilapidatedHousehold) || '-' }}</span>
          </div>
          <div class="item-info">
-            <label>饮用水安全问题</label>
-            <span>{{ $dict.getLabel('fpRiskType', info.riskType) || '-' }}</span>
+            <label>是否解决安全饮水</label>
+            <span>{{ $dict.getLabel('fpYesOrNo', info.drinkingWaterSafety) || '-' }}</span>
          </div>
        </div>
        <div class="item-wrapper">
@@ -87,11 +87,11 @@
          </div>
          <div class="item-info">
            <label>风险因素</label>
-            <span>{{ info.income8 }}元</span>
+            <span>{{ $dict.getLabel('fpRiskType', info.riskType) }}</span>
          </div>
          <div class="item-info">
            <label>风险是否已消除</label>
-            <span>{{ info.income9 }}元</span>
+            <span>{{ $dict.getLabel('fpYesOrNo', info.riskEliminated) }}</span>
          </div>
        </div>
        <div class="item-wrapper">
@@ -104,11 +104,11 @@
          </div>
          <div class="item-info">
            <label>家庭纯收入</label>
-            <span>{{ info.income8 }}元</span>
+            <span>{{ info.fxxcIncome8 }}元</span>
          </div>
          <div class="item-info">
            <label>家庭人均纯收入</label>
-            <span>{{ info.income9 }}元</span>
+            <span>{{ info.fxxcIncome9 }}元</span>
          </div>
        </div>
        <!-- 风险解除 -->
--- a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
+++ b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
@@ -83,7 +83,7 @@
            <span>现住址</span>
          </div>
          <div class="right">
-            <AiAreaPicker ref="address" class="aiArea" :fullName.sync="form.currentAreaName"  v-model="form.currentAreaId" :areaId="$areaId" mode="custom" all @select="onAreaChange">
+            <AiAreaPicker ref="address" class="aiArea" :fullName.sync="form.currentAreaName"  v-model="form.currentAreaId" :areaId="$areaId" mode="custom" :root="$areaId" @select="onAreaChange">
                <div class="aiArea">
                  <span class="label" v-if="form.currentAreaName" style="color:#333;">{{ form.currentAreaName }}</span>
                  <span v-else>请选择</span>
@@ -280,7 +280,7 @@
 </template>

 <script>
-
+import {mapState} from 'vuex'
 export default {
  data() {
    return {
@@ -301,11 +301,11 @@ export default {
        labourStatus: '',
        workArea: '',
        workeMonths: '',
-        basicMedicalTreatment: '02',
-        seriousIllnessInsurance: '02',
-        endowmentInsurance: '02',
-        subsistenceAllowance: '02',
-        specialPovertySupport: '02',
+        basicMedicalTreatment: '',
+        seriousIllnessInsurance: '',
+        endowmentInsurance: '',
+        subsistenceAllowance: '',
+        specialPovertySupport: '',
        girdId: '',
        girdName: '',
        healthyStatus: '',
@@ -332,11 +332,13 @@ export default {
        return [this.isEdit,this.form.name,this.form.idNumber]
      }
    },
+    ...mapState(['user'])
  },

  onLoad(query) {
    this.householdIdNumber = query.houseIdNumber
    this.objectType = query.objectType
+    this.form.currentAreaId = this.user.areaId
    this.$dict.load(['fpRelationship','riskEliminationMethod', 'fpRiskType', 'fpYesOrNo', 'fpNation', 'fpEducation', 'fpStudentsInSchool', 'fpHealth',
    'fpLaborSkills', 'fpPoliticalOutlook', 'sex', 'fpHealth']).then(() => {
        if(query.id) {
--- a/src/apps/AppMonitoringObject/MonitorFamilySituation.vue
+++ b/src/apps/AppMonitoringObject/MonitorFamilySituation.vue
@@ -281,27 +281,28 @@ export default {
    return {
      form: {
        objectType: '',
-        dilapidatedHousehold: '',
-        drinkingWaterSafety: '',
+        dilapidatedHousehold: '02',
+        drinkingWaterSafety: '02',
        move: '02',
        houseArea: '',
        trunkRoadDistance: '',
        houseRoadType: '',
        fuelType:'',
-        houseDamage: '',
-        drinkingWaterDamage: '',
-        toilet: '',
-        electric: '',
-        television: '',
+        houseDamage: '02',
+        drinkingWaterDamage: '02',
+        toilet: '02',
+        electric: '02',
+        television: '02',
        cultivatedLandArea: '', // 耕地面积
        orchardArea: '',
        woodlandArea: '',
        grainForGreenArea: '',
        grazingGrasslandArea: '',
-        longtouqiye: '',
-        produceElectric: '',
-        nongheshe: '',
-        cyzfdtr: '',
+        watersArea: '',
+        longtouqiye: '02',
+        produceElectric: '02',
+        nongheshe: '02',
+        cyzfdtr: '02',
      },
      id: '',
      girdId: '',
@@ -341,6 +342,7 @@ export default {
    },

    submit() {
+
      this.form.girdId = this.girdId
      this.form.girdName = this.girdName
      this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', {
--- a/src/apps/AppMonitoringObject/familyRisk.vue
+++ b/src/apps/AppMonitoringObject/familyRisk.vue
@@ -19,7 +19,7 @@
            <span>脱贫年度</span>
          </div>
          <div class="right">
-            <AiSelect dict="fpYera" v-model="form.povertyYear"></AiSelect>
+            <AiSelect dict="fpYear" v-model="form.povertyYear"></AiSelect>
          </div>
        </div>
      </div>
@@ -88,7 +88,7 @@
      </div>
    </div>

-    <div class="btn">保存</div>
+    <div class="btn" @click="submit">保存</div>
  </div>
 </template>

@@ -102,21 +102,60 @@ export default {
        povertyYear: '',
        riskType: '',
        naturalDisasterType: '',
-        militaryMartyrs: '',
-        dropOutOfSchool: '',
+        militaryMartyrs: '02',
+        dropOutOfSchool: '02',
        dropOutOfSchoolReason: '',
      },
      value: '',
    }
  },
-  onLoad() {
-    this.$dict.load('fpYera','fpType','fpRiskType','fpNaturalDisaster')
+  onLoad(query) {
+    this.$dict.load('fpYear','fpType','fpRiskType','fpNaturalDisaster').then(()=>{
+      this.getInfo(query.id)
+    })
+    this.id = query.id
+    this.girdId = query.girdId
+    this.girdName = query.girdName
  },
  onShow() {
    document.title = '家庭风险情况'
  },
  methods: {
+    getInfo(id) {
+      this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.form = {
+            ...this.form,
+            ...res.data
+          }
+        }
+        uni.hideLoading()
+      })
+    },

+    submit() {
+      if (!this.form.objectType) {
+        return this.$u.toast('请选择监测对象类型')
+      }
+      if (!this.form.riskType) {
+        return this.$u.toast('请选择风险因素')
+      }
+
+      this.form.girdId = this.girdId
+      this.form.girdName = this.girdName
+      this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', {
+        ...this.form,
+        id: this.id
+      }).then(res => {
+        if (res.code === 0) {
+          this.$u.toast('保存成功')
+          uni.$emit('reload')
+          uni.navigateBack({
+            delta: 1
+          })
+        }
+      })
+    },
  }
 }
 </script>