apply-clients 3.0.10-185 → 3.0.10-189

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.0.10-185",
+  "version": "3.0.10-189",
   "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/apply.js

@@ -167,4 +167,6 @@ export default function () {
   Vue.component('payment-record', (resolve) => { require(['./components/product/ReportForm/PaymentRecordBad'], resolve) })
   // 打款记录明细卡片
   Vue.component('payment-record-too-bad', (resolve) => { require(['./components/product/ReportForm/PaymentRecordTooBad'], resolve) })
+
+  Vue.component('apply-upload', (resolve) => { require(['./components/product/VueUtils/ApplyUpload'], resolve) })
 }

package/src/components/product/Process/ExplorationUser.vue

@@ -20,10 +20,17 @@
                             :edit = "true">
             </record-message>
           </tab>
-<!--          <tab header='附件' style="background-color :#f6f6f6">-->
-<!--            <upload v-ref:file :blodid = "selectdata.f_process_id" :isusetype = "true" :isremark = "true"  :defname="selectdata.defname"></upload>-->
-<!--            &lt;!&ndash;<customer-file v-ref:file :selectdata="selectdata"></customer-file>&ndash;&gt;-->
-<!--          </tab>-->
+          <tab header='附件' style="background-color :#f6f6f6">
+            <apply-upload :blodid="selectdata.f_process_id"
+                          :isupload = "true"
+                          :isdelete="true"
+                          :isusetype="true"
+                          :isremark = "true"
+                          :takeimg="false"
+                          :issearch="true"
+                          :defname="selectdata.defname">
+            </apply-upload>
+          </tab>
 
         </tabset>
       </div>

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

@@ -1350,6 +1350,7 @@
         // if (this.show_data.fields[i].label === '用气性质') {
           let http = new HttpResetClass()
           let condition = "f_orgid = '" + this.$login.f.orgid + "'"
+          // let condition = "1=1"
           let res = await http.load('POST', 'rs/sql/singleTable', {
             data: {
               tablename: 't_stairprice',
@@ -2813,6 +2814,78 @@
         //     return
         //   }
         // }
+        //-------------------------------勘察结果 (成功)推送---------------------------------------------
+        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,
+            f_user_name: model.f_user_name,
+            f_order_id: this.selectdata.f_order_id,
+            f_phone:model.f_phone,
+            f_address:model.f_address,
+            f_orgid:this.selectdata.f_orgid
+          }
+          let res = await http.load('POST', 'rs/logic/pushinformation', {data: data}, {
+            resolveMsg: null,
+            rejectMsg: "推送失败"
+          })
+        }
+        //-------------------------------勘察结果 （失败） 推送---------------------------------------------
+        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: this.selectdata.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,
+            f_phone:model.f_phone,
+            f_address:model.f_address,
+            f_orgid:this.selectdata.f_orgid
+          }
+          let res = await http.load('POST', 'rs/logic/pushinformationNo', {data: data}, {
+            resolveMsg: null,
+            rejectMsg: "推送失败"
+          })
+        }
+        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_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/installPush', {data: data}, {
+            resolveMsg: null,
+            rejectMsg: "推送失败"
+          })
+        }
+
+
+        //-------------------------------通气成功 推送（安装信息）---------------------------------------------
+        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()