From 9f51db02fa5122f47f46eae11e36e2a953c46d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 27 Apr 2023 17:31:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/print/pdfCodePrintSet.vue   | 2 +-
 src/views/system/print/pdfTmpleateManage.vue | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/system/print/pdfCodePrintSet.vue b/src/views/system/print/pdfCodePrintSet.vue
index 23c91a7..eced690 100644
--- a/src/views/system/print/pdfCodePrintSet.vue
+++ b/src/views/system/print/pdfCodePrintSet.vue
@@ -473,7 +473,7 @@ export default {
       };
       this.moduleFormVisible = true;
       this.selectTemplateQuery = {
-        module: 2,
+        module: 3,
         busRlId: row.id,
         type: 1,
         name: "",
diff --git a/src/views/system/print/pdfTmpleateManage.vue b/src/views/system/print/pdfTmpleateManage.vue
index 9c77d51..27889cb 100644
--- a/src/views/system/print/pdfTmpleateManage.vue
+++ b/src/views/system/print/pdfTmpleateManage.vue
@@ -105,7 +105,8 @@
               <el-select v-model="formData.module" @change="isCleck"  placeholder="模板类型" style="width: 100%" >
                 <el-option label="标签" value="0" ></el-option>
                 <el-option label="报表" value="1"></el-option>
-                <el-option label="单据" value="2"></el-option>
+                <el-option label="业务单据" value="2"></el-option>
+                <el-option label="扫码单据" value="3"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -374,7 +375,7 @@ export default {
       jrxmlFileList: [],
       uploadDisabled: false,
       moduleLoading: false,
-      moduleNameMap: {0: "标签", 1: "报表", 2: "单据"},
+      moduleNameMap: {0: "标签", 1: "报表", 2: "业务单据",3: "扫码单据"},
     };
   },
   methods: {

From 8c14224b59c93611f22762d2009dbcbbc5008550 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 27 Apr 2023 17:38:26 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=AD=20=E4=BB=93=E5=BA=93=20=E5=92=8C?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=B2=A1=E6=9C=89=E8=81=94?=
 =?UTF-8?q?=E5=8A=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/IoCheckErrorOrder.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index f3c387a..ec609ef 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -627,10 +627,10 @@ export default {
     },
     getBusType() {
       if (this.subInvList.length > 0) {
-        this.filterQuery.locStorageCode = this.subInvList.find(item => item.code == this.filterQuery.invWarehouseCode).parentId
+        this.filterQuery.locStorageCode = this.subInvList.find(item => item.code == this.filterQuery.invCode).parentId
       }
       let query = {
-        code: this.filterQuery.invWarehouseCode,
+        code: this.filterQuery.invCode,
         enabled: true,
         vueType: "supDelivery",
       };
@@ -750,6 +750,7 @@ export default {
         })
         .catch(() => {
         });
+       this.getBusType();
     },
     getSubInvList() {
       let query = {

From 72bc4d6c07e4e4a4473cf90157754cc6c125deff Mon Sep 17 00:00:00 2001
From: CTP <630182278@qq.com>
Date: Fri, 28 Apr 2023 10:57:29 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=88=86=E7=B1=BB=20?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/product.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 7f7e35d..baed886 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card>
-      <el-row type="flex">
+      <el-row type="flex" style="flex-wrap: nowrap">
         <el-col v-show="showSearch" style="width: 300px">
           <el-tree
             :data="treeList"
@@ -2132,11 +2132,9 @@ export default {
   margin-bottom: 0px;
 }
 
-/* .el-row {
+.el-row {
   display: flex;
-  flex-wrap: wrap;
-  margin-bottom: 6px;
-} */
+}
 
 /* .el-col {
   border-radius: 4px;