浏览代码

fix: 打印问题

LaveyD 2 月之前
父节点
当前提交
ce119657e3
共有 2 个文件被更改,包括 13 次插入5 次删除
  1. 12 5
      src/components/PrintTemplate.vue
  2. 1 0
      src/utils/print.js

+ 12 - 5
src/components/PrintTemplate.vue

@@ -98,8 +98,8 @@
 
         <div
           :style="elementStyle.teamName"
-          v-if="currentTicket.travelAgencyName">
-          {{ elementStyle.teamName&&elementStyle.teamName.format||'旅行社:' }} {{ currentTicket.travelAgencyName }}
+          v-if="currentTicket.teamName">
+          {{ elementStyle.teamName&&elementStyle.teamName.format||'团队名称:' }} {{ currentTicket.teamName }}
         </div>
 
         <div :style="elementStyle.ticketId">
@@ -162,12 +162,12 @@
         </table> -->
 
         <div :style="elementStyle.ticketTypeName">
-          {{ elementStyle.ticketTypeName&&elementStyle.ticketTypeName.format || '' }}{{ currentTicket.ticketTypeName }}
+          {{ elementStyle.ticketTypeName.format || '' }}{{ currentTicket.ticketTypeName }}
         </div>
 
         <div
           class="img"
-          :style="[elementStyle.qrcode,{backgroundImage:`url(${qrImg})`}]">
+          :style="[elementStyle.qrcode,{backgroundImage:`url(${qrImg})`, backgroundRepeat: 'no-repeat', backgroundPosition: 'center', backgroundSize: 'contain', display: qrImg ? 'block' : 'none'}]">
         </div>
 
         <!--
@@ -329,6 +329,12 @@
           {{ elementStyle.areaName&&elementStyle.areaName.format||'区域:' }}{{ currentTicket.seatAreaName }}
         </div>
 
+        <div
+          v-if="elementStyle.playDateBegin"
+          :style="elementStyle.playDateBegin">
+          {{ elementStyle.playDateBegin.format||'开始游玩日期:' }}{{ currentTicket.payDateBegin | formatDate }}
+        </div>
+
         <div :style="elementStyle.checkNum">
           {{ elementStyle.checkNum&&elementStyle.checkNum.format||'检票人数:' }}{{ currentTicket.checkNum }} 人
         </div>
@@ -356,7 +362,6 @@ export default {
     elementStyle () {
       let style = {}
       if (this.customStyle) {
-        console.log(this.customStyle)
         this.customStyle.elements.forEach(i => {
           style[i.type] = i.style
         })
@@ -366,6 +371,7 @@ export default {
           style.scenic = { display: 'none' }
         }
       }
+      console.log(this.customStyle || style)
       return this.customStyle ? style : null
     },
     scenicList () {
@@ -464,6 +470,7 @@ export default {
           let id = this.$localStore.get('defaultTemplate')
           target = this.$store.state.app.printTemplateList.find(i => i.id === id)
         }
+        console.log('selected print template', JSON.parse(target.content))
 
         if (!target) {
           target = this.$store.state.app.printTemplateList.find(i => i.isDefault) || this.$store.state.app.printTemplateList[0]

+ 1 - 0
src/utils/print.js

@@ -134,6 +134,7 @@ const Print = function (order, ticket) {
 
     tickets.forEach((item, index) => {
       item.teamId = order.teamId
+      item.teamName = order.teamName
       item.index = index
       item.remark = order.remark
       item.orderNo = order.orderNo