LaveyD 3 月之前
父节点
当前提交
c3e3fd395e
共有 3 个文件被更改,包括 15 次插入36 次删除
  1. 12 1
      src/pages/sellManage/common/TicketList.vue
  2. 2 34
      src/pages/sellManage/common/confirmMixin.js
  3. 1 1
      src/utils/print.js

+ 12 - 1
src/pages/sellManage/common/TicketList.vue

@@ -351,6 +351,17 @@ export default {
     }
   },
   watch: {
+    value: {
+      handler (val) {
+        if (!val || !val.id) {
+          this.currentTicket = {}
+          return
+        }
+
+        this.currentTicket = val
+      },
+      immediate: true
+    },
     // 当数据变化时,默认不选择票种
     filterTableData (val) {
       // 默认不选中票种
@@ -365,7 +376,7 @@ export default {
       immediate: true
     },
     currentTicket (val, oldVal) {
-      if (!oldVal?.id) {
+      if (val?.id && !oldVal?.id) {
         this.getTicketTypeInfo()
       }
     }

+ 2 - 34
src/pages/sellManage/common/confirmMixin.js

@@ -345,41 +345,10 @@ export default {
       this.payCode = ''
       // 获取订单详情
       // 自动打印
-      getSingleOrder(order?.id).then(async order => {
+      getSingleOrder(order?.id).then(async res => {
         this.isPrintSmallTicket && this.$printSmallTicket(order)
 
-        const order2 = JSON.parse(JSON.stringify(order))
-
-        // 是否判断票种上的打印属性
-        const projectName = process.env.VUE_APP_PROJECT
-        // 宏村和demo不判断
-        if (!['huihuang', 'demo'].includes(projectName)) {
-          order2.tickets = order2.tickets.filter(v => v.whetherCanPrint)
-        }
-        if (!order2.tickets.length) return
-
-        if (this.$router.currentRoute.name === 'preOrder' && ['huihuang'].includes(projectName)) {
-          let price = 0
-          let checkNum = 0
-          let personNumber = 0
-          order2.tickets.forEach(v => {
-            price = this.$NP.plus(price, v.price)
-            checkNum = this.$NP.plus(checkNum, v.checkNum)
-            personNumber = this.$NP.plus(personNumber, v.personNumber)
-          })
-          order2.tickets[0].price = price
-          order2.tickets[0].checkNum = checkNum
-          order2.tickets[0].personNumber = personNumber
-          order2.tickets.length = 1
-        }
-
-        let union_invoice_url = this.$localStore.get('union_invoice_url') || ''
-        if (union_invoice_url) {
-          order2.tickets.forEach(v => {
-            v.allInvoiceQrcode = union_invoice_url
-          })
-        }
-
+        const order2 = JSON.parse(JSON.stringify(res.data))
         this.isPrint && this.$print(order2)
       })
 
@@ -387,7 +356,6 @@ export default {
       this.handleClose()
 
       this.$emit('complete')
-
       this.createSuccessCallback && this.createSuccessCallback()
     },
     beforeDestroy () {

+ 1 - 1
src/utils/print.js

@@ -130,7 +130,7 @@ const Print = function (order, ticket) {
     // 必须是数组
     store.commit('SET_PRINT_LIST', [ticket])
   } else {
-    let tickets = order.tickets
+    let tickets = order.tickets || order.ticketList || []
 
     tickets.forEach((item, index) => {
       item.index = index