From 562572455f99228f242a9f1b62e2f9d855a9b308 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Sun, 26 Jun 2022 10:18:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BasicEntrutsReceModify.vue | 1 +
 src/views/business/stockOrderEditor.vue    | 2 +-
 src/views/userManage/admin/authAdmin.vue   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue
index 6aa685d..c8c55b2 100644
--- a/src/views/basic/BasicEntrutsReceModify.vue
+++ b/src/views/basic/BasicEntrutsReceModify.vue
@@ -306,6 +306,7 @@ export default {
         invChange() {
 
             this.findSubInvByInv();
+            this.inputQuery.invWarehouseCode = null;
             this.$set(this.inputQuery, "entrustUser", "");
             this.$set(this.inputQuery, "entrustInv", "");
             this.getEntrustStorage();
diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue
index a5a24d8..d03fe32 100644
--- a/src/views/business/stockOrderEditor.vue
+++ b/src/views/business/stockOrderEditor.vue
@@ -93,7 +93,7 @@
                         <span>{{ sourceMap[scope.row.sourceType] }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="单据日期" prop="billdate"></el-table-column>
+                <el-table-column label="单据日期" prop="billdate" width="150"></el-table-column>
                 <el-table-column label="单据状态">
                     <template slot-scope="scope">
                         {{ scope.row.status | statusFilterName }}
diff --git a/src/views/userManage/admin/authAdmin.vue b/src/views/userManage/admin/authAdmin.vue
index 82676f0..2399e15 100644
--- a/src/views/userManage/admin/authAdmin.vue
+++ b/src/views/userManage/admin/authAdmin.vue
@@ -86,6 +86,7 @@
       :before-close="hideForm"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
+      v-if="formVisible"
       width="70%"
       top="5vh"
     >

From ba87eb80b10ab6e72934f2aa170a1d8322ef7891 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Sun, 26 Jun 2022 16:06:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E9=9A=90=E8=97=8F=E4=BB=93=E5=BA=93=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=B8=BB=E7=AE=A1=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=A7=94=E6=89=98?=
 =?UTF-8?q?=E9=AA=8C=E6=94=B6=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=88=86?=
 =?UTF-8?q?=E5=BA=93=E5=92=8C=E5=A7=94=E6=89=98=E9=AA=8C=E6=94=B6=E5=88=86?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BasicEntrutsRece.vue |  5 +++--
 src/views/basic/invWarehouse.vue     | 13 +------------
 src/views/business/stockOrderNew.vue |  7 +++++++
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/views/basic/BasicEntrutsRece.vue b/src/views/basic/BasicEntrutsRece.vue
index d8a9cc1..0c3f976 100644
--- a/src/views/basic/BasicEntrutsRece.vue
+++ b/src/views/basic/BasicEntrutsRece.vue
@@ -26,8 +26,9 @@
                 <el-table-column label="序号" type="index" width="60" fixed></el-table-column>
                 <el-table-column label="扫码单据类型" prop="curName" fixed></el-table-column>
                 <el-table-column label="当前仓库" prop="curInvName" fixed></el-table-column>
-                <el-table-column label="委托验收仓库" prop="entrustInvName" fixed>
-                </el-table-column>
+                <el-table-column label="当前分库" prop="invWarehouseName" fixed></el-table-column>
+                <el-table-column label="委托验收仓库" prop="entrustInvName" fixed></el-table-column>
+                <el-table-column label="委托验收分库" prop="entrustSubInvName" fixed></el-table-column>
                 <el-table-column label="委托验收人" prop="employeeName" fixed>
                 </el-table-column>
                 <el-table-column label="操作" fixed="right">
diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index 6c3560f..01abe2e 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -181,6 +181,7 @@
                         <el-button
                             type="text"
                             size="small"
+                            :disabled="!configParms.basicInv"
                             @click.native.stop="handleSubDel(scope.row)"
                         >删除
                         </el-button
@@ -214,14 +215,6 @@
                         label="用户名"
                         min-width="30%">
                     </el-table-column>
-                    <el-table-column
-                        prop="isDirector"
-                        label="主管"
-                        min-width="30%">
-                        <template slot-scope="scope">
-                            <span>{{ isDirectorMap[scope.row.director] }}</span>
-                        </template>
-                    </el-table-column>
                     <el-table-column
                         label="操作"
                         min-width="30%"
@@ -679,10 +672,6 @@ export default {
                 true: "寄售",
                 false: "仓库",
             },
-            isDirectorMap: {
-                true: "是",
-                false: "否",
-            },
             directorMap: {
                 true: "取消主管",
                 false: "设为主管",
diff --git a/src/views/business/stockOrderNew.vue b/src/views/business/stockOrderNew.vue
index 3710601..bccffe0 100644
--- a/src/views/business/stockOrderNew.vue
+++ b/src/views/business/stockOrderNew.vue
@@ -996,4 +996,11 @@ export default {
 
 <style scoped>
 
+/**
+解决el-input输入框 type=number时，输入中文光标上移问题
+ */
+.el-input__inner{
+    line-height: 1px !important;
+}
+
 </style>