From 30c45e6f7485a2c3fa7d25be5a2cb027f5e1545e Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Mon, 6 Jan 2025 10:44:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/role.js                           |  6 +-----
 .../mall/promotion/couponTemplate/index.vue      |  1 -
 src/views/system/role/components/roleAdd.vue     | 16 ++++++++++++++--
 src/views/system/role/index.vue                  |  3 ++-
 src/views/system/user/index.vue                  |  3 +++
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/api/system/role.js b/src/api/system/role.js
index 05d2a59f..60d11b0c 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -44,11 +44,7 @@ export function updateRole(data) {
 }
 
 // 角色状态修改
-export function changeRoleStatus(id, status) {
-  const data = {
-    id,
-    status
-  }
+export function changeRoleStatus(data) {
   return request({
     url: '/system/role/update-status',
     method: 'put',
diff --git a/src/views/mall/promotion/couponTemplate/index.vue b/src/views/mall/promotion/couponTemplate/index.vue
index db81ab3c..ffdbb920 100644
--- a/src/views/mall/promotion/couponTemplate/index.vue
+++ b/src/views/mall/promotion/couponTemplate/index.vue
@@ -176,7 +176,6 @@ import {
 } from "@/utils/constants";
 import { getSpuSimpleList } from "@/api/mall/product/spu";
 import { parseTime } from "@/utils/ruoyi";
-import {changeRoleStatus} from "@/api/system/role";
 
 export default {
   name: "PromotionCouponTemplate",
diff --git a/src/views/system/role/components/roleAdd.vue b/src/views/system/role/components/roleAdd.vue
index 26de73be..4c983354 100644
--- a/src/views/system/role/components/roleAdd.vue
+++ b/src/views/system/role/components/roleAdd.vue
@@ -26,7 +26,7 @@
       </el-col>
       <el-col :span="12">
         <el-form-item label="状态" prop="status" v-if="isEdit">
-          <el-switch v-model="form.status"> </el-switch>
+          <el-switch v-model="form.status" @change='changeStatus'> </el-switch>
         </el-form-item>
       </el-col>
       <el-col :span="24">
@@ -38,7 +38,7 @@
   </el-form>
 </template>
 <script>
-import { addRole, getRole, updateRole } from "@/api/system/role";
+import { addRole, getRole, updateRole,changeRoleStatus } from "@/api/system/role";
 export default {
   name: "RoleAdd",
   data() {
@@ -124,6 +124,18 @@ export default {
       this.$refs.form.resetFields();
       this.isEdit = false;
     },
+    // 修改状态
+    changeStatus(val) {
+      // 调用状态修改接口
+      changeRoleStatus({
+        id: this.form.id,
+        status: val ? 0 : 1,
+      }).then((res) => {
+        if (res.code === 0) {
+          this.$modal.msgSuccess("操作成功");
+        }
+      })
+    }
   },
 };
 </script>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 30b611c8..15fbfa6c 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -39,7 +39,7 @@
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
 			width="50%">
-			<role-add ref="roleAdd" @successSubmit="successSubmit" />
+			<role-add ref="roleAdd" @successSubmit="successSubmit"/>
 		</base-dialog>
 		<!-- 菜单权限 -->
 		<base-dialog
@@ -246,6 +246,7 @@ export default {
 			this.$refs.roleAdd.formClear();
 			this.centervisible = false;
 			this.addOrEditTitle = '';
+			this.getList();
 		},
 		handleConfirm() {
 			this.$refs.roleAdd.submitForm();
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index cbffe0a3..e7929ddd 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -496,6 +496,9 @@ export default {
 				username: [
 					{ required: true, message: '用户名称不能为空', trigger: 'blur' },
 				],
+				deptId: [
+					{ required: true, message: '归属部门不能为空', trigger: 'change' },
+				],
 				nickname: [
 					{ required: true, message: '用户昵称不能为空', trigger: 'blur' },
 				],