apply-clients 3.0.10-187 → 3.0.10-190

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.0.10-187",
+  "version": "3.0.10-190",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -37,6 +37,7 @@
     "vue-bubble": "^1.0.3"
   },
   "devDependencies": {
+    "axios": "0.15.3",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",
     "babel-plugin-transform-runtime": "^6.0.0",
@@ -107,7 +108,6 @@
     "webpack-dev-middleware": "^1.4.0",
     "webpack-hot-middleware": "^2.6.0",
     "webpack-merge": "^0.8.3",
-    "weixin-js-sdk": "^1.2.0",
-    "axios": "0.15.3"
+    "weixin-js-sdk": "^1.2.0"
   }
 }

package/src/components/product/Process/Processes/Service/ServiceControl.vue

@@ -2815,7 +2815,9 @@
         //   }
         // }
         //-------------------------------勘察结果 (成功)推送---------------------------------------------
-        if (model.button.button_name === '提交' && this.selectdata.defname == '现场勘察'){
+        debugger
+        if (model.button.button_name === '提交' && this.selectdata.defname == '现场勘察' && this.selectdata.f_order_id !='' && this.selectdata.f_order_id !=null){
+          debugger
           let http = new HttpResetClass()
           let data = {
             f_entry_name: model.f_entry_name,
@@ -2831,9 +2833,11 @@
           })
         }
         //-------------------------------勘察结果 （失败） 推送---------------------------------------------
-        if (model.button.button_name === '退回' && this.selectdata.defname == '现场勘察'){
+        if (model.button.button_name === '退回' && this.selectdata.defname == '现场勘察' && this.selectdata.f_order_id !='' && this.selectdata.f_order_id !=null){
+          debugger
           let http = new HttpResetClass()
           let data = {
+            f_back_reason: model.f_back_reason,
             f_entry_name: model.f_entry_name,
             f_user_name: model.f_user_name,
             f_order_id: this.selectdata.f_order_id,
@@ -2848,7 +2852,7 @@
         }
         debugger
         //-------------------------------预约通气 推送（安装信息）---------------------------------------------
-        if (model.button.button_name === '提交' && this.selectdata.defname == '安装施工'){
+        if (model.button.button_name === '提交' && this.selectdata.defname == '安装施工'&& this.selectdata.f_order_id !='' && this.selectdata.f_order_id !=null){
           debugger
           let http = new HttpResetClass()
           let data = {
@@ -2864,6 +2868,24 @@
           })
         }
 
+
+        //-------------------------------通气成功 推送（安装信息）---------------------------------------------
+        if (model.button.button_name === '提交' && this.selectdata.defname == '通气'&& this.selectdata.f_order_id !='' && this.selectdata.f_order_id !=null){
+          debugger
+          let http = new HttpResetClass()
+          let data = {
+            f_production_date: model.f_production_date,
+            f_query_result: model.f_query_result,
+            f_order_id: this.selectdata.f_order_id,
+            f_user_name:model.f_user_name,
+            f_orgid:this.selectdata.f_orgid
+          }
+          let res = await http.load('POST','rs/logic/pushContract', {data: data}, {
+            resolveMsg: null,
+            rejectMsg: "推送失败"
+          })
+        }
+
         if (model.button.button_name === '提交' && this.selectdata.defname == '用户建档'){
           if(model.f_apply_type == '新用户'){
             let http = new HttpResetClass()