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

src/apps/AppMonitoringObject/MonitorRemoveView.vue

@@ -42,7 +42,7 @@
               src="./components/img/check-icon.png" alt=""></div>
           <div class="check-item" :class="{active:form.pass=='0'}" @click="form.pass='0'">驳回申请<img src="./components/img/check-icon.png"/></div>
         </AiItem>
-        <AiItem label="监测对象类型" required>
+        <AiItem label="监测对象类型" required v-if="form.pass==1">
           <AiSelect v-model="form.objectType" dict="fpType"/>
         </AiItem>
         <AiItem label="备注说明" topLabel>
@@ -106,7 +106,7 @@ export default {
     },
 
     submit() {
-      if (!this.form.objectType) {
+      if (this.form.pass == 1 && !this.form.objectType) {
         return this.$u.toast('请选择监测对象类型')
       }
       let url = '', params = {