diff --git a/src/api/model/orders.js b/src/api/model/orders.js
index 4aa0998..67b374f 100644
--- a/src/api/model/orders.js
+++ b/src/api/model/orders.js
@@ -97,8 +97,15 @@ export default {
 					return await http.post(this.url, params);
 				},
 			},
+			status:{
+				url: `${config.API_URL}/repair.status.list`,
+				name: "维修业务状态",
+				post: async function (params) {
+					return await http.post(this.url,params);
+				}
+			},
 			field:{
-				url: `${config.API_URL}/`,
+				url: `${config.API_URL}/repair.order.field.list`,
 				name: "维修工单检索",
 				post: async function (params) {
 					return await http.post(this.url,params);
diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js
index b7c0645..44c6141 100644
--- a/src/assets/icons/index.js
+++ b/src/assets/icons/index.js
@@ -114,6 +114,7 @@ export { default as FinanceMag } from './menu/Finance.vue'
 export { default as Reports } from './menu/ReportForms.vue'
 export { default as ShipmentMag } from './menu/Shipment.vue'
 export { default as Inventory } from './menu/Stock.vue'
+export { default as Service } from './menu/Service.vue'
 // 二层菜单
 export { default as Controller } from './childMenu/Console.vue'
 export { default as CostFeeRecords } from './childMenu/CostControl.vue'
diff --git a/src/assets/icons/menu/Service.vue b/src/assets/icons/menu/Service.vue
new file mode 100644
index 0000000..efb9e45
--- /dev/null
+++ b/src/assets/icons/menu/Service.vue
@@ -0,0 +1,13 @@
+<template>
+	<svg t="1719388001057" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2117" width="200" height="200"><path d="M949.23434667 425.71093333a88.63744 88.63744 0 0 0-67.33824-62.53226666c-66.46442667-13.76256-90.00277333-54.72256-68.64896-119.33013334a89.12896 89.12896 0 0 0-20.31616-89.78432c-37.95626667-39.54005333-95.51872-72.96341333-148.71210667-86.28906666a88.4736 88.4736 0 0 0-87.70901333 27.30666666c-45.00138667 50.89962667-92.18730667 50.89962667-137.18869334 0a88.30976 88.30976 0 0 0-87.70901333-27.30666666c-53.13877333 13.32565333-110.64661333 46.74901333-148.71210667 86.28906666a89.18357333 89.18357333 0 0 0-20.31616 89.78432c21.40842667 64.7168-2.07530667 105.6768-68.64896 119.33013334A88.80128 88.80128 0 0 0 26.65130667 425.71093333c-15.07328 52.86570667-15.07328 119.6032 0 172.57813334a88.80128 88.80128 0 0 0 67.28362666 62.53226666c66.46442667 13.76256 90.00277333 54.72256 68.64896 119.33013334a89.18357333 89.18357333 0 0 0 20.31616 89.78432c38.06549333 39.54005333 95.68256 72.85418667 148.82133334 86.28906666a88.4736 88.4736 0 0 0 87.6544-27.30666666c45.056-50.89962667 92.18730667-50.89962667 137.24330666 0 21.84533333 24.79445333 55.59637333 35.28021333 87.6544 27.30666666 53.13877333-13.32565333 110.75584-46.74901333 148.82133334-86.28906666 22.9376-23.81141333 30.69269333-58.43626667 20.31616-89.78432-21.40842667-64.7168 2.12992-105.6768 68.64896-119.33013334a88.63744 88.63744 0 0 0 67.39285333-62.53226666c14.96405333-52.86570667 14.96405333-119.71242667-0.21845333-172.57813334zM487.97013333 718.65685333A206.27456 206.27456 0 0 1 282.07786667 512a206.27456 206.27456 0 0 1 205.89226666-206.65685333A206.27456 206.27456 0 0 1 693.8624 512a206.27456 206.27456 0 0 1-205.89226667 206.65685333z" p-id="2118"></path><path d="M635.04384 512c0 39.37621333-15.29173333 76.45866667-43.14453333 104.31146667a145.48992 145.48992 0 0 1-103.92917334 43.30837333c-39.26698667 0-76.1856-15.29173333-103.98378666-43.25376-27.8528-27.8528-43.08992-64.98986667-43.08992-104.36608 0-39.37621333 15.29173333-76.45866667 43.14453333-104.31146667a145.48992 145.48992 0 0 1 103.92917333-43.30837333c39.21237333 0 76.1856 15.29173333 103.92917334 43.25376 27.8528 27.8528 43.14453333 64.98986667 43.14453333 104.36608z" p-id="2119"></path></svg>
+</template>
+
+<script>
+export default {
+	name: "Service"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/scSearchSelect/index.vue b/src/components/scSearchSelect/index.vue
index bcd3c90..6299ff6 100644
--- a/src/components/scSearchSelect/index.vue
+++ b/src/components/scSearchSelect/index.vue
@@ -108,7 +108,7 @@ export default {
 		box-shadow: 0 6px 4px rgba(180, 207, 235, 0.25);
 		//border: 1px solid var(--el-border-color-light);
 		.item{
-			padding: 0 10px;text-align: center;
+			padding: 0 10px;text-align: left;
 		}
 		.item:hover{
 			background-color: var(--el-color-primary-light-9);
diff --git a/src/config/route.js b/src/config/route.js
index 34c6230..9191ba4 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -15,16 +15,16 @@ const routes = [
 			title: "系统搜索",
 		},
 	},
-	{
-		name: "repair-info",
-		path:"/repair-info",
-		component:"order/repairList/repair-info",
-		meta: {
-			code:"",
-			icon: "sc-icon-Home",
-			title: "维修明细",
-		},
-	},
+	// {
+	// 	name: "repair-info",
+	// 	path:"/repair-info",
+	// 	component:"order/repairList/repair-info",
+	// 	meta: {
+	// 		code:"",
+	// 		icon: "sc-icon-Home",
+	// 		title: "维修明细",
+	// 	},
+	// },
 
 
 	{
diff --git a/src/style/fix.scss b/src/style/fix.scss
index 67b4415..4159620 100644
--- a/src/style/fix.scss
+++ b/src/style/fix.scss
@@ -37,6 +37,7 @@
 	--el-order-color-3:#0DA525;
 	--el-order-color-4:#FFB103;
 	--el-order-color-5:#E81B1B;
+	--el-order-color-100:#57C23A;
 }
 
 .el-table{
diff --git a/src/views/docsManager/index.vue b/src/views/docsManager/index.vue
index 182ae49..479050e 100644
--- a/src/views/docsManager/index.vue
+++ b/src/views/docsManager/index.vue
@@ -17,7 +17,7 @@ import document from './document'
 import share from './share'
 
 export default {
-	name: 'index',
+	name: 'manager',
 	components: {
 		document,
 		share
diff --git a/src/views/home/search/index.vue b/src/views/home/search/index.vue
index f96facf..b9c04d3 100644
--- a/src/views/home/search/index.vue
+++ b/src/views/home/search/index.vue
@@ -182,7 +182,7 @@
 import scSelect from '/src/components/scSearchSelect';
 import {eventBus} from "@/utils/eventBus";
 export default {
-	name: "",
+	name: "view-search",
 	components:{
 		scSelect
 	},
diff --git a/src/views/order/dataConfirm/index.vue b/src/views/order/dataConfirm/index.vue
index 2e808c2..c45db1e 100644
--- a/src/views/order/dataConfirm/index.vue
+++ b/src/views/order/dataConfirm/index.vue
@@ -176,6 +176,7 @@ import config from "@/config/table";
 import {eventBus} from "@/utils/eventBus"
 
 export default {
+	name:"dataConfirm",
 	components: {
 		columnSetting,
 		emailSync
diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue
index 02603d7..302cfa4 100644
--- a/src/views/order/orderList/index.vue
+++ b/src/views/order/orderList/index.vue
@@ -39,7 +39,7 @@
 				<sc-table-column label="序号" align="center" type="index"></sc-table-column>
 				<template #business_status="scope">
 					<span v-for="(item,ind) in statusList" :key="ind">
-						<span :style="{color:item.value==1?`var(--el-order-color-1)`:item.value==2?`var(--el-order-color-2)`:item.value==3?`var(--el-order-color-3)`:item.value==4?`var(--el-order-color-4)`:`var(--el-order-color-5)`}"
+						<span :style="{color:item.value==1?`var(--el-order-color-1)`:item.value==2?`var(--el-order-color-2)`:item.value==3?`var(--el-order-color-3)`:item.value==4?`var(--el-order-color-4)`:`var(--el-order-color-100)`}"
 							  v-if="item.value == scope.row.business_status">{{item.label}}</span>
 					</span>
 				</template>
@@ -92,6 +92,7 @@
 import {eventBus} from "@/utils/eventBus";
 import flow from "./components/flow"
 export default {
+	name:"orderList",
 	components: {
 		flow
 	},
diff --git a/src/views/order/orderPlan/confirmOrder.vue b/src/views/order/orderPlan/confirmOrder.vue
index 762dc4a..5817b6a 100644
--- a/src/views/order/orderPlan/confirmOrder.vue
+++ b/src/views/order/orderPlan/confirmOrder.vue
@@ -1,6 +1,6 @@
 <template>
 	<el-dialog :title="titleMap[mode]" v-model="visible" :width="400" draggable destroy-on-close @closed="$emit('closed')">
-		<el-form :model="form" :rules="rules" :disabled="mode=='show'" ref="dialogForm" label-width="90px" label-position="right">
+		<el-form :model="form" :rules="rules" :disabled="mode=='show'" ref="dialogForm" label-width="105px" label-position="right">
 			<el-col :span="24" :sm="24">
 				<el-form-item label="维修日期" prop="schedule_date">
 					<el-date-picker v-model="form.schedule_date" type="date" placeholder="请选择维修日期" clearable value-format="YYYY-MM-DD"></el-date-picker>
diff --git a/src/views/order/orderPlan/index.vue b/src/views/order/orderPlan/index.vue
index 5731083..ae470a7 100644
--- a/src/views/order/orderPlan/index.vue
+++ b/src/views/order/orderPlan/index.vue
@@ -21,15 +21,17 @@
 			<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" @selection-change="selectionChange">
 				<el-table-column type="selection" align="center" width="40"></el-table-column>
 				<sc-table-column label="序号" align="center" type="index"></sc-table-column>
-				<template #business_status="scope">
-					<span v-for="(item,ind) in statusList" :key="ind">
-						<span :style="{color:item.value==1?`var(--el-order-color-1)`:item.value==2?`var(--el-order-color-2)`:item.value==3?`var(--el-order-color-3)`:item.value==4?`var(--el-order-color-4)`:`var(--el-order-color-5)`}"
-							  v-if="item.value == scope.row.business_status">{{item.label}}</span>
-					</span>
-				</template>
 				<template #repair_date="scope">{{scope.row.repair_order && scope.row.repair_order.repair_date?scope.row.repair_order.repair_date:''}}</template>
 				<template #schedule_date="scope">{{scope.row.repair_order && scope.row.repair_order.schedule_date?scope.row.repair_order.schedule_date:''}}</template>
-				<template #repair_status="scope">{{scope.row.repair_order && scope.row.repair_order.repair_status?scope.row.repair_order.repair_status:''}}</template>
+				<template #repair_status="scope">
+					<span v-if="scope.row.repair_order && scope.row.repair_order.repair_status">
+						<span v-for="(item,ind) in statusList" :key="ind">
+							<span :style="{color:item.value==1?`var(--el-order-color-1)`:item.value==2?`var(--el-order-color-2)`:item.value==3?`var(--el-order-color-3)`:item.value==4?`var(--el-order-color-4)`:`var(--el-order-color-100)`}"
+								  v-if="item.value == scope.row.repair_order.repair_status">{{item.label}}</span>
+						</span>
+					</span>
+					<span v-else :style="{color:`var(--el-order-color-1)`}">待确认</span>
+				</template>
 				<el-table-column label="操作" fixed="right" align="center" width="150">
 					<template #default="scope">
 						<el-dropdown>
@@ -61,6 +63,7 @@ import confirmDialog from './confirmOrder'
 import {eventBus} from "@/utils/eventBus";
 
 export default {
+	name:"orderPlan",
 	components: {
 		flow,
 		confirmDialog,
@@ -95,6 +98,9 @@ export default {
 			statusList:[],
 		}
 	},
+	mounted() {
+		this.getStatusList();
+	},
 	methods: {
 		searchShowClick(){
 			this.searchShow = !this.searchShow;
@@ -104,6 +110,13 @@ export default {
 				}
 			})
 		},
+		async getStatusList() {
+			const res = await this.$API.orders.order.repair.status.post();
+			if (res.code == 200) {
+				this.statusList = res.data;
+			}
+		},
+
 		async getSelectData(item) {
 			let {data, params} = item;
 			this.params = params;
@@ -115,7 +128,7 @@ export default {
 				searchParams.field = data.code[0];
 			}
 			if (data.type == 'select') {
-				const res = await this.$API.orders.order.maintenance.field.post(searchParams);
+				const res = await this.$API.orders.order.repair.field.post(searchParams);
 				if (res.code == 200) {
 					if (res.data && res.data.length > 0) {
 						res.data.forEach(item => {
diff --git a/src/views/order/repairList/repair-info.vue b/src/views/order/repair-info.vue
similarity index 99%
rename from src/views/order/repairList/repair-info.vue
rename to src/views/order/repair-info.vue
index 5093b43..28a83fb 100644
--- a/src/views/order/repairList/repair-info.vue
+++ b/src/views/order/repair-info.vue
@@ -122,7 +122,7 @@
 
 <script>
 export default {
-	name: "",
+	name: "repairInfo",
 	data(){
 		return{
 			size:'small',
diff --git a/src/views/order/repairList/index.vue b/src/views/order/repairList/index.vue
index 0060143..a510518 100644
--- a/src/views/order/repairList/index.vue
+++ b/src/views/order/repairList/index.vue
@@ -18,7 +18,7 @@
 				<sc-table-column label="序号" align="center" type="index"></sc-table-column>
 				<template #repair_status="scope">
 					<span v-for="(item,ind) in statusList" :key="ind">
-						<span :style="{color:item.value==1?`var(--el-order-color-1)`:item.value==2?`var(--el-order-color-2)`:item.value==3?`var(--el-order-color-3)`:item.value==4?`var(--el-order-color-4)`:`var(--el-order-color-5)`}"
+						<span :style="{color:item.value==1?`var(--el-order-color-1)`:item.value==2?`var(--el-order-color-2)`:item.value==3?`var(--el-order-color-3)`:item.value==4?`var(--el-order-color-4)`:`var(--el-order-color-100)`}"
 							  v-if="item.value == scope.row.repair_status">{{item.label}}</span>
 					</span>
 				</template>
@@ -48,22 +48,16 @@
 		</el-main>
 	</el-container>
 
-	<!--	<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" @closed="dialog.save=false"></save-dialog>-->
-	<!--	<see-dialog v-if="dialog.show" ref="showDialog" @closed="dialog.show=false"></see-dialog>-->
-
 </template>
 
 <script>
-// import saveDialog from './save'
-// import seeDialog from  './see'
 import flow from '../orderList/components/flow'
 import {eventBus} from "@/utils/eventBus";
 
 export default {
+	name:"repairList",
 	components: {
 		flow,
-		// saveDialog,
-		// seeDialog,
 	},
 	data() {
 		return {
@@ -115,7 +109,7 @@ export default {
 		},
 
 		async getStatusList() {
-			const res = await this.$API.orders.order.maintenance.status.post();
+			const res = await this.$API.orders.order.repair.status.post();
 			if (res.code == 200) {
 				this.statusList = res.data;
 			}
@@ -140,7 +134,7 @@ export default {
 				searchParams.field = data.code[0];
 			}
 			if (data.type == 'select') {
-				const res = await this.$API.orders.order.maintenance.field.post(searchParams);
+				const res = await this.$API.orders.order.repair.field.post(searchParams);
 				if (res.code == 200) {
 					if (res.data && res.data.length > 0) {
 						res.data.forEach(item => {
@@ -165,19 +159,12 @@ export default {
 		},
 		// 执行维修
 		table_upkeep(row){
-			eventBus.$emit('tagClose','/repair-info',{id:row.order_id});
+			eventBus.$emit('tagClose','/order/repair-info',{id:row.order_id});
 		},
 		//查看
 		table_show(row){
 			eventBus.$emit('tagClose','/order/order-info',{id:row.order_id});
 		},
-		//编辑
-		table_edit(row){
-			this.dialog.save = true
-			this.$nextTick(() => {
-				this.$refs.saveDialog.open('edit').setData(row);
-			})
-		},
 		// 工单日志
 		table_logs(row){
 			eventBus.$emit('tagClose','/order/order-logs',{id:row.id,type:2});
diff --git a/src/views/setting/deptMag/save.vue b/src/views/setting/deptMag/save.vue
index 427029f..cf36ad1 100644
--- a/src/views/setting/deptMag/save.vue
+++ b/src/views/setting/deptMag/save.vue
@@ -1,11 +1,11 @@
 <template>
 	<el-dialog :title="titleMap[mode]" v-model="visible" :width="500" destroy-on-close @closed="$emit('closed')">
 		<el-form :model="form" :rules="rules" :disabled="mode=='show'" ref="dialogForm" label-width="100px">
-			<el-form-item label="上级部门" prop="parent_id">
+			<el-form-item label="上级分组" prop="parent_id">
 				<el-cascader v-model="form.parent_id" :options="depts" :props="deptsProps" :show-all-levels="false" clearable style="width: 100%;"></el-cascader>
 			</el-form-item>
-			<el-form-item label="部门名称" prop="name">
-				<el-input v-model="form.name" placeholder="请输入部门名称" clearable></el-input>
+			<el-form-item label="分组名称" prop="name">
+				<el-input v-model="form.name" placeholder="请输入分组名称" clearable></el-input>
 			</el-form-item>
 			<el-form-item label="状态" prop="active_status">
 				<el-switch v-model="form.active_status" :active-value="true" :inactive-value="false"></el-switch>
diff --git a/src/views/setting/user/index.vue b/src/views/setting/user/index.vue
index 59ea939..3c8cd07 100644
--- a/src/views/setting/user/index.vue
+++ b/src/views/setting/user/index.vue
@@ -1,8 +1,29 @@
 <template>
 	<el-container class="mainBox">
+		<el-aside width="200px" v-loading="showGroupLoading">
+			<el-container>
+				<el-header>
+					<el-input placeholder="输入关键字进行过滤" :size="size" v-model="groupFilterText" clearable></el-input>
+				</el-header>
+				<el-main class="treeMain nopadding">
+					<el-tree ref="group" class="menu" node-key="id" :data="group" :current-node-key="''" :highlight-current="true" :expand-on-click-node="false" :filter-node-method="groupFilterNode" @node-click="groupClick">
+						<template #default="{ node, data }">
+							<span class="custom-tree-node userTree">
+								<span>{{ node.label }}</span>
+								<span class="btnBox" v-if="data.id!==''">
+									<el-icon class="btn edit" size="14px" v-auth="'updateDept'" @click.stop="dept_edit(data)"><sc-icon-Edit/></el-icon>
+									<el-icon class="btn del" size="14px" v-auth="'delDept'" @click.stop="dept_del(data)"><sc-icon-Delete/></el-icon>
+								</span>
+							</span>
+						</template>
+					</el-tree>
+				</el-main>
+			</el-container>
+		</el-aside>
 		<el-container class="mainHeaderNoBorderPadding">
 			<el-header style="padding-left: 10px;">
 				<div class="left-panel">
+					<el-button type="primary" plain v-auth="'addDept'" :size="size" icon="el-icon-plus" @click="addDept">新增分组</el-button>
 					<el-button type="primary" v-auth="'userCreate'" :size="size" icon="el-icon-plus" @click="add">新增用户</el-button>
 					<el-button type="danger" v-auth="'delUser'" plain :size="size" icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
 					<el-button type="primary" v-auth="'addUserRoles'" plain :size="size" :disabled="selection.length==0" @click="role">分配角色</el-button>
@@ -103,6 +124,7 @@
 	<review-dialog v-if="dialog.review" ref="reviewDialog" @success="handleSuccess" @closed="dialog.review=false"></review-dialog>
 	<re-pwd-dialog v-if="dialog.rePwdD" ref="rePwdDialog" @success="handleSuccess" @closed="dialog.rePwdD=false"></re-pwd-dialog>
 	<dis-role-dialog v-if="dialog.role" ref="diRoleDialog" @success="handleSuccess" @closed="dialog.role=false"></dis-role-dialog>
+	<dept-mag-dialog v-if="dialog.deptMsg" ref="deptMagDialog" @success="handleSuccess" @closed="dialog.deptMsg=false"></dept-mag-dialog>
 
 </template>
 
@@ -111,10 +133,12 @@
 	import reviewDialog from './review'
 	import rePwdDialog from './rePwd'
 	import disRoleDialog from './role'
+	import deptMagDialog from '/src/views/setting/deptMag/save'
 
 	export default {
+		name:"user",
 		components: {
-			saveDialog, rePwdDialog, disRoleDialog, reviewDialog
+			saveDialog, rePwdDialog, disRoleDialog, reviewDialog, deptMagDialog
 		},
 		data() {
 			return {
@@ -123,7 +147,8 @@
 					save: false,
 					review: false,
 					rePwdD: false,
-					role: false
+					role: false,
+					deptMsg:false,
 				},
 				showGroupLoading: false,
 				groupFilterText: '',
@@ -153,7 +178,7 @@
 			}
 		},
 		mounted() {
-			// this.getGroup()
+			this.getGroup()
 			this.auditStatus();
 			this.userType();
 		},
@@ -206,6 +231,31 @@
 					this.$refs.diRoleDialog.open().setData(row)
 				})
 			},
+			//添加部门分组
+			addDept(){
+				this.dialog.deptMsg = true
+				this.$nextTick(() => {
+					this.$refs.deptMagDialog.open()
+				})
+			},
+			dept_edit(row){
+				this.dialog.deptMsg = true
+				this.$nextTick(() => {
+					this.$refs.deptMagDialog.open('edit').setData(row)
+				})
+			},
+			dept_del(row){
+				this.$confirm(`确定删除 ${row.name} 吗？`, '提示', {
+					type: 'warning'
+				}).then(async () => {
+					const reqData = {ids: [row.id]};
+					const res = await this.$API.system.dept.delete.post(reqData);
+					if(res.code == 200){
+						await this.getGroup();
+						this.$message.success("删除成功")
+					}
+				}).catch(()=>{})
+			},
 			//添加
 			add(){
 				this.dialog.save = true
@@ -323,16 +373,16 @@
 				}
 			},
 			//加载树数据
-			// async getGroup(){
-			// 	this.showGroupLoading = true;
-			// 	const res = await this.$API.system.dept.active.post();
-			// 	if(res.code == 200){
-			// 		const allNode = {id: '', label: '所有'};
-			// 		res.data.unshift(allNode);
-			// 		this.group = res.data;
-			// 	}
-			// 	this.showGroupLoading = false;
-			// },
+			async getGroup(){
+				this.showGroupLoading = true;
+				const res = await this.$API.system.dept.active.post();
+				if(res.code == 200){
+					const allNode = {id: '', label: '所有'};
+					res.data.unshift(allNode);
+					this.group = res.data;
+				}
+				this.showGroupLoading = false;
+			},
 			//树过滤
 			groupFilterNode(value, data){
 				if (!value) return true;
@@ -386,11 +436,12 @@
 			//本地更新数据
 			handleSuccess(data, mode){
 				if(mode=='add'){
-					this.$refs.table.refresh();
+					this.getGroup();
 				}else if(mode=='edit'){
 					this.$refs.table.tableData.filter(item => item.id===data.id ).forEach(item => {
 						Object.assign(item, data)
-					})
+					});
+					this.getGroup();
 				}
 				this.$refs.table.refresh();
 			}
@@ -403,4 +454,14 @@
 		display: flex;align-items: center;
 		.round{width: 10px;height: 10px;display: inline-block;border-radius: 50%;margin-right: 4px;}
 	}
+	.userTree{
+		position: relative;
+		width: 100%;
+		.btnBox{
+			position: absolute;right: 10px;top: 2px;
+			.btn{margin: 0 3px;}
+			.btn.edit{color: var(--el-color-primary)}
+			.btn.del{color: var(--el-color-danger)}
+		}
+	}
 </style>
diff --git a/src/views/setting/user/save.vue b/src/views/setting/user/save.vue
index fd459e1..ee0f7d8 100644
--- a/src/views/setting/user/save.vue
+++ b/src/views/setting/user/save.vue
@@ -39,6 +39,15 @@
 					<el-form-item label="电子邮件" prop="email">
 						<el-input v-model="form.email" placeholder="请填写电子邮件" clearable></el-input>
 					</el-form-item>
+
+				</div>
+			</div>
+			<div class="cardBoxForm">
+				<div class="title">角色和分组</div>
+				<div class="comBox">
+					<el-form-item label="所属分组" prop="dept_id">
+						<el-cascader v-model="form.dept_id" :options="depts" :props="deptsProps" placeholder="请选择分组" clearable style="width: 100%;"></el-cascader>
+					</el-form-item>
 					<el-form-item label="分配角色" prop="role_ids">
 						<el-select v-model="form.role_ids" multiple filterable placeholder="请选择角色" style="width: 100%">
 							<el-option v-for="item in groups" :key="item.id" :label="item.label" :value="item.id"/>
@@ -46,14 +55,6 @@
 					</el-form-item>
 				</div>
 			</div>
-<!--			<div class="cardBoxForm">-->
-<!--				<div class="title">角色和部门</div>-->
-<!--				<div class="comBox">-->
-<!--					<el-form-item label="所属部门" prop="dept_id">-->
-<!--						<el-cascader v-model="form.dept_id" :options="depts" :props="deptsProps" placeholder="请选择部门" clearable style="width: 100%;"></el-cascader>-->
-<!--					</el-form-item>-->
-<!--				</div>-->
-<!--			</div>-->
 		</el-form>
 		<template #footer>
 			<el-button @click="visible=false" >取 消</el-button>
@@ -85,13 +86,13 @@
 					email:"",
 					avatar: "",
 					password:"",
-					// dept_id: "",
+					dept_id: "",
 					role_ids: []
 				},
 				//验证规则
 				rules: {
 					avatar:[
-						{required: true, message: '请上传头像'}
+						{required: false, message: '请上传头像'}
 					],
 					login_name: [
 						{required: true, message: '请输入登录账号'}
@@ -127,9 +128,9 @@
 							}
 						}}
 					],
-					// dept_id: [
-					// 	{required: true, message: '请选择所属部门'}
-					// ],
+					dept_id: [
+						{required: false, message: '请选择所属分组'}
+					],
 					role_ids: [
 						{required: true, message: '请选择所属角色', trigger: 'change'}
 					]
@@ -141,17 +142,17 @@
 					multiple: true,
 					checkStrictly: true
 				},
-				// depts: [],
-				// deptsProps: {
-				// 	value: "id",
-				// 	checkStrictly: false,
-				// 	emitPath:false
-				// }
+				depts: [],
+				deptsProps: {
+					value: "id",
+					checkStrictly: false,
+					emitPath:false
+				}
 			}
 		},
 		mounted() {
 			this.getGroup()
-			// this.getDept()
+			this.getDept()
 		},
 		methods: {
 			//显示
@@ -167,12 +168,12 @@
 					this.groups = res.data.rows;
 				}
 			},
-			// async getDept(){
-			// 	const res = await this.$API.system.dept.active.post();
-			// 	if(res.code == 200){
-			// 		this.depts = res.data;
-			// 	}
-			// },
+			async getDept(){
+				const res = await this.$API.system.dept.active.post();
+				if(res.code == 200){
+					this.depts = res.data;
+				}
+			},
 			parentParams(item){
 				this.form.avatar = item;
 			},
@@ -202,7 +203,7 @@
 				this.form.mobile = data.mobile
 				this.form.email = data.email
 				this.form.avatar = data.avatar
-				// this.form.dept_id = data.dept_id
+				this.form.dept_id = data.dept_id
 				this.form.group = data.group
 				this.form.role_ids = data.user_roles && data.user_roles.role_ids?data.user_roles.role_ids:[]