apply-clients 4.1.11-weinan-1 → 4.1.11-weinan-2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "4.1.11-weinan-1",
+  "version": "4.1.11-weinan-2",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/app_apply/ServiceControl.vue

@@ -180,6 +180,27 @@
       deleteLocalApply(model){
         console.log(`前台上传完成，开始删除本地报建工单`)
         this.$androidUtil.bzLogic('deleteApply', {data:model})
+      },
+      stopapply(model1,model2){
+        this.$showMessage('确定不具备安装条件！',['confirm', 'cancel']).then((res)=>{
+          if (res=='confirm'){
+            let model = Object.assign({},model2,model1)
+            let data = {
+              loginUser: Vue.user,
+              selectdata: this.selectdata,
+              model: model
+            }
+            let http = new HttpResetClass()
+            http.load('POST', this.$androidUtil.getProxyUrl()+'/rs/logic/stopApply', {data: data}, {resolveMsg: null,rejectMsg: '删除失败'})
+              .then(res => {
+                if (res.data === 200) {
+                  this.$dispatch('search')
+                } else {
+                  this.$showMessage('终止报建失败')
+                }
+              })
+           }
+        })
       }
     },
     events: {
@@ -227,27 +248,19 @@
         model=Object.assign({},this.selectdata,model)
         console.log('合并selectdata与model后的model=>' + JSON.stringify(model))
         let http = new HttpResetClass()
-        if(this.selectdata.defname = '现场勘察' && this.show_data.f_is_have == '否'  ){
-           this.$showMessage('确定不具备安装条件！','confirm').then(res=>{
-             if (res = 'confirm'){
-               let data = {
-                 loginUser: Vue.user,
-                 selectdata: this.selectdata,
-                 model: this.model
-               }
-               data.model.f_stop_remarks = '不具备安装条件'
-               let http = new HttpResetClass()
-               http.load('POST', this.$androidUtil.getProxyUrl()+'/rs/logic/stopApply', {data: data}, {resolveMsg: null,rejectMsg: '删除失败'})
-                 .then(res => {
-                   if (res.data === 200) {
-                     this.$dispatch('search')
-                   } else {
-                     this.$showMessage('终止报建失败')
-                   }
-                 })
-               return
-             }
-           })
+        if(this.selectdata.defname =='现场勘察' && model.f_is_have == '否'){
+          let model1 ={
+            f_stop_remarks : '不具备安装条件'
+          }
+          this.stopapply(model1,model)
+          return
+        }
+        if(this.selectdata.defname =='现场勘察' && model.f_is_aerate == '否'){
+          let model ={
+            f_stop_remarks : '未通气'
+          }
+          this.stopapply(model1,model)
+          return
         }
         var url = this.$androidUtil.getProxyUrl() + '/rs/logic/ApplyProductService'
         // let res = await http.load('POST',url,{data:{tables:this.data.tables,start_activity:this.$workflow_vue.start_activity,model:model,loginUser:Vue.user}}, {resolveMsg: null, rejectMsg: null})