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

src/apps/AppMonitoringObject/Add.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="add">
-    <div class="steps">
+    <div class="steps" v-if="!id">
       <u-steps :list="numList" :current="current" mode="number"></u-steps>
     </div>
-    <div class="form" v-if="current == 0">
+    <div class="form" v-if="current == 0 || id">
       <div class="form-group">
-        <div class="form-item">
+        <div class="form-item" v-if="!id">
           <div class="form-item__wrapper">
             <div class="left">
               <i>*</i>
@@ -16,6 +16,17 @@
             </div>
           </div>
         </div>
+        <div class="form-item" v-if="id">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i style="width: 8px;">*</i>
+              <span>与户主关系</span>
+            </div>
+            <div class="right">
+              <AiSelect dict="fpRelationship" v-model="form.relationship"></AiSelect>
+            </div>
+          </div>
+        </div>
         <div class="form-item">
           <div class="form-item__wrapper">
             <div class="left">
@@ -32,6 +43,21 @@
           </div>
         </div>
         <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i style="width: 8px;"></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>
+            </div>
+          </div>
+        </div>
+        <div class="form-item" v-if="!id">
           <div class="form-item__wrapper">
             <div class="left">
               <i>*</i>
@@ -136,7 +162,7 @@
         <div class="form-item">
           <div class="form-item__wrapper">
             <div class="left">
-              <i style="opacity: 0;">*</i>
+              <i style="width: 8px;"></i>
               <span>文化程度</span>
             </div>
             <div class="right">
@@ -165,8 +191,8 @@
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="left">
-            <i style="opacity: 0;">*</i>
-            <span>在校情况</span>
+            <i style="width: 8px;"></i>
+            <span>在校生状况</span>
           </div>
           <div class="right">
             <AiSelect dict="fpStudentsInSchool" v-model="form.schoolStatus"></AiSelect>
@@ -194,15 +220,13 @@
     <!-- 残疾类别 -->
     <div class="form-group">
       <div class="form-item">
-        <div class="form-item__wrappers">
-          <div class="top">
-            <i style="opacity: 0;">*</i>
-            <span>残疾类别(可多选)</span>
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i style="width: 8px;"></i>
+            <span>残疾类别</span>
           </div>
-          <div class="bottoms">
-            <div class="cards" v-for="(e, index) in helthList" :key="index">
-              <div :style="{color:e.checked == true ? '#1174FE' : '#333'}" @click="userClick(e, index)"  >{{ e.dictName }}</div>
-            </div>
+          <div class="right">
+            <AiSelect dict="fpStudentsInSchool" v-model="form.schoolStatus"></AiSelect>
           </div>
         </div>
       </div>
@@ -363,7 +387,7 @@
     </div>
     <!-- <div style="height: 8px; width: 100%;background: #f3f4f5;"></div> -->
 
-    <div class="form-group" v-if="flag">
+    <div class="form-group" v-if="flag && !id">
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="left">
@@ -452,6 +476,7 @@
    
     
     <div class="btn" hover-class="text" @click="nextStep" v-if="current == 0">下一步</div>
+    <div class="btn" hover-class="text" @click="submit" v-if="current == 0 && id">保存</div>
     <div class="btn" hover-class="text" @click="submit" v-if="current == 1"> {{ girdInfo.checkType == 2 ? '保存' : '申请纳入监测' }}</div>
   </div>
 </template>

src/apps/AppMonitoringObject/Detail.vue

@@ -111,7 +111,7 @@
             <span>{{ info.income9 }}元</span>
           </div>
         </div>
-        <div class="item-wrapper">
+        <!-- <div class="item-wrapper">
           <div class="item-header">
             <div class="left">
               <h2>人员变更</h2>
@@ -127,11 +127,11 @@
             <label>信息采集人电话</label>
             <span>{{ $dict.getLabel('fpHealthAssistance', info.healthAssistance) || '-' }}</span>
           </div>
-        </div>
+        </div> -->
         <div class="item-wrapper">
           <div class="item-header">
             <div class="left">
-              <h2>风险</h2>
+              <h2>风险解除跟踪</h2>
               <i :style="{color: isPoorStatus ? '#2EA222' : '#FF4466'}">({{ isPoorStatus ? '已填写' : '未填写' }})</i>
             </div>
             <span @click="linkTo(`./MonitorPoorStatus?id=${info.id}&girdId=${girdInfo.girdId}&girdName=${girdInfo.girdName}`)" v-if="info.status == 1">编辑</span>

src/apps/AppMonitoringObject/MonitorFamilySituation.vue

@@ -17,7 +17,7 @@
         <div class="form-item__wrapper">
           <div class="left">
             <i></i>
-            <span>住房面积</span>
+            <span>住房面积（m²）</span>
           </div>
           <div class="right">
             <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" type="text"  />
@@ -28,7 +28,7 @@
         <div class="form-item__wrapper">
           <div class="left">
             <i></i>
-            <span>与村主干路距离</span>
+            <span>与村主干路距离（公里）</span>
           </div>
           <div class="right">
             <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" type="text"  />

src/apps/AppMonitoringObject/MonitorIncome.vue

@@ -170,7 +170,7 @@
       </div>
     </div>
     <p class="tips">*不填时默认为0元</p>
-    
+
     <div class="btn" hover-class="text" @click="submit">保存</div>
   </div>
 </template>
@@ -202,7 +202,7 @@ export default {
   },
 
   onShow() {
-    document.title = '编辑收支情况'
+    document.title = '家庭收支情况'
   },
 
   methods: {

src/apps/AppMonitoringObject/MonitorPoorStatus.vue

@@ -5,10 +5,10 @@
         <div class="form-item__wrapper">
           <div class="left">
             <i style="opacity: 0;">*</i>
-            <span>产业帮扶</span>
+            <span>工资性收入情况</span>
           </div>
           <div class="right">
-            <AiSelect dict="fpIndustrialAssistance" v-model="form.industrialAssistance"></AiSelect>
+            <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" type="text"  />
           </div>
         </div>
       </div>
@@ -16,10 +16,10 @@
         <div class="form-item__wrapper">
           <div class="left">
             <i style="opacity: 0;">*</i>
-            <span>健康帮扶</span>
+            <span>生产经营性收入情况</span>
           </div>
           <div class="right">
-            <AiSelect dict="fpHealthAssistance" v-model="form.healthAssistance"></AiSelect>
+            <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" type="text"  />
           </div>
         </div>
       </div>
@@ -27,10 +27,10 @@
         <div class="form-item__wrapper">
           <div class="left">
             <i style="opacity: 0;">*</i>
-            <span>就业帮扶</span>
+            <span>财产性收入情况</span>
           </div>
           <div class="right">
-            <AiSelect dict="fpEmploymentAssistance" v-model="form.employmentAssistance"></AiSelect>
+            <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" type="text"  />
           </div>
         </div>
       </div>
@@ -38,10 +38,10 @@
         <div class="form-item__wrapper">
           <div class="left">
             <i style="opacity: 0;">*</i>
-            <span>教育帮扶</span>
+            <span>理财收入情况</span>
           </div>
           <div class="right">
-            <AiSelect dict="fpEducationalAssistance" v-model="form.educationalAssistance"></AiSelect>
+            <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" type="text"  />
           </div>
         </div>
       </div>
@@ -49,10 +49,10 @@
         <div class="form-item__wrapper">
           <div class="left">
             <i style="opacity: 0;">*</i>
-            <span>金融帮扶</span>
+            <span>转移性收入情况</span>
           </div>
           <div class="right">
-            <AiSelect dict="fpFinancialAssistance" v-model="form.financialAssistance"></AiSelect>
+            <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" type="text"  />
           </div>
         </div>
       </div>
@@ -60,10 +60,10 @@
         <div class="form-item__wrapper">
           <div class="left">
             <i style="opacity: 0;">*</i>
-            <span>社会帮扶</span>
+            <span>生产经营支出情况</span>
           </div>
           <div class="right">
-            <AiSelect dict="fpSocialAssistance" v-model="form.socialAssistance"></AiSelect>
+            <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" type="text"  />
           </div>
         </div>
       </div>
@@ -71,51 +71,16 @@
         <div class="form-item__wrapper">
           <div class="left">
             <i style="opacity: 0;">*</i>
-            <span>公益岗位帮扶</span>
+            <span>合规自然支出情况</span>
           </div>
           <div class="right">
-            <AiSelect dict="fpPublicWelfarePostAssistance" v-model="form.publicWelfarePostAssistance"></AiSelect>
+            <u-input v-model="value" placeholder="请输入" placeholder-style="font-size: 15px;" type="text"  />
           </div>
         </div>
       </div>
-      <!-- <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i>*</i>
-            <span>是否消除风险</span>
-          </div>
-          <div class="right">
-            <u-radio-group v-model="form.isRisk" @change="onRiskChange">
-              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">
-                {{ item.dictName }}
-              </u-radio>
-            </u-radio-group>
-          </div>
-        </div>
-      </div>
-      <div class="form-item" v-if="form.isRisk === '01'">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i>*</i>
-            <span>风险消除方式</span>
-          </div>
-          <div class="right">
-            <AiSelect dict="fpRiskEliminationMethod" v-model="form.riskEliminationMethod"></AiSelect>
-          </div>
-        </div>
-      </div>
-      <div class="form-item" v-if="form.isRisk === '01'">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i>*</i>
-            <span>风险消除时间</span>
-          </div>
-          <div class="right">
-            <AiDate v-model="form.riskEliminationDate" @change="v => form.riskEliminationDate = v"></AiDate>
-          </div>
-        </div>
-      </div> -->
     </div>
+
+    <p class="tips">*不填时默认为0元</p>
     <div class="btn" hover-class="text" @click="submit">保存</div>
   </div>
 </template>
@@ -155,7 +120,7 @@ export default {
   },
 
   onShow() {
-    document.title = '编辑帮扶措施'
+    document.title = '风险解除跟踪'
   },
 
   methods: {
@@ -316,6 +281,15 @@ export default {
       font-size: 28px;
     }
   }
+  ::v-deep .u-input .u-input__input .uni-input-wrapper {
+    text-align: right;
+  }
+
+  .tips {
+    margin: 32px 0 0 32px;
+    color: #999999;
+    font-size: 26px;
+  }
 
   .btn {
     position: fixed;