Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/apps/AppMonitoringObject/Add.vue

@@ -45,15 +45,12 @@
         <div class="form-item" v-if="id">
           <div class="form-item__wrapper">
             <div class="left">
-              <i style="width: 8px;"></i>
+              <i>*</i>
               <span>成员姓名</span>
             </div>
             <div class="right">
-              <AiPagePicker class="select" :selected.sync="userList">
-                <span v-if="!userList.length">请选择</span>
-                <span v-if="userList.length" style="color: #333;">{{ userList[0].name }}</span>
-                <u-icon name="arrow-right" color="#DDD" size="28"></u-icon>
-              </AiPagePicker>
+              <input placeholder="请输入" type="text" v-model="form.name" :maxlength="8"
+                    placeholder-style="color: #999; font-size: 30rpx;" disabled />
             </div>
           </div>
         </div>
@@ -77,7 +74,7 @@
             </div>
             <div class="right">
               <input placeholder="请输入" type="idcard" v-model="form.idNumber" :maxlength="18"
-                    placeholder-style="color: #999; font-size: 30rpx;" @input="changeIdNumber" :disabled="isEdit" />
+                    placeholder-style="color: #999; font-size: 30rpx;" @input="changeIdNumber" :disabled="id" />
             </div>
           </div>
         </div>
@@ -181,7 +178,7 @@
           </div>
         </div>
         <div class="upload">
-          <AiUploader :def.sync="photo" multiple placeholder="上传图片" :limit="1" action="/admin/file/add2"></AiUploader>
+          <AiUploader :def.sync="photo" multiple placeholder="上传图片" :limit="1" action="/admin/file/add2" :disabled="id"></AiUploader>
         </div>
       </div>
     
@@ -603,11 +600,12 @@ export default {
         this.flag = true
         this.id = query.id
         this.getInfo(this.id)
-        this.photo = this.form.photo
+        
       } else {
         this.form.currentAreaId = this.user.areaId
       }
     })
+    console.log(this.helthList);
   },
 
   onShow() {
@@ -638,9 +636,7 @@ export default {
       } else {
         this.helthList[i].checked = false // 取消
         this.namelist.map((item, index) => {
-          // 判断当前项是否取消
        if (item.dictValue == row.dictValue) {
-           // 如果当前项取消了,就删掉当前项
             this.namelist.splice(index, 1)
           }
         })
@@ -703,7 +699,6 @@ export default {
       }
 
       this.basicsCheckList.map((item, index) => {
-        console.log(item.checked,index);
        if (item.checked) {
           this.basicsList.push(index)
         }
@@ -735,17 +730,19 @@ export default {
       
       this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', {
         ...this.form,
-        id: this.isEdit ? this.id : ''
+        id: this.id || '',
+        girdId: this.user.girdCheckType == 1? this.user.girdId:'',
       }).then(res => {
         if (res.code == 0) {
           this.$u.toast(this.isEdit ? '保存成功' : '提交成功')
           uni.$emit('reload')
-          uni.navigateTo({url: './serviceResult'})
+          uni.navigateBack({
+            delta: 2
+          })
         }
       }).catch((err) => {
         this.$u.toast(err)
       })
-      // console.log(this.form);
     },
 
     onAreaChange(e) {
@@ -759,10 +756,31 @@ export default {
     getInfo(id) {
       this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
         if (res.code === 0) {
+          res.data.basicsCheckList = res.data.basicsCheck.split(',')
+          res.data.basicsCheckList.map((item,index)=> {
+            this.basicsCheckList[index].checked = true
+          })
+          res.data.guaranteeCheckList = res.data.guaranteeCheck.split(',')
+          res.data.guaranteeCheckList.map((item,index)=> {
+            this.guaranteeCheckList[index].checked = true
+          })
+
+          res.data.healthyStatusList = res.data.healthyStatus.split(',')
+
+          res.data.healthyStatusList.map((item)=>{
+            this.helthList.map(items=>{
+              if(item == items.dictValue) {
+                items.checked = true
+              }
+            })
+          })
+
+
           this.form = {
             ...this.form,
             ...res.data
           }
+          this.photo = [{url:this.form.photo}]
 
           if(this.form.photo) {
             this.form.files = [{url: this.form.photo}]

src/apps/AppMonitoringObject/Detail.vue

@@ -16,7 +16,7 @@
                 <p>{{ info.phone }}</p>
               </div>
             </div>
-            <span @click="linkTo('./residentDetail?id=' + info.id)">详情</span>
+            <span @click="linkTo(`./residentDetail?id=${info.id}`)">详情</span>
           </div>
           <div class="item-info">
             <label>现住地址</label>
@@ -361,7 +361,7 @@ export default {
       this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${this.id}`).then(res => {
         if (res.code === 0) {
           this.info = res.data
-
+          
           let ylbxCount = 0
           let ylCount = 0
           if(res.data.family && res.data.family.length) {

src/apps/AppMonitoringObject/residentDetail.vue

@@ -10,7 +10,7 @@
             <p>{{ info.phone }}</p>
           </div>
         </div>
-        <span>户主</span>
+        <span>{{ $dict.getLabel('fpRelationship',info.householdRelation) }}</span>
       </div>
       <div class="item-info">
         <label>现住地址</label>
@@ -23,15 +23,15 @@
       <div class="more-info">
         <div class="item-info">
           <label>身份证号</label>
-          <span>{{ $dict.getLabel('fpNation', info.nation) }}</span> 
+          <span>{{ info.idNumber }}</span> 
         </div>
         <div class="item-info">
           <label>性别</label>
-          <span>{{ $dict.getLabel('fpNation', info.nation) }}</span> 
+          <span>{{ $dict.getLabel('sex', info.sex) }}</span> 
         </div>
         <div class="item-info">
           <label>出生日期</label>
-          <span>{{ $dict.getLabel('fpNation', info.nation) }}</span> 
+          <span>{{ info.birthDate }}</span> 
         </div>
         <div class="item-info">
           <label>民族</label>
@@ -51,65 +51,69 @@
         </div>
         <div class="item-info">
           <label>健康状况</label>
-          <span>{{ $dict.getLabel('fpHealth', info.healthyStatus) }}</span> 
+          <span>
+             <span v-for="(item, index) in healthyStatusList" :key="index"><span v-if="index > 0">,</span>{{$dict.getLabel("fpHealth", item)}}</span>
+          </span>
+          
+          <!-- <span v-for="(item,index) in">{{ $dict.getLabel('fpHealth', info.healthyStatus) }}</span>  -->
         </div>
         <div class="item-info">
           <label>残疾类别</label>
-          <span>{{ $dict.getLabel('fpNation', info.nation) }}</span> 
+          <span>{{ $dict.getLabel('fpDisabilityType', info.disabilityType) }}</span> 
         </div>
         <div class="item-info">
           <label>残疾证办证年度</label>
-          <span>{{ $dict.getLabel('fpNation', info.nation) }}</span> 
+          <span>{{ $dict.getLabel('fpYear', info.disabilityCertificateYear) }}</span> 
         </div>
         <!-- 基础保障 -->
         <h4 style="fon-size: 17px;font-weight: 600;margin-top: 8px;">基础保障</h4>
         <div class="item-info">
           <label>是否参加城乡居民基本医保</label>
-          <span>{{ $dict.getLabel('fpYesOrNo', info.basicMedicalTreatment) }}</span>
+          <span>{{ $dict.getLabel('fpYesOrNo', info.jcbxCxyiliao) }}</span>
         </div>
         <div class="item-info">
           <label>是否参加城镇职工基本医保</label>
-          <span>{{ $dict.getLabel('fpYesOrNo', info.basicMedicalTreatment) }}</span>
+          <span>{{ $dict.getLabel('fpYesOrNo', info.jcbxCzyiliao) }}</span>
         </div>
         <div class="item-info">
           <label>是否参加大病保险</label>
-          <span>{{ $dict.getLabel('fpYesOrNo', info.basicMedicalTreatment) }}</span>
+          <span>{{ $dict.getLabel('fpYesOrNo', info.jcbxDabing) }}</span>
         </div>
         <div class="item-info">
           <label>是否参加商业补充医保</label>
-          <span>{{ $dict.getLabel('fpYesOrNo', info.basicMedicalTreatment) }}</span>
+          <span>{{ $dict.getLabel('fpYesOrNo', info.jcbxShangye) }}</span>
         </div>
         <div class="item-info">
           <label>是否参加城乡居民养老保险</label>
-          <span>{{ $dict.getLabel('fpYesOrNo', info.basicMedicalTreatment) }}</span>
+          <span>{{ $dict.getLabel('fpYesOrNo', info.jcbxCxyanglao) }}</span>
         </div>
         <div class="item-info">
           <label>是否参加城镇职工养老保险</label>
-          <span>{{ $dict.getLabel('fpYesOrNo', info.basicMedicalTreatment) }}</span>
+          <span>{{ $dict.getLabel('fpYesOrNo', info.jcbxCzyanglao) }}</span>
         </div>
         <div class="item-info">
           <label>享受人身意外保险</label>
-          <span>{{ $dict.getLabel('fpYesOrNo', info.basicMedicalTreatment) }}</span>
+          <span>{{ $dict.getLabel('fpYesOrNo', info.jcbxRenshenyiwai) }}</span>
         </div>
         <div class="item-info">
           <label>享受最低生活保障</label>
-          <span>{{ $dict.getLabel('fpYesOrNo', info.subsistenceAllowance) }}</span>
+          <span>{{ $dict.getLabel('fpYesOrNo', info.bzcsNongcundibao) }}</span>
         </div>
         <div class="item-info">
           <label>是否特困供养</label>
-          <span>{{ $dict.getLabel('fpYesOrNo', info.subsistenceAllowance) }}</span>
+          <span>{{ $dict.getLabel('fpYesOrNo', info.bzcsTekungongyang) }}</span>
         </div>
         <div class="item-info">
           <label>分散转集中供养</label>
-          <span>{{ $dict.getLabel('fpYesOrNo', info.subsistenceAllowance) }}</span>
+          <span>{{ $dict.getLabel('fpYesOrNo', info.bzcsWubaohu) }}</span>
         </div>
         <div class="item-info">
           <label>是否接受医疗救助</label>
-          <span>{{ $dict.getLabel('fpYesOrNo', info.specialPovertySupport) }}</span>
+          <span>{{ $dict.getLabel('fpYesOrNo', info.bzcsYiliaojiuzhu) }}</span>
         </div>
         <div class="item-info">
           <label>是否接受其他健康扶助</label>
-          <span>{{ $dict.getLabel('fpYesOrNo', info.specialPovertySupport) }}</span>
+          <span>{{ $dict.getLabel('fpYesOrNo', info.bzcsQita) }}</span>
         </div>
         <!-- 务工就业 -->
         <h4 style="fon-size: 17px;font-weight: 600;margin-top: 8px;">务工就业</h4>
@@ -119,15 +123,15 @@
         </div>
         <div class="item-info">
           <label>是否会讲普通话</label>
-          <span>{{ $dict.getLabel('fpLaborSkills', info.labourStatus) }}</span>  
+          <span>{{ $dict.getLabel('fpYesOrNo', info.mandarin) }}</span>  
         </div>
         <div class="item-info">
           <label>就业渠道</label>
-          <span>{{ $dict.getLabel('fpLaborSkills', info.labourStatus) }}</span>  
+          <span>{{ $dict.getLabel('fpEmploymentChannels', info.employmentChannels) }}</span>  
         </div>
         <div class="item-info">
           <label>务工企业名称</label>
-          <span>{{ $dict.getLabel('fpLaborSkills', info.labourStatus) }}</span>  
+          <span>{{ info.migrantEnterprises }}</span>  
         </div>
         <div class="item-info">
           <label>务工时间/月</label>
@@ -135,19 +139,19 @@
         </div>
         <div class="item-info">
           <label>公益性岗位</label>
-          <span>{{ info.workeMonths }}</span>
+          <span>{{ info.publicWelfarePosts }}</span>
         </div>
         <div class="item-info">
           <label>公益性岗位(月数)</label>
-          <span>{{ info.workeMonths }}</span>
+          <span>{{ info.publicWelfarePostsMonths }}</span>
         </div>
         <div class="item-info">
           <label>是否国外务工</label>
-          <span>{{ info.workeMonths }}</span>
+          <span>{{ $dict.getLabel('fpYesOrNo',info.foreignWorkers) }}</span>
         </div>
         <div class="item-info">
           <label>务工所在地</label>
-          <span>{{ info.workArea }}</span>
+          <span>{{ info.foreignWorkersAddress }}</span>
         </div>
       </div>
     </div>
@@ -163,17 +167,22 @@ export default {
     return {
       id: '',
       info: {},
+      healthyStatusList: []
     }
   },
   onLoad(o) {
+    this.$dict.load('fpRelationship','sex','fpNation','fpPoliticalOutlook','fpYear','fpLaborSkills','fpEmploymentChannels')
     this.id = o.id,
     this.getInfo()
+
   },
   methods: {
     getInfo() {
       this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${this.id}`).then(res => {
         if (res.code === 0) {
           this.info = res.data
+          this.healthyStatusList = res.data.healthyStatus.split(',')
+          
         }
       })
     },