From 54192408115291dbfeecac810087d62a364c5b93 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Tue, 30 Aug 2022 09:21:57 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/invWarehouse.vue                 | 2 +-
 src/views/inout/IOAddOrder.vue                   | 2 +-
 src/views/inventory/InvProducts.vue              | 2 ++
 src/views/inventory/InvStatistics.vue            | 2 ++
 src/views/inventory/invPreInProducts.vue         | 2 ++
 src/views/inventory/invPreProducts.vue           | 2 ++
 src/views/inventory/invUdiTraceOrder.vue         | 9 ++-------
 src/views/userManage/admin/authAdmin.vue         | 3 ++-
 src/views/userManage/param/systemPDFModule.vue   | 2 +-
 src/views/userManage/param/systemPDFTemplate.vue | 5 +++--
 10 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index 3a8691a..116bb24 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -897,7 +897,7 @@ export default {
             bussinessTypeQuery: {
                 enabled: true,
                 page: 1,
-                limit: 10
+                limit: 100
             },
             bussinessTypeTotal: 0,
             curSeleUser: null,
diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue
index 268f3a3..78a6ddb 100644
--- a/src/views/inout/IOAddOrder.vue
+++ b/src/views/inout/IOAddOrder.vue
@@ -1091,7 +1091,7 @@ export default {
             this.curAction = this.getActionItem(item);
             this.findMethod();
 
-            this.$set(this.formData, "vailIn", this.curAction.vailInv);
+            this.$set(this.formData, "vailInv", this.curAction.vailInv);
             this.$set(this.formData, "preCheck", this.curAction.scanPreIn);
             this.$set(this.formData, "outChangeEnable", this.curAction.ullageFill);
             this.$set(this.formData, "codeFillCheck", this.curAction.codeFillCheck);
diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index 2ac8b1b..1dfaf44 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -142,6 +142,8 @@
     <el-dialog
         title="库存详情"
         :visible.sync="codeDetailVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
         width="85%"
         v-if="codeDetailVisible"
     >
diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue
index 1038032..3fc9eba 100644
--- a/src/views/inventory/InvStatistics.vue
+++ b/src/views/inventory/InvStatistics.vue
@@ -122,6 +122,8 @@
         <el-dialog
             title="库存详情"
             :visible.sync="codeDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
             width="85%"
             v-if="codeDetailVisible"
         >
diff --git a/src/views/inventory/invPreInProducts.vue b/src/views/inventory/invPreInProducts.vue
index 2fb8981..bde91d0 100644
--- a/src/views/inventory/invPreInProducts.vue
+++ b/src/views/inventory/invPreInProducts.vue
@@ -119,6 +119,8 @@
         <el-dialog
             title="库存详情"
             :visible.sync="codeDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
             width="85%"
             v-if="codeDetailVisible"
         >
diff --git a/src/views/inventory/invPreProducts.vue b/src/views/inventory/invPreProducts.vue
index 7e8ce45..08b4ed9 100644
--- a/src/views/inventory/invPreProducts.vue
+++ b/src/views/inventory/invPreProducts.vue
@@ -127,6 +127,8 @@
         <el-dialog
             title="库存详情"
             :visible.sync="codeDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
             width="85%"
             v-if="codeDetailVisible"
         >
diff --git a/src/views/inventory/invUdiTraceOrder.vue b/src/views/inventory/invUdiTraceOrder.vue
index f299463..b2a0709 100644
--- a/src/views/inventory/invUdiTraceOrder.vue
+++ b/src/views/inventory/invUdiTraceOrder.vue
@@ -20,7 +20,6 @@
                             @keypress.enter.native="enterKey($event)"
                             clearable
                         ></el-input>
-                        <el-checkbox v-model="sitcomScan" style="margin-left: 15px">分段扫码</el-checkbox>
                     </el-form-item>
 
                 </el-row>
@@ -412,12 +411,8 @@ export default {
         },
 
         enterKey(event) {
-            if (this.sitcomScan) {
-                return;
-            } else {
-                this.$refs.inputRef.select();
-                this.onSubmit();
-            }
+            this.$refs.inputRef.select();
+            this.onSubmit();
         },
         onSubmit() {
             this.getList();
diff --git a/src/views/userManage/admin/authAdmin.vue b/src/views/userManage/admin/authAdmin.vue
index e1fc25f..f9a4614 100644
--- a/src/views/userManage/admin/authAdmin.vue
+++ b/src/views/userManage/admin/authAdmin.vue
@@ -145,7 +145,8 @@
                 <el-row :gutter="20" class="el-row" type="flex">
                     <el-col :span="10" class="el-col" type="flex">
                         <div class="text item">
-                            <el-form-item label="备&nbsp&nbsp注" prop="comments">
+                            <el-form-item prop="comments">
+                                <label slot="label">备&emsp;&emsp;注</label>
                                 <el-input v-model="formData.comments" size="small" style="width: 80%"></el-input>
                             </el-form-item>
                         </div>
diff --git a/src/views/userManage/param/systemPDFModule.vue b/src/views/userManage/param/systemPDFModule.vue
index 8f0c3e8..ecca52e 100644
--- a/src/views/userManage/param/systemPDFModule.vue
+++ b/src/views/userManage/param/systemPDFModule.vue
@@ -563,7 +563,7 @@ export default {
         },
         getModuleList() {
             this.moduleLoading = true;
-            systemPDFModuleList(this.selectTemplateQuery)
+            systemPDFModuleList(this.moduleQuery)
                 .then(response => {
                     this.moduleLoading = false;
                     this.moduleList = response.data.list || [];
diff --git a/src/views/userManage/param/systemPDFTemplate.vue b/src/views/userManage/param/systemPDFTemplate.vue
index 53fead7..95e3528 100644
--- a/src/views/userManage/param/systemPDFTemplate.vue
+++ b/src/views/userManage/param/systemPDFTemplate.vue
@@ -82,6 +82,7 @@
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
                 :total="total"
+                :current-page="query.page"
             >
             </el-pagination>
         </el-card>
@@ -351,7 +352,7 @@ export default {
                 name: "",
                 module: null,
                 page: 1,
-                limit: 20
+                limit: 10
             },
             headers: {},
             list: [],
@@ -423,7 +424,7 @@ export default {
                 name: "",
                 module: null,
                 page: 1,
-                limit: 20
+                limit: 10
             };
             this.getList();
         },