From 9226a22b0687392cd01192e65f470b22b4f53181 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Thu, 13 Apr 2023 14:55:13 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/IoCheckErrorOrder.vue       |  1 +
 src/views/inout/IoDeliveryAuditOrder.vue    |  1 +
 src/views/inout/IoSupAduitOrder.vue         |  2 +-
 src/views/inout/IoSupSecAuditOrder.vue      |  1 +
 src/views/inventory/InvSupPreInSerach.vue   |  1 +
 src/views/inventory/supInoutSearchOrder.vue |  1 +
 src/views/system/dept/authDept.vue          | 10 +++++-----
 src/views/system/dept/invWarehouse.vue      | 18 ++++++++++++++++--
 8 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index ca68510..f3c387a 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -599,6 +599,7 @@ export default {
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       };
+      this.actDateRange = [];
       this.getList();
     },
     onSubmit() {
diff --git a/src/views/inout/IoDeliveryAuditOrder.vue b/src/views/inout/IoDeliveryAuditOrder.vue
index da8d756..623b80c 100644
--- a/src/views/inout/IoDeliveryAuditOrder.vue
+++ b/src/views/inout/IoDeliveryAuditOrder.vue
@@ -717,6 +717,7 @@ export default {
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       };
+      this.actDateRange = [];
       this.getList();
     },
     onSubmit() {
diff --git a/src/views/inout/IoSupAduitOrder.vue b/src/views/inout/IoSupAduitOrder.vue
index 9bc702c..849acb4 100644
--- a/src/views/inout/IoSupAduitOrder.vue
+++ b/src/views/inout/IoSupAduitOrder.vue
@@ -582,7 +582,7 @@ export default {
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       };
-      this.actDateRange=[];
+      this.actDateRange = [];
       this.getList();
     },
     onSubmit() {
diff --git a/src/views/inout/IoSupSecAuditOrder.vue b/src/views/inout/IoSupSecAuditOrder.vue
index fa8ad51..d46d056 100644
--- a/src/views/inout/IoSupSecAuditOrder.vue
+++ b/src/views/inout/IoSupSecAuditOrder.vue
@@ -618,6 +618,7 @@ export default {
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       };
+      this.actDateRange = [];
       this.getList();
     },
     onSubmit() {
diff --git a/src/views/inventory/InvSupPreInSerach.vue b/src/views/inventory/InvSupPreInSerach.vue
index e135aa3..c1b6bc0 100644
--- a/src/views/inventory/InvSupPreInSerach.vue
+++ b/src/views/inventory/InvSupPreInSerach.vue
@@ -492,6 +492,7 @@ export default {
         page: 1,
         limit: 10
       };
+      this.auditDateRange = [];
       this.getCodeDetailList();
     },
 
diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue
index 8a32fa3..4f49e85 100644
--- a/src/views/inventory/supInoutSearchOrder.vue
+++ b/src/views/inventory/supInoutSearchOrder.vue
@@ -191,6 +191,7 @@ export default {
         startAduditTime: null,
         endAduditTime: null,
       };
+      this.actDateRange = [];
       this.getList();
     },
 
diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue
index 0f712db..bd165d5 100644
--- a/src/views/system/dept/authDept.vue
+++ b/src/views/system/dept/authDept.vue
@@ -100,9 +100,9 @@
         </el-table-column>
       </el-table>
       <el-dialog :title="formMap[formName]" :visible.sync="formVisible" width="45%">
-        <el-form :model="formData" ref="dataForm" :rules="rules">
+        <el-form :model="formData" ref="dataForm" :rules="rules" label-width="150px">
           <el-row>
-            <el-form-item label="上级部门:" label-width="100px" v-if="formData.pid != 0">
+            <el-form-item label="上级部门:" v-if="formData.pid != 0">
               <treeselect v-model="formData.pcode"  :options="deptOptions" :normalizer="normalizer"
                           :disabled="isShow"
                           style="width: 90%"
@@ -110,7 +110,7 @@
             </el-form-item>
           </el-row>
           <el-row>
-            <el-form-item label="部门名称:" label-width="100px" prop="name">
+            <el-form-item label="部门名称:" prop="name">
               <el-input
                 v-model="formData.name"
                 style="width: 90%"
@@ -120,7 +120,7 @@
             </el-form-item>
           </el-row>
           <el-row>
-            <el-form-item label="状态:" prop="status" label-width="100px">
+            <el-form-item label="状态:" prop="status">
               <el-radio-group v-model="formData.status">
                 <el-radio :label="1">正常</el-radio>
                 <el-radio :label="0">禁用</el-radio>
@@ -135,7 +135,7 @@
             </el-radio-group>
           </el-form-item>
           <el-row>
-            <el-form-item label="备注:" prop="remark" label-width="100px">
+            <el-form-item label="备注:" prop="remark">
               <el-input
                 v-model="formData.remark"
                 size="small"
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index 6cd7473..ba20a97 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -501,6 +501,22 @@ export default {
           .catch(() => {
           });
       }
+      filterSubAll(this.query)
+        .then((response) => {
+          let invList = response.data || [];
+          //上级仓库中去除当前仓库节点
+          if (invList.length > 0) {
+            for (let i = 0; i < invList.length; i++) {
+              if (invList[i].code === this.subData.code) {
+                invList.splice(i, 1);
+                break;
+              }
+            }
+          }
+          this.invOptions = this.handleTree(invList, "code", "parentCode");
+        })
+        .catch(() => {
+        });
       this.sysSubList = null;
     },
 
@@ -775,8 +791,6 @@ export default {
           });
       }
     },
-
-
   },
   mounted() {
   },