From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec

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

diff --git a/src/views/printTemplate/option.js b/src/views/printTemplate/option.js
index 3731a2b..f634781 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,23 @@
       initval: config.height,
       min: 1,
       required: true
+    },
+    {
+      type: 'select',
+      key: 'rotate',
+      label: '鏃嬭浆瑙掑害',
+      initval: config.rotate || 0,
+      required: false,
+      options: Rotate
+    },
+    {
+      type: 'number',
+      key: 'gap',
+      label: '闂撮殭',
+      initval: config.gap || '',
+      tooltip: 'RFID鏍囩闂撮殭銆�',
+      min: 0,
+      required: false
     }
   ]
 }
@@ -412,19 +433,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 +564,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
     },
@@ -621,6 +644,15 @@
       initval: item.fontSize,
       precision: 0,
       required: true
+    },
+    {
+      type: 'number',
+      key: 'narrowWidth',
+      label: '鍗曞厓瀹藉害',
+      initval: item.narrowWidth,
+      tooltip: '娉細RFID鏉＄爜鍗曞厓瀹藉害锛岄粯璁ゅ�间负2銆�',
+      precision: 0,
+      required: false
     },
     {
       type: 'select',
@@ -704,19 +736,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
     },
@@ -795,6 +828,14 @@
       required: false
     },
     {
+      type: 'textarea',
+      key: 'productValue',
+      label: '姝ｅ紡鍦板潃',
+      initval: item.productValue || '',
+      tooltip: '姝ｅ紡绯荤粺浣跨敤鐨勫浘鐗囷紝涓虹┖鏃朵娇鐢ㄥ浘鐗囧湴鍧�銆�',
+      required: false
+    },
+    {
       type: 'select',
       key: 'field',
       label: '鍏宠仈瀛楁',
@@ -842,19 +883,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