Merge remote-tracking branch 'origin/master'

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;

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 = {

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: "",

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: {