From f0602b981659c6d1ff18e8dba4ca1ce89c5f5610 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 22 三月 2020 21:18:34 +0800
Subject: [PATCH] 2020-03-22

---
 src/views/printTemplate/option.js |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/src/views/printTemplate/option.js b/src/views/printTemplate/option.js
index ca9317b..7f57041 100644
--- a/src/views/printTemplate/option.js
+++ b/src/views/printTemplate/option.js
@@ -288,6 +288,7 @@
     item.align = 'left'
     item.vertialAlign = 'top'
   } else if (type === 'barcode') {
+    item.value = ''
     item.url = url
     item.barcodeType = 'code128'
     item.barcodeWidth = Math.floor(width * 0.6)
@@ -295,6 +296,7 @@
     item.barcodeLabel = 'true'
     item.fontSize = Math.floor(12 * (boxwidth / 210))
   } else if (type === 'qrcode') {
+    item.value = ''
     item.url = url
     item.qrcodeType = 'qrcode'
     item.qrcodeWidth = Math.floor(height * 0.6)
@@ -313,6 +315,7 @@
       type: 'title',
       label: '绫诲瀷',
       initval: '鏂囨湰',
+      class: 'text',
       required: false
     },
     {
@@ -336,6 +339,14 @@
       initval: item.field || '',
       required: false,
       options: fields
+    },
+    {
+      type: 'text',
+      key: 'cusfield',
+      label: '鑷畾涔�',
+      initval: item.cusfield || '',
+      required: true,
+      hidden: true
     },
     {
       type: 'number',
@@ -466,6 +477,7 @@
       type: 'title',
       label: '绫诲瀷',
       initval: '鏉″舰鐮�',
+      class: 'barcode',
       required: false
     },
     {
@@ -476,12 +488,27 @@
       required: false
     },
     {
+      type: 'text',
+      key: 'value',
+      label: '鍐呭',
+      initval: item.value || '',
+      required: false
+    },
+    {
       type: 'select',
       key: 'field',
       label: '鍏宠仈瀛楁',
       initval: item.field,
-      required: true,
+      required: false,
       options: fields
+    },
+    {
+      type: 'text',
+      key: 'cusfield',
+      label: '鑷畾涔�',
+      initval: item.cusfield || '',
+      required: true,
+      hidden: true
     },
     {
       type: 'number',
@@ -612,6 +639,7 @@
       type: 'title',
       label: '绫诲瀷',
       initval: '浜岀淮鐮�',
+      class: 'qrcode',
       required: false
     },
     {
@@ -622,12 +650,27 @@
       required: false
     },
     {
+      type: 'text',
+      key: 'value',
+      label: '鍐呭',
+      initval: item.value || '',
+      required: false
+    },
+    {
       type: 'select',
       key: 'field',
       label: '鍏宠仈瀛楁',
       initval: item.field,
-      required: true,
+      required: false,
       options: fields
+    },
+    {
+      type: 'text',
+      key: 'cusfield',
+      label: '鑷畾涔�',
+      initval: item.cusfield || '',
+      required: true,
+      hidden: true
     },
     {
       type: 'number',
@@ -734,6 +777,7 @@
       type: 'title',
       label: '绫诲瀷',
       initval: '鍥剧墖',
+      class: 'image',
       required: false
     },
     {
@@ -759,6 +803,14 @@
       options: fields
     },
     {
+      type: 'text',
+      key: 'cusfield',
+      label: '鑷畾涔�',
+      initval: item.cusfield || '',
+      required: true,
+      hidden: true
+    },
+    {
       type: 'number',
       key: 'left',
       label: '璺濆乏',

--
Gitblit v1.8.0