dct hace 6 meses
padre
commit
3884112610

+ 3 - 3
src/components/Layout/index.vue

@@ -93,13 +93,13 @@ export default {
     const auto_logout_switch = res.list.find(v => v.configKey === 'auto_logout_switch').configValue // 是否超时自动登出
     const auto_logout_time = res.list.find(v => v.configKey === 'auto_logout_time').configValue // 超时自动登出时间(分钟)
     */
-    const auto_logout_switch = res.list.find(v => v.configKey === 'auto_logout_switch')?.configValue // 是否超时自动登出
-    const auto_logout_time = res.list.find(v => v.configKey === 'auto_logout_time')?.configValue // 超时自动登出时间(分钟)
+    const auto_logout_switch = (res.data || []).find(v => v.configKey === 'auto_logout_switch')?.configValue // 是否超时自动登出
+    const auto_logout_time = (res.data || []).find(v => v.configKey === 'auto_logout_time')?.configValue // 超时自动登出时间(分钟)
     if (auto_logout_switch === '1') { // 一段时间无操作后自动登出
       this.auto_logout_time = auto_logout_time
       this.setTimer()
     }
-    const union_invoice_url_item = res.list.find(v => v.configKey === 'union_invoice_url')
+    const union_invoice_url_item = (res.data || []).find(v => v.configKey === 'union_invoice_url')
     if (union_invoice_url_item && union_invoice_url_item.configValue) {
       this.$localStore.set('union_invoice_url', union_invoice_url_item.configValue)
     } else {

+ 5 - 1
src/components/PrintTemplate.vue

@@ -123,7 +123,7 @@
         </div>
 
         <div :style="elementStyle.scenic">
-          <div :style="((elementStyle.scenic.direction==='inline'|| !elementStyle.scenic.direction)?{}:{display: 'flex','flex-direction': 'column'})">
+          <div :style="((elementStyle.scenic && (elementStyle.scenic.direction==='inline'|| !elementStyle.scenic.direction))?{}:{display: 'flex','flex-direction': 'column'})">
             <template v-if="elementStyle.scenic.number==='0'">
               <span
                 style="margin-right:5px"
@@ -368,6 +368,10 @@ export default {
           style[i.type] = i.style
         })
         style.canvas = this.customStyle.canvas
+
+        if (!style.scenic) {
+          style.scenic = { display: 'none' }
+        }
       }
       return this.customStyle ? style : null
     },

+ 20 - 0
src/pages/systemSetting/printManage/components/batchConfigName.vue

@@ -0,0 +1,20 @@
+<template>
+  <div>
+    {{ element.style.batchConfigName||'场次名称:' }}上午场
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    element: {
+      type: Object,
+      default: () => {}
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+ 20 - 0
src/pages/systemSetting/printManage/components/orderNo.vue

@@ -0,0 +1,20 @@
+<template>
+  <div>
+    {{ element.style.orderNo||'订单号:' }}01190409134531843466
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    element: {
+      type: Object,
+      default: () => {}
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+ 20 - 0
src/pages/systemSetting/printManage/components/playDateBegin.vue

@@ -0,0 +1,20 @@
+<template>
+  <div>
+    {{ element.style.playDateBegin||'开始游玩日期:' }}2024-01-01
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    element: {
+      type: Object,
+      default: () => {}
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+ 20 - 0
src/pages/systemSetting/printManage/components/saleAdminName.vue

@@ -0,0 +1,20 @@
+<template>
+  <div>
+    {{ element.style.saleAdminName||'售票员:' }}admin
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    element: {
+      type: Object,
+      default: () => {}
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+ 20 - 0
src/pages/systemSetting/printManage/components/teamName.vue

@@ -0,0 +1,20 @@
+<template>
+  <div>
+    {{ element.style.teamName||'团队名称:' }}测试团队
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    element: {
+      type: Object,
+      default: () => {}
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+ 20 - 0
src/pages/systemSetting/printManage/components/ticketTypeName.vue

@@ -0,0 +1,20 @@
+<template>
+  <div>
+    {{ element.style.ticketTypeName||'票种名称:' }}成人票
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    element: {
+      type: Object,
+      default: () => {}
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>