From 505f58a7ca5fc6e0918aeefd82cf47d90db2d96f Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Tue, 12 Jul 2022 21:18:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nladmin-system/pom.xml               |  4 ++--
 qd/src/views/acs/order/AddDialog.vue | 32 ++++++++++++++--------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/nladmin-system/pom.xml b/nladmin-system/pom.xml
index ff6d79b..affa150 100644
--- a/nladmin-system/pom.xml
+++ b/nladmin-system/pom.xml
@@ -22,8 +22,8 @@
         <!--       Excel打印-->
         <dependency>
             <groupId>e-iceblue</groupId>
-            <artifactId>spire.xls</artifactId>
-            <version>3.11.2</version>
+            <artifactId>spire.xls.free</artifactId>
+            <version>5.1.0</version>
         </dependency>
 
         <dependency>
diff --git a/qd/src/views/acs/order/AddDialog.vue b/qd/src/views/acs/order/AddDialog.vue
index 403e7ad..f3db7d8 100644
--- a/qd/src/views/acs/order/AddDialog.vue
+++ b/qd/src/views/acs/order/AddDialog.vue
@@ -195,22 +195,22 @@
           <span v-show="scope.row.edit">{{ scope.row.strap_number }}</span>
         </template>
       </el-table-column>
-<!--      <el-table-column prop="labeling_template" label="贴标模板" align="center">-->
-<!--        <template scope="scope">-->
-<!--          <el-select-->
-<!--            v-model="scope.row.labeling_template"-->
-<!--            clearable-->
-<!--            class="filter-item"-->
-<!--          >-->
-<!--            <el-option-->
-<!--              v-for="item in templateList"-->
-<!--              :key="item.template_id"-->
-<!--              :label="item.template_name"-->
-<!--              :value="item.template_code"-->
-<!--            />-->
-<!--          </el-select>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column prop="labeling_template" label="贴标模板" align="center">
+        <template scope="scope">
+          <el-select
+            v-model="scope.row.labeling_template"
+            clearable
+            class="filter-item"
+          >
+            <el-option
+              v-for="item in templateList"
+              :key="item.template_id"
+              :label="item.template_name"
+              :value="item.template_code"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
       <!--      <el-table-column prop="priority" label="优先级" align="center">-->
       <!--        <template scope="scope">-->
       <!--          <el-input v-show="!scope.row.edit" v-model="scope.row.priority" size="mini" />-->