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

src/apps/AppMonitoringObject/Add.vue

@@ -5,7 +5,7 @@
     </div>
     <div class="form" v-show="current == 0 || isEdit">
       <div class="form-group">
-        <div class="form-item">
+        <!-- <div class="form-item">
           <div class="form-item__wrapper">
             <div class="left">
               <i>*</i>
@@ -15,7 +15,7 @@
               <AiSelect dict="fpHouseType" v-model="form.houseType"></AiSelect>
             </div>
           </div>
-        </div>
+        </div> -->
         <div class="form-item" v-if="!isEdit">
           <div class="form-item__wrapper">
             <div class="left">
@@ -588,7 +588,7 @@ export default {
   methods: {
     rules() {
       return {
-        houseType: '请选择户类型',
+        // houseType: '请选择户类型',
         objectType: '请选择监测对象类型',
         name: '请输入户主姓名',
         idNumber: '请输入身份证号',
@@ -630,8 +630,6 @@ export default {
         }
       }
 
-     
-
       if (!this.form.idNumber) {
         return this.$u.toast('请输入身份证号')
       }

src/apps/AppMonitoringObject/MonitorAddView.vue

@@ -56,26 +56,28 @@ export default {
     submit() {
       var url = ''
       var params = {
-              pass: this.pass || '',
-              opinion: this.opinion,
-              files: this.filesList,
-              id: this.id,
-              riskType: this.riskType,
-              riskEliminationMethod: this.riskEliminationMethod,
-            }
+        pass: this.pass || '',
+        opinion: this.opinion,
+        files: this.filesList,
+        id: this.id,
+        riskType: this.riskType,
+        riskEliminationMethod: this.riskEliminationMethod,
+      }
+      // 0：待纳入、1：监测中、2：待解除、3：已解除、4：已驳回 
       if(this.pass == 1) {  // 网格长
-        if(!this.riskEliminationMethod) {
+        if(this.status == 1) {
+          if(!this.riskEliminationMethod) {
             return this.$u.toast('请选择风险消除方式')
           }
-        if(this.status == 1) {
           url = '/app/apppreventionreturntopoverty/relieve' // 解除
-        } else if (this.status == 4 || this.status == 3) {
+        } else if (this.status == 3 || this.status == 4) {
           if(!this.riskType) {
             return this.$u.toast('请选择风险因素')
           }
           url = `/app/apppreventionreturntopoverty/examine` //  纳入监测
         }
-      } else {   // 网格员
+      } 
+      if (this.pass == '') {   // 网格员
         if(this.status == '0' || this.status == '3' || this.status == '4') {
           if(!this.riskType) {
             return this.$u.toast('请选择风险因素')
@@ -103,19 +105,19 @@ export default {
 
       var formData = new FormData()
       for (let key in params) {
-            formData.append(key, params[key])
+        formData.append(key, params[key])
       }
       this.$http.post(url , formData).then(res => {
-            if (res.code === 0) {
-              this.$u.toast('提交成功')
-              uni.$emit('reload')
-              setTimeout(() => {
-                uni.navigateBack({
-                  delta: 2
-                })
-              },600)
-            }
-          })
+        if (res.code === 0) {
+          this.$u.toast('提交成功')
+          uni.$emit('reload')
+          setTimeout(() => {
+            uni.navigateBack({
+              delta: 2
+            })
+          },600)
+        }
+      })
     }
   },
 }