2 次代碼提交 3a2682f95f ... a5a805a3a8

作者 SHA1 備註 提交日期
  LaveyD a5a805a3a8 fix(PrintTemplate): Date formatting 2 周之前
  LaveyD 32aaecad86 团体售票不打印加个 3 周之前
共有 2 個文件被更改,包括 11 次插入4 次删除
  1. 10 4
      src/components/PrintTemplate.vue
  2. 1 0
      src/utils/print.js

+ 10 - 4
src/components/PrintTemplate.vue

@@ -66,14 +66,14 @@
         <template v-else>
           <span
             class="el"
-            v-if="!currentTicket.is_otaorder"
+            v-if="!currentTicket.is_otaorder && !currentTicket.teamId"
             :style="elementStyle.price">
             <i style="font-size:0.8em; font-style:normal">{{ elementStyle.price&&elementStyle.price.format }}</i> ¥ {{ currentTicket.isPrint_price_active ? currentTicket.print_price*currentTicket.checkNum : currentTicket.price }} <span v-if="showUnit">元</span>
           </span>
 
           <span
             class="el"
-            v-if="!currentTicket.is_otaorder"
+            v-if="!currentTicket.is_otaorder && !currentTicket.teamId"
             :style="elementStyle.singlePrice">
             <i style="font-size:0.8em; font-style:normal">{{ elementStyle.singlePrice&&elementStyle.singlePrice.format }}</i> ¥ {{ currentTicket.isPrint_price_active ? currentTicket.print_price : $NP.divide(currentTicket.price, currentTicket.checkNum) }} <span v-if="showUnit">元</span>
           </span>
@@ -107,8 +107,8 @@
         </div>
         <div
           :style="elementStyle.createTime"
-          v-if="currentTicket.createTime">
-          {{ elementStyle.createTime&&elementStyle.createTime.format || '出票时间:' }}{{ currentTicket.buyTime }}
+          v-if="currentTicket.buyTime">
+          {{ elementStyle.createTime&&elementStyle.createTime.format || '出票时间:' }}{{ fmtTime(currentTicket.buyTime) }}
         </div>
 
         <div :style="elementStyle.scenics">
@@ -410,6 +410,12 @@ export default {
     }
   },
   methods: {
+    fmtTime (time) {
+      if (!time) return ''
+      const d = new Date(time)
+      const pad = n => String(n).padStart(2, '0')
+      return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`
+    },
     startPrint () {
       console.log('currentTicket', this.currentTicket)
       const webview = document.querySelector('#printWebview')

+ 1 - 0
src/utils/print.js

@@ -133,6 +133,7 @@ const Print = function (order, ticket) {
     let tickets = order.tickets || order.ticketList || []
 
     tickets.forEach((item, index) => {
+      item.teamId = order.teamId
       item.index = index
       item.remark = order.remark
       item.orderNo = order.orderNo