apply-clients 4.1.11-weinan-2 → 4.1.12-weinan

package/package.json

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

package/src/components/app_apply/ServiceControl.vue

@@ -181,20 +181,21 @@
         console.log(`前台上传完成，开始删除本地报建工单`)
         this.$androidUtil.bzLogic('deleteApply', {data:model})
       },
-      stopapply(model1,model2){
-        this.$showMessage('确定不具备安装条件！',['confirm', 'cancel']).then((res)=>{
+      stopapply(model1,model){
+        this.$showMessage('确定不具备条件,终止报建！',['confirm', 'cancel']).then((res)=>{
           if (res=='confirm'){
-            let model = Object.assign({},model2,model1)
+            this.selectdata = Object.assign( {},this.selectdata,model)
             let data = {
               loginUser: Vue.user,
               selectdata: this.selectdata,
-              model: model
+              model: model1
             }
             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')
+                  this.$dispatch('close')
                 } else {
                   this.$showMessage('终止报建失败')
                 }
@@ -256,7 +257,7 @@
           return
         }
         if(this.selectdata.defname =='现场勘察' && model.f_is_aerate == '否'){
-          let model ={
+          let model1 ={
             f_stop_remarks : '未通气'
           }
           this.stopapply(model1,model)