更新

nladmin-system/pom.xml

@@ -22,8 +22,8 @@
         <!--       Excel打印-->
         <dependency>
             <groupId>e-iceblue</groupId>
-            <artifactId>spire.xls</artifactId>
+            <artifactId>spire.xls.free</artifactId>
-            <version>3.11.2</version>
+            <version>5.1.0</version>
         </dependency>
 
         <dependency>

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">-->
+      <el-table-column prop="labeling_template" label="贴标模板" align="center">
-<!--        <template scope="scope">-->
+        <template scope="scope">
-<!--          <el-select-->
+          <el-select
-<!--            v-model="scope.row.labeling_template"-->
+            v-model="scope.row.labeling_template"
-<!--            clearable-->
+            clearable
-<!--            class="filter-item"-->
+            class="filter-item"
-<!--          >-->
+          >
-<!--            <el-option-->
+            <el-option
-<!--              v-for="item in templateList"-->
+              v-for="item in templateList"
-<!--              :key="item.template_id"-->
+              :key="item.template_id"
-<!--              :label="item.template_name"-->
+              :label="item.template_name"
-<!--              :value="item.template_code"-->
+              :value="item.template_code"
-<!--            />-->
+            />
-<!--          </el-select>-->
+          </el-select>
-<!--        </template>-->
+        </template>
-<!--      </el-table-column>-->
+      </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" />-->