sale-client 3.6.125 → 3.6.126

package/package.json

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

package/src/components/chargeBatch/BatchCharge.vue

@@ -130,7 +130,7 @@ export default {
       config: {
         showupload: true, // 显示上传
         hasPrint: true,  // 默认打票
-        postAsync: false,  // 是否异步请求  存完住记录再存明细
+        postAsync: false,  // 是否异步请求  存完主记录再存明细
         hasBillManage: false,  // 默认不启用发票管理
         hasfindaReail: true,  // 默认开启找零功能
         billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
@@ -284,50 +284,61 @@ export default {
       if (this.civill) {
         param = Object.assign(this.civill, param)
       }
-      try {
-        await this.$resetpost('rs/logic/batchPayment', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
-      } catch (e) {}
-      // this.$showMessage(`正在批量处理中, 请耐心等待...`, [])
-      this.show = true
-      // 启动定时器定时查询处理结果
-      this.timer = setInterval(async () => {
-        let res = await this.HttpReset.load('POST', 'rs/logic/getBatchOperaPro', {data: {uuid: uuid}}, {resolveMsg: null, rejectMsg: null})
-        if (res.data.percent) {
-          this.percent = res.data.percent
-        }
-        if (res.data.msg || res.data.error) {
-          this.show = false
-          clearInterval(this.timer)
-          this.$closeMessage()
-          if (res.data.error) {
-            this.$showAlert(`${res.data.error}`, 'danger')
-            return
+      let batchId = ''
+      // 如果配置了异步请求
+      if (this.config.postAsync) {
+        // 插入主收费记录
+        let batch = await this.$resetpost('rs/logic/asyncbatchPaymentSellinggas', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
+        batchId = param.f_batch_id = batch.data.f_batch_id
+        // 处理记录明细抄表明细
+        await this.$resetpost('rs/logic/async/asyncbatchPaymentFiles', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
+      } else {
+        try {
+          await this.$resetpost('rs/logic/batchPayment', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
+        } catch (e) {}
+        // this.$showMessage(`正在批量处理中, 请耐心等待...`, [])
+        this.show = true
+        // 启动定时器定时查询处理结果
+        this.timer = setInterval(async () => {
+          let res = await this.HttpReset.load('POST', 'rs/logic/getBatchOperaPro', {data: {uuid: uuid}}, {resolveMsg: null, rejectMsg: null})
+          if (res.data.percent) {
+            this.percent = res.data.percent
           }
-          await this.$showMessage(res.data.msg)
-          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, '物联网收费')
+          if (res.data.msg || res.data.error) {
+            this.show = false
+            clearInterval(this.timer)
+            this.$closeMessage()
+            if (res.data.error) {
+              this.$showAlert(`${res.data.error}`, 'danger')
+              return
             }
+            await this.$showMessage(res.data.msg)
+            batchId = res.data.id
+          }
+        }, 1500)
+      }
+      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 = batchId
+            this.row.f_bill_type = '物联网收费'
+            this.row.f_bill_style = this.model.f_print[0]
+            this.print = true
           } else {
-            this.clean()
+            this.data.id = batchId
+            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([batchId], this.row, this.invoice_show_gas, this.invoice_is_pax, '物联网收费')
         }
-      }, 1500)
+      } else {
+        this.clean()
+      }
     },
     clean () {
       this.$dispatch('success')