apply-clients 3.3.110-229 → 3.3.110-230

package/package.json

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

package/src/apply.js

@@ -54,6 +54,7 @@ export default function () {
   // 收费管理
   Vue.component('apply-charge-management', (resolve) => { require(['./components/product/Process/Processes/chargeManagement'], resolve) })
   Vue.component('apply-print-charge', (resolve) => { require(['./components/product/Process/Processes/Print/printCharge'], resolve) })
+  Vue.component('apply-print-chargepc', (resolve) => { require(['./components/product/Process/Processes/Print/printChargepc'], resolve) })
   Vue.component('apply-print-refund', (resolve) => { require(['./components/product/Process/Processes/Print/printRefund'], resolve) })
 
   // 补充协议

package/src/components/android/Process/AppServiceControl.vue

@@ -260,9 +260,13 @@ export default {
         )
         restp.data[0].processname = '散户报建流程'
         restp.data[0].defname = '合同签订'
-        this.$dispatch('gotoson',restp.data[0])
-        this.$goto('app-service-control', {selectdata: restp.data[0]}, 'self', restp.data[0])
-        // this.$dispatch('apply',restp.data[0])
+        let _this = this
+        this.$dispatch('gotoson', {
+          _this: _this,
+          title: restp.data[0].defname,
+          safe: true
+        })
+        this.$goto('app-service-control', {selectdata: restp.data[0]}, 'self')
 
       } else if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '合同签订' && this.show_data.button.button_name === '提交'){
         let data2 = {
@@ -282,8 +286,14 @@ export default {
         console.log('打印查询的内容',restp1)
         // restp1.data[0].processname = '散户报建流程'
         // restp1.data[0].defname = '报装缴费'
-        this.$dispatch('gotoson',restp1.data[0])
-        this.$goto('app-service-control', {selectdata: restp1.data[0]}, 'self',restp1.data[0])
+
+        let _this = this
+        this.$dispatch('gotoson', {
+          _this: _this,
+          title: restp1.data[0].defname,
+          safe: true
+        })
+        this.$goto('app-service-control', {selectdata: restp1.data[0]}, 'self')
       }else if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '报装缴费' && this.show_data.button.button_name === '提交'){
         let data3 = {
           condition: `u.id = ${this.show_data.id}`,
@@ -300,16 +310,21 @@ export default {
           {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
         )
         console.log('打印查询的内容',restp2)
+        debugger
         if(restp2.length>0){
-          this.$dispatch('gotoson',restp2.data[0])
-          this.$goto('app-service-control', {selectdata: restp2.data[0]}, 'self',restp2.data[0])
+          let _this = this
+          this.$dispatch('gotoson', {
+            _this: _this,
+            title: restp2.data[0].defname,
+            safe: true
+          })
+          this.$goto('app-service-control', {selectdata: restp2.data[0]}, 'self')
         }else{
           debugger
           this.$dispatch('confirm')
+          this.$dispatch('confirm')
+          this.$dispatch('confirm')
         }
-        // restp2.data[0].processname = '散户报建流程'
-        // restp2.data[0].defname  = '工程派工'
-
       }
       else{
         // console.log('-----')