From c3bc6119af319a79ef468212ee55b3b7a728d8bb Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Thu, 7 Jul 2022 11:11:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/UdiInfoRelevance.vue           | 8 +++++++-
 src/views/thrsys/ThrInvWarehouse.vue           | 4 ++--
 src/views/userManage/param/systemPDFModule.vue | 9 ++++++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/views/basic/UdiInfoRelevance.vue b/src/views/basic/UdiInfoRelevance.vue
index 9c4e1d0..7447f4c 100644
--- a/src/views/basic/UdiInfoRelevance.vue
+++ b/src/views/basic/UdiInfoRelevance.vue
@@ -246,7 +246,8 @@
         >
             <selectDiDetail :editQuery="diDetails"
             ></selectDiDetail>
-        </el-dialog>-
+        </el-dialog>
+        -
     </div>
 </template>
 
@@ -292,6 +293,10 @@ export default {
                 thirdId: "",
                 keys: [],
                 thirdSys: null,
+                manufactory: null,
+                price: null,
+                erpName: null,
+                measname: null,
             },
             fromOptions: [],
             checked: true,
@@ -415,6 +420,7 @@ export default {
             }
             this.combineQuery.manufactory = this.currentRow.manufactory;
             this.combineQuery.price = this.currentRow.price;
+            this.combineQuery.measname = this.currentRow.measname;
             combineUdi(this.combineQuery)
                 .then((response) => {
                     if (response.code == 20000) {
diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue
index d4822b1..b207ed6 100644
--- a/src/views/thrsys/ThrInvWarehouse.vue
+++ b/src/views/thrsys/ThrInvWarehouse.vue
@@ -132,13 +132,13 @@
 
                 <el-form-item label="仓库编码" prop="title" class="query-form-item">
                     <el-input
-                        v-model="formData.code" style="width: 80%"
+                        v-model.trim="formData.code" style="width: 80%"
                         auto-complete="off"
                     ></el-input>
                 </el-form-item>
                 <el-form-item label="仓库名称" prop="name" class="query-form-item">
                     <el-input
-                        v-model="formData.name" style="width: 80%"
+                        v-model.trim="formData.name" style="width: 80%"
                         auto-complete="off"
                     ></el-input>
                 </el-form-item>
diff --git a/src/views/userManage/param/systemPDFModule.vue b/src/views/userManage/param/systemPDFModule.vue
index 2251986..0aed962 100644
--- a/src/views/userManage/param/systemPDFModule.vue
+++ b/src/views/userManage/param/systemPDFModule.vue
@@ -138,7 +138,14 @@
                                   placeholder="请输入"></el-input>
                     </template>
                 </el-table-column>
-
+                <el-table-column label="打印方式" prop="remark1" show-overflow-tooltip="true">
+                    <template slot-scope="scope">
+                        <el-select v-model="scope.row.printType" placeholder="打印方式">
+                            <el-option label="批次号" :value=0></el-option>
+                            <el-option label="条码清单" :value=1></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作" width="150" prop="price" fixed="right">
                     <template slot-scope="scope">
                         <el-button