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 1/2] =?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' },
 				],
-- 
2.45.2


From 580a66549c5b7a7fea4a1c3ba394f69d48fdd6ed Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Tue, 7 Jan 2025 14:27:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/permission.js               |  2 +-
 .../equipment/base/inspection/items/index.vue |  1 -
 src/views/system/components/statusBtn2.vue    | 10 ++++-
 src/views/system/dept/index.vue               | 44 +++++++++++--------
 src/views/system/dict/data.vue                | 21 +++++++--
 src/views/system/dict/index.vue               | 23 +++++++---
 src/views/system/menu/index.vue               | 31 +++++++------
 src/views/system/post/index.vue               | 23 +++++++---
 src/views/system/user/index.vue               |  4 +-
 9 files changed, 108 insertions(+), 51 deletions(-)

diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 62a875b6..e4154b80 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -23,7 +23,7 @@ const permission = {
       state.topbarRouters = routes
     },
     SET_SIDEBAR_ROUTERS: (state, routes) => {
-      console.log('==SET_SIDEBAR_ROUTERS==:',routes)
+      // console.log('==SET_SIDEBAR_ROUTERS==:',routes)
       state.sidebarRouters = routes
     },
   },
diff --git a/src/views/equipment/base/inspection/items/index.vue b/src/views/equipment/base/inspection/items/index.vue
index fbf01d64..be5171a7 100644
--- a/src/views/equipment/base/inspection/items/index.vue
+++ b/src/views/equipment/base/inspection/items/index.vue
@@ -28,7 +28,6 @@ import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { deleteProgramTypeData } from '@/api/equipment/base/maintain/items'
 import showDetail  from './showDetail.vue'
-import { publicFormatter } from '@/utils/dict';
 
 export default {
   name: 'PlanConfig',
diff --git a/src/views/system/components/statusBtn2.vue b/src/views/system/components/statusBtn2.vue
index 3a4ab297..ed3b490f 100644
--- a/src/views/system/components/statusBtn2.vue
+++ b/src/views/system/components/statusBtn2.vue
@@ -5,6 +5,7 @@
   </div>
 </template>
 <script>
+import { getDictDatas, DICT_TYPE } from '@/utils/dict';
 export default {
   name: "StatusBtn2",
   props: {
@@ -15,7 +16,14 @@ export default {
   },
   computed: {
     state() {
-      return this.injectData.status === 1 ? "关闭" : "开启";
+      let label = ''
+      getDictDatas(DICT_TYPE.COMMON_STATUS).forEach((item) => {
+        if (parseInt(item.value) === this.injectData.status) {
+          label = item.label;
+        }
+      })
+      return label
+      // return this.injectData.status === 1 ? "关闭" : "开启";
     },
   },
 };
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index e98c1fcb..fa0a83c4 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -21,12 +21,12 @@
 			<el-table-column
 				prop="name"
 				label="部门名称"
-				width="260"></el-table-column>
+				min-width="260"></el-table-column>
 			<el-table-column
 				prop="leader"
 				label="负责人"
 				:formatter="userNicknameFormat"
-				width="120" />
+				min-width="120" />
 			<el-table-column prop="sort" label="排序" width="200"></el-table-column>
 			<el-table-column prop="status" label="状态" width="100">
 				<template v-slot="scope">
@@ -37,7 +37,7 @@
 				label="创建时间"
 				align="center"
 				prop="createTime"
-				width="200">
+				min-width="200">
 				<template v-slot="scope">
 					<span>{{ parseTime(scope.row.createTime) }}</span>
 				</template>
@@ -45,32 +45,38 @@
 			<el-table-column
 				label="操作"
 				align="center"
+				width="160"
 				class-name="small-padding fixed-width">
 				<template v-slot="scope">
 					<el-button
-						size="mini"
 						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['system:dept:update']">
-						修改
-					</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-plus"
 						@click="handleAdd(scope.row)"
 						v-hasPermi="['system:dept:create']">
 						新增
 					</el-button>
+					<span
+							v-hasPermi="['system:dept:update']"
+							style="margin: 0 4px; font-size: 18px; color: #e5e7eb"
+							>|</span
+						>
+					<el-button
+						type="text"
+						@click="handleUpdate(scope.row)"
+						v-hasPermi="['system:dept:update']">
+						<svg-icon icon-class="table_edit" style='font-size: 16px;'></svg-icon>
+					</el-button>
+					<span
+						 v-if="scope.row.parentId !== 0"
+							v-hasPermi="['system:dept:delete']"
+							style="margin: 0 4px; font-size: 18px; color: #e5e7eb"
+							>|</span
+						>
 					<el-button
 						v-if="scope.row.parentId !== 0"
-						size="mini"
 						type="text"
-						icon="el-icon-delete"
 						@click="handleDelete(scope.row)"
 						v-hasPermi="['system:dept:delete']">
-						删除
+						<svg-icon icon-class="table_delete"></svg-icon>
 					</el-button>
 				</template>
 			</el-table-column>
@@ -117,9 +123,9 @@
 								style="width: 100%">
 								<el-option
 									v-for="item in users"
-									:key="parseInt(item.id)"
+									:key="item.id"
 									:label="item.nickname"
-									:value="parseInt(item.id)" />
+									:value="item.id" />
 							</el-select>
 						</el-form-item>
 					</el-col>
@@ -316,7 +322,7 @@ export default {
 				return '未设置';
 			}
 			for (const user of this.users) {
-				if (row.leaderUserId === user.id) {
+				if (row.leaderUserId == user.id) {
 					return user.nickname;
 				}
 			}
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index e789bd12..1a7b0392 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -32,10 +32,23 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['system:dict:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['system:dict:delete']">删除</el-button>
+          <el-button
+						type="text"
+						@click="handleUpdate(scope.row)"
+						v-hasPermi="['system:dict:update']">
+						<svg-icon icon-class="table_edit" style='font-size: 16px;'></svg-icon>
+					</el-button>
+					<span
+							v-hasPermi="['system:dict:delete']"
+							style="margin: 0 4px; font-size: 18px; color: #e5e7eb"
+							>|</span
+						>
+					<el-button
+						type="text"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['system:dict:delete']">
+						<svg-icon icon-class="table_delete"></svg-icon>
+					</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 675e3418..9673f94c 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -33,12 +33,25 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='100'>
         <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['system:dict:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['system:dict:delete']">删除</el-button>
+          <el-button
+						type="text"
+						@click="handleUpdate(scope.row)"
+						v-hasPermi="['system:dict:update']">
+						<svg-icon icon-class="table_edit" style='font-size: 16px;'></svg-icon>
+					</el-button>
+					<span
+							v-hasPermi="['system:dict:delete']"
+							style="margin: 0 4px; font-size: 18px; color: #e5e7eb"
+							>|</span
+						>
+					<el-button
+						type="text"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['system:dict:delete']">
+						<svg-icon icon-class="table_delete"></svg-icon>
+					</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index bc77ec1e..2a52bcf5 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -52,31 +52,36 @@
 			<el-table-column
 				label="操作"
 				align="center"
+				width="160"
 				class-name="small-padding fixed-width">
 				<template v-slot="scope">
 					<el-button
-						size="mini"
 						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['system:menu:update']">
-						修改
-					</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-plus"
 						@click="handleAdd(scope.row)"
 						v-hasPermi="['system:menu:create']">
 						新增
 					</el-button>
+					<span
+							v-hasPermi="['system:menu:update']"
+							style="margin: 0 4px; font-size: 18px; color: #e5e7eb"
+							>|</span
+						>
+					<el-button
+						type="text"
+						@click="handleUpdate(scope.row)"
+						v-hasPermi="['system:menu:update']">
+						<svg-icon icon-class="table_edit" style='font-size: 16px;'></svg-icon>
+					</el-button>
+					<span
+							v-hasPermi="['system:menu:delete']"
+							style="margin: 0 4px; font-size: 18px; color: #e5e7eb"
+							>|</span
+						>
 					<el-button
-						size="mini"
 						type="text"
-						icon="el-icon-delete"
 						@click="handleDelete(scope.row)"
 						v-hasPermi="['system:menu:delete']">
-						删除
+						<svg-icon icon-class="table_delete"></svg-icon>
 					</el-button>
 				</template>
 			</el-table-column>
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 4ef78131..76ca6f13 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -27,12 +27,25 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='100'>
         <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['system:post:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['system:post:delete']">删除</el-button>
+          <el-button
+						type="text"
+						@click="handleUpdate(scope.row)"
+						v-hasPermi="['system:post:update']">
+						<svg-icon icon-class="table_edit" style='font-size: 16px;'></svg-icon>
+					</el-button>
+					<span
+							v-hasPermi="['system:post:delete']"
+							style="margin: 0 4px; font-size: 18px; color: #e5e7eb"
+							>|</span
+						>
+					<el-button
+						type="text"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['system:post:delete']">
+						<svg-icon icon-class="table_delete"></svg-icon>
+					</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index e7929ddd..8f8ff096 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -242,8 +242,8 @@
 				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitRole">确 定</el-button>
 				<el-button @click="cancelRole">取 消</el-button>
+				<el-button type="primary" @click="submitRole">确 定</el-button>
 			</div>
 		</base-dialog>
 	</div>
@@ -297,7 +297,7 @@ const tableProps = [
 		prop: 'dept',
 		label: '部门',
 		minWidth: 120,
-		filter: (item) => item.name || '',
+		filter: (item) => item?.name || '',
 		showOverflowtooltip: true,
 	},
 	{
-- 
2.45.2