From bdfec44c9f3a37dbbe05bf14a252ffec04132a86 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 21:24:28 +0800
Subject: [PATCH] Merge branch 'develop'

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

diff --git a/src/views/printTemplate/option.js b/src/views/printTemplate/option.js
index 690ae65..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,14 +424,14 @@
       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',
@@ -543,14 +555,14 @@
       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',
@@ -706,14 +718,14 @@
       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',
@@ -853,14 +865,14 @@
       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',

--
Gitblit v1.8.0