From fa381753ef2a2b25b1c0722549ac17e333da79be Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 22:50:54 +0800
Subject: [PATCH] 2022-09-06

---
 src/views/printTemplate/option.js |   80 ++++++++++++++++++++++++----------------
 1 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/src/views/printTemplate/option.js b/src/views/printTemplate/option.js
index 1671000..24e4b88 100644
--- a/src/views/printTemplate/option.js
+++ b/src/views/printTemplate/option.js
@@ -134,6 +134,10 @@
   {
     text: 'qrcode',
     value: 'qrcode'
+  },
+  {
+    text: 'datamatrix',
+    value: 'datamatrix'
   }
 ]
 
@@ -256,6 +260,14 @@
       initval: config.height,
       min: 1,
       required: true
+    },
+    {
+      type: 'select',
+      key: 'rotate',
+      label: '鏃嬭浆瑙掑害',
+      initval: config.rotate || 0,
+      required: false,
+      options: Rotate
     }
   ]
 }
@@ -412,19 +424,20 @@
       required: false,
       options: Fontfamily
     },
-    {
-      type: 'select',
-      key: 'rotate',
-      label: '鏃嬭浆瑙掑害',
-      initval: item.rotate,
-      required: false,
-      options: Rotate
-    },
+    // {
+    //   type: 'select',
+    //   key: 'rotate',
+    //   label: '鏃嬭浆瑙掑害',
+    //   initval: item.rotate,
+    //   required: false,
+    //   options: Rotate
+    // },
     {
       type: 'number',
       key: 'borderSize',
       label: '杈规瀹藉害',
       initval: item.borderSize,
+      tooltip: '娉細杈规瀹藉害鐨勮閲忓崟浣嶆槸姝ｅ父鍊肩殑鍗佸垎涔嬩竴銆�',
       precision: 1,
       required: true
     },
@@ -542,19 +555,20 @@
       precision: 0,
       required: true
     },
-    {
-      type: 'select',
-      key: 'rotate',
-      label: '鏃嬭浆瑙掑害',
-      initval: item.rotate,
-      required: false,
-      options: Rotate
-    },
+    // {
+    //   type: 'select',
+    //   key: 'rotate',
+    //   label: '鏃嬭浆瑙掑害',
+    //   initval: item.rotate,
+    //   required: false,
+    //   options: Rotate
+    // },
     {
       type: 'number',
       key: 'borderSize',
       label: '杈规瀹藉害',
       initval: item.borderSize,
+      tooltip: '娉細杈规瀹藉害鐨勮閲忓崟浣嶆槸姝ｅ父鍊肩殑鍗佸垎涔嬩竴銆�',
       precision: 1,
       required: true
     },
@@ -704,19 +718,20 @@
       precision: 0,
       required: true
     },
-    {
-      type: 'select',
-      key: 'rotate',
-      label: '鏃嬭浆瑙掑害',
-      initval: item.rotate,
-      required: false,
-      options: Rotate
-    },
+    // {
+    //   type: 'select',
+    //   key: 'rotate',
+    //   label: '鏃嬭浆瑙掑害',
+    //   initval: item.rotate,
+    //   required: false,
+    //   options: Rotate
+    // },
     {
       type: 'number',
       key: 'borderSize',
       label: '杈规瀹藉害',
       initval: item.borderSize,
+      tooltip: '娉細杈规瀹藉害鐨勮閲忓崟浣嶆槸姝ｅ父鍊肩殑鍗佸垎涔嬩竴銆�',
       precision: 1,
       required: true
     },
@@ -850,19 +865,20 @@
       precision: 0,
       required: true
     },
-    {
-      type: 'select',
-      key: 'rotate',
-      label: '鏃嬭浆瑙掑害',
-      initval: item.rotate,
-      required: false,
-      options: Rotate
-    },
+    // {
+    //   type: 'select',
+    //   key: 'rotate',
+    //   label: '鏃嬭浆瑙掑害',
+    //   initval: item.rotate,
+    //   required: false,
+    //   options: Rotate
+    // },
     {
       type: 'number',
       key: 'borderSize',
       label: '杈规瀹藉害',
       initval: item.borderSize,
+      tooltip: '娉細杈规瀹藉害鐨勮閲忓崟浣嶆槸姝ｅ父鍊肩殑鍗佸垎涔嬩竴銆�',
       precision: 1,
       required: true
     },

--
Gitblit v1.8.0