From bae70ba06466fc74e614d750ad6f75ddd7e56773 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Tue, 16 Aug 2022 16:06:56 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js               | 12 ++++++++++--
 src/views/basic/invWarehouse.vue  | 14 +++++++++-----
 src/views/userManage/authDept.vue | 11 +++++++++--
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 0173a16..3f158f6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,6 +14,7 @@ import Empty from "../views/home/Empty.vue";
 import authAdmin from "../views/userManage/admin/authAdmin.vue";
 import authRole from "../views/userManage/admin/authRole.vue";
 import authPermissionRule from "../views/userManage/admin/authPermissionRule.vue";
+import authDept from "../views/userManage/authDept.vue";
 import systemParamConfig from "../views/userManage/param/systemParamConfig.vue";
 import phoneRegisterManage from "../views/userManage/param/phoneRegisterManage.vue";
 import systemPDFTemplate from "../views/userManage/param/systemPDFTemplate";
@@ -70,7 +71,6 @@ import stockOrderRecedLog from "@/views/business/stockOrderRecedLog";
 import thirdUploadSet from "@/views/thrsys/thirdUploadSet";
 
 
-
 //库存管理
 import stockCheck from "../views/inventory/stockCheck.vue";
 import onHand from "../views/inventory/OnHand.vue";
@@ -244,6 +244,15 @@ export const asyncRouterMap = [
                             authRule: ["authMange/auth_permission_rule"]
                         }
                     },
+                    {
+                        path: "authDept",
+                        component: authDept,
+                        name: "部门管理",
+                        icon: "",
+                        meta: {
+                            authRule: ["authMange/authDept"]
+                        }
+                    },
                 ]
             },
 
@@ -817,7 +826,6 @@ export const asyncRouterMap = [
     },
 
 
-
     {
         path: "/smp",
         redirect: "/smp/udiinfoExportSmp",
diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index d796c4c..684ff65 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -1495,12 +1495,16 @@ export default {
         delWarehouseUser(id) {
             let params = {id: id};
             deleteWarehouseUser(params).then((res) => {
-                this.$message.success("已移除");
-                for (let i = 0; i < this.userData.length; i++) {
-                    if (this.userData[i].id == id) {
-                        this.userData.splice(i, 1);
-                        return;
+                if (res.code == 20000) {
+                    this.$message.success("已移除");
+                    for (let i = 0; i < this.userData.length; i++) {
+                        if (this.userData[i].id == id) {
+                            this.userData.splice(i, 1);
+                            return;
+                        }
                     }
+                } else {
+                    this.$message.error(res.message);
                 }
             }).catch((error) => {
                 this.$message.error("移除失败");
diff --git a/src/views/userManage/authDept.vue b/src/views/userManage/authDept.vue
index 4e8b358..64733eb 100644
--- a/src/views/userManage/authDept.vue
+++ b/src/views/userManage/authDept.vue
@@ -129,6 +129,7 @@
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
             :total="total"
+            :current-page="filterQuery.page"
         ></el-pagination>
     </div>
 </template>
@@ -143,7 +144,7 @@ export default {
                 companyName: "",
                 checkType: "",
                 page: 1,
-                limit: 20,
+                limit: 10,
             },
             total: 0,
             loading: false,
@@ -193,12 +194,18 @@ export default {
             this.filterQuery = {
                 name: "",
                 page: 1,
-                limit: 20,
+                limit: 10,
             };
             this.getList();
         },
         formSubmit() {
 
+            if (this.$isBlank(this.formData.name)) {
+                this.$message.error("部门名称不能为空！");
+                return;
+            }
+
+
             if (this.formName == "add") {
 
                 addDept(this.formData)