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

# Conflicts:
#	src/apps/AppMonitoringObject/Add.vue

src/apps/AppMonitoringObject/Add.vue

@@ -35,10 +35,8 @@
               <span>选择人员</span>
             </div>
             <div class="right">
-              <AiPagePicker class="select" :selected.sync="userList" householdName="1" >
+              <AiPagePicker class="select" :selected.sync="userList" householdName="1" single>
-                <span v-if="!userList.length">请选择</span>
+                <AiMore v-model="form.name"/>
-                <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>
@@ -75,7 +73,7 @@
             </div>
             <div class="right">
               <input placeholder="请输入" type="idcard" v-model="form.idNumber" :maxlength="20"
-                    placeholder-style="color: #999; font-size: 30rpx;" @input="changeIdNumber" :disabled ="userList.length? true : false" />
+                     placeholder-style="color: #999; font-size: 30rpx;" @input="changeIdNumber" :disabled="!!userList.length"/>
             </div>
           </div>
         </div>
@@ -124,12 +122,8 @@
             </div>
             <div class="right">
               <!-- :areaId="user.areaId"   v-model="form.currentAreaId"-->
-              <AiAreaPicker ref="address" class="aiArea" :fullName.sync="form.currentAreaName" v-model="form.currentAreaId" :root="user.areaId" @select="onAreaChange">
+              <AiAreaPicker :fullName.sync="form.currentAreaName" v-model="form.currentAreaId" :root="user.areaId">
-                  <div class="aiArea">
+                <AiMore v-model="form.currentAreaName"/>
-                    <span class="label" v-if="form.currentAreaName">{{ form.currentAreaName }}</span>
-                    <i v-else>请选择</i>
-                    <u-icon name="arrow-right" color="#ddd"/>
-                  </div>
               </AiAreaPicker>
             </div>
           </div>
@@ -433,7 +427,7 @@
 
 <script>
 import {mapState} from 'vuex'
-import listVue from '../AppBuilding/list.vue';
+
 export default {
   data() {
     return {
@@ -523,13 +517,11 @@ export default {
   },
   watch: {
     userList: {
-      handler: function (newValue,oldValue) {
+      handler: function (v) {
         this.isEdit = true;
-        this.form.name = newValue[0].name;
+        let {name, idNumber, currentAreaId, currentAreaName} = v?.[0] || {}
-        this.form.idNumber = newValue[0].idNumber;
+        this.form = {...this.form, name, idNumber, currentAreaId, currentAreaName}
-        this.form.sex = this.form.idNumber.substr(16, 1) % 2 == 0 ? '1' : '0'
+        this.form.sex = this.idCardNoUtil.getIdCardInfo(idNumber)?.sex
-        this.form.currentAreaId = newValue[0].currentAreaId
-        this.form.currentAreaName = newValue[0].currentAreaName
       },
       deep: true,
     },
@@ -559,17 +551,13 @@ export default {
         this.getInfo(this.id)
 
 
-      } else if (!query.id) {
-        this.form.currentAreaId = this.user.areaId
       }
     })
   },
 
   onShow() {
     document.title = this.id ? '编辑监测对象' : '添加监测对象'
-    console.log(this.userList);
   },
-
   methods: {
     rules() {
       return {
@@ -637,8 +625,6 @@ export default {
       }
 
 
-
-
       // const rules = this.rules()
 
       // for (let v of Object.keys(rules)) {
@@ -727,10 +713,6 @@ export default {
       })
     },
 
-    onAreaChange(e) {
-      this.form.currentAreaId = e
-    },
-
     onChange(e) {
       this.form.placeAreaId = e
     },
@@ -809,6 +791,7 @@ export default {
 
   .steps {
     height: 176px;
+
     ::v-deep .u-steps {
       box-sizing: border-box;
       padding-top: 40px;
@@ -865,18 +848,22 @@ export default {
       .form-item__wrappers {
         padding-right: 30px;
         box-sizing: border-box;
+
         .top {
           font-size: 32px;
           padding: 32px 0;
         }
+
         .bottoms {
           padding-bottom: 20px;
+
           .cards {
             padding: 20px;
             box-sizing: border-box;
             border: 1px solid #CCCCCC;
             border-radius: 16px;
             margin-bottom: 16px;
+
             .changeActive {
               color: #1174FE;
               border: 1px solid #1174FE;
@@ -895,6 +882,7 @@ export default {
           font-size: 30px;
           color: #999999;
         }
+
         .check-item {
           display: inline-block;
           width: 140px;
@@ -908,16 +896,20 @@ export default {
           font-weight: 500;
           color: #333;
           position: relative;
+
           img {
             display: none;
           }
         }
+
         .check-item:nth-of-type(1) {
           margin-right: 36px;
         }
+
         .check-active {
           background: #E7F1FE;
           color: #1174FE;
+
           img {
             display: block;
             position: absolute;
@@ -1000,12 +992,14 @@ export default {
 
   .condition {
     margin-top: 16px;
+
     .risk {
       display: flex;
       justify-content: space-between;
       padding: 30px 32px;
       box-sizing: border-box;
     }
+
     .remark {
       padding: 30px 32px;
       box-sizing: border-box;
@@ -1026,14 +1020,17 @@ export default {
     font-size: 32px;
     background: #3192F4;
   }
+
   .upload {
     width: 100%;
     padding: 10px 32px 32px 32px;
     box-sizing: border-box;
   }
+
   .border-b0 {
     border-bottom: 0 !important;
   }
+
   ::v-deep .AiSelect .display .selectedLabel {
     font-size: 28px;
   }