sale-client 3.4.109 → 3.4.110

package/build/dev-server.js

@@ -10,9 +10,9 @@ var compiler = webpack(config)
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var bendi = 'http://127.0.0.1:8080/',bendi1 = 'http://119.146.1.106:8300/'
+var bendi = 'http://183.67.41.139:8400/',bendi1 = 'http://183.67.41.139:8400/'
 // 公司测试服务
-var fuwu = 'http://192.168.50.4:8400/'
+var fuwu = 'http://183.67.41.139:8400/'
 //铜川正式
 //  var fuwu = 'http://61.134.55.234:9999/'
 //铜川测试
@@ -87,16 +87,16 @@ var proxyTable = {
   '/rs/sql/manage_getstreetlist': {
     target: fuwu
   },
-  '/rs/report': {
-    target: 'http://127.0.0.1:8079'
-  },
+  // '/rs/report': {
+  //   target: 'http://127.0.0.1:8079'
+  // },
   '/rs/vue': {
     target: fuwu
   },
   '/rs': {
     // target: 'http://192.168.30.63:8081/'
-    target: 'http://127.0.0.1:8078'
-    // target:fuwu
+    // target: 'http://127.0.0.1:8078'
+    target:fuwu
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.4.109",
+  "version": "3.4.110",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/chargeBatch/BatchCharge.vue

@@ -116,8 +116,9 @@ export default {
         printType: '普通收据', // 收据/电子票/专用发票/国税发票
         payment: '现金缴费'
       },
+      print: false,
       billData: {
-        url: 'rs/report/machine_bill',
+        url: 'rs/report/charge_manage_group_bill',
         bill: ''
       },
       paytype: this.$appdata.getParam('付款方式') ? this.$appdata.getParam('付款方式') : [],
@@ -246,8 +247,29 @@ export default {
       if (this.civill) {
         param = Object.assign(this.civill, param)
       }
-      await this.$resetpost('rs/logic/batchPayment', {data: param}, {resolveMsg: '团体收费成功', rejectMsg: '团体收费失败'})
-      this.clean()
+      let res = await this.$resetpost('rs/logic/batchPayment', {data: param}, {resolveMsg: '团体收费成功', rejectMsg: '团体收费失败'})
+      if (this.config.hasPrint) {
+        if (this.data.f_print.indexOf('电子发票') == -1) {
+          console.log('this.config.hasBillManage', this.config.hasBillManage)
+          if (this.config.hasBillManage) {
+              // 启用发票管理，获取票据管理中的票号并存储记录
+            this.row.id = res.data.id
+            this.row.f_bill_type = '物联网收费'
+            this.row.f_bill_style = this.model.f_print[0]
+            this.print = true
+          } else {
+            this.data.id = res.data.id
+            this.print = true
+          }
+        } else if (this.config.printType === '国税发票') {
+            // TODO
+        } else if (this.model.f_print[0] === '电子发票') {
+          this.eticket_show = true
+          await this.$refs.eticketbill.openETicket([res.data.id], this.row, this.invoice_show_gas, this.invoice_is_pax, '物联网收费')
+        }
+      } else {
+        this.clean()
+      }
     },
     clean () {
       this.$dispatch('success')

package/src/components/chargeBatch/CardList.vue

@@ -367,7 +367,9 @@ and  th.f_userfiles_id = '${row.f_userfiles_id}' and tsh.f_state='有效'`
       getBillUrl (type) {
         let name = ''
         // 根据type数据 选择调用的Logic
-        if (type === '过户') {
+        if (type == '团体收费') {
+          name = 'rs/report/charge_manage_group_bill'
+        } else if (type === '过户') {
           name = 'rs/report/transfer_bill'
         } else if (type === '换表') {
           console.log('看看row..', this.row)