2023-1-12

src/access/node.js

@@ -777,6 +777,11 @@ export const RewardEditShares= "Reward_editShares";//修改股份
 export const RewardSharesList= "Reward_editShares";//股份变动记录
 export const RewardABonusList= "Reward_aBonusList";//分红记录
 
+// 员工阶梯奖励
+export const LadderRewardList= "Ladder_rewardList";//员工阶梯奖励
+export const LadderStaffStockList= "Ladder_staffStockList";//股权发放记录
+
+
 // 收银台
 export const Cashier = "Application_Cashier";
 //收银台设置

src/api/Department.js

@@ -262,3 +262,58 @@ export function postClassDetails(data) {
     data,
   });
 }
+
+// 员工阶梯奖励列表
+export function StaffLadderList(data) {
+  return request({
+    url: "/Department/StaffLadder/list",
+    method: "post",
+    data,
+  });
+}
+// 阶梯奖励详情
+export function StaffLadderDetails(data) {
+  return request({
+    url: "/Department/StaffLadder/details",
+    method: "post",
+    data,
+  });
+}
+// 新增阶梯奖励
+export function StaffLadderAdd(data) {
+  return request({
+    url: "/Department/StaffLadder/add",
+    method: "post",
+    data,
+  });
+}
+// 修改阶梯奖励
+export function StaffLadderUpdate(data) {
+  return request({
+    url: "/Department/StaffLadder/update",
+    method: "post",
+    data,
+  });
+}
+
+// 删除阶梯奖励
+export function StaffLadderDelete(data) {
+  return request({
+    url: "/Department/StaffLadder/delete",
+    method: "post",
+    data,
+  });
+}
+
+// 奖励发放记录
+export function StaffStockList(data) {
+  return request({
+    url: "/Department/StaffStock/list",
+    method: "post",
+    data,
+  });
+}
+
+
+
+

src/router/index.js

@@ -3335,13 +3335,23 @@ export const asyncRoutes = [{
 			title: "阶梯奖励",
 			remixIcon: "store-2-line",
 		},
-		children: [{
+		children: [
+			{
 				path: "ladderList",
 				name: "LadderList",
 				component: () => import("@/views/AppBase/ladder/ladderList"),
 				meta: {
 					title: "员工阶梯奖励",
-					// access: nodes.RewardList,
+					// access: nodes.LadderRewardList,
+				},
+			},
+			{
+				path: "staffStockList",
+				name: "StaffStockList",
+				component: () => import("@/views/AppBase/ladder/staffStockList"),
+				meta: {
+					title: "股权发放记录",
+					// access: nodes.LadderStaffStockList,
 				},
 			},
 		],

src/views/AppBase/ladder/components/addLadder.vue

@@ -0,0 +1,148 @@
+<template>
+	<div>
+		<el-drawer class="edit-drawer" :title="isEdit ? '修改阶梯奖励' : '新增阶梯奖励'" size="650px" :visible.sync="visible"
+			direction="rtl" :modal="modal" :wrapper-closable="false" @close="close">
+			<el-form ref="form" :rules="rules" size="small" :model="form" label-width="120px">
+				<el-form-item label="奖励名称" prop="name">
+					<el-input v-model="form.name" placeholder="请输入班次名称"></el-input>
+				</el-form-item>
+				<el-form-item label="销售金额" prop="number">
+					<el-input-number v-model="form.number" controls-position="right" :min="1"></el-input-number>
+				</el-form-item>
+				<el-form-item label="奖励股权" prop="stock">
+					<el-input-number v-model="form.stock" controls-position="right" :min="1"></el-input-number>
+				</el-form-item>
+				<el-form-item style="text-align: right; padding-right: 10px">
+					<el-button type="primary" @click="confirm">确 定</el-button>
+					<el-button @click="close">取 消</el-button>
+				</el-form-item>
+			</el-form>
+		</el-drawer>
+	</div>
+</template>
+
+<script>
+	import {
+		StaffLadderDetails,
+		StaffLadderAdd,
+		StaffLadderUpdate
+	} from "@/api/Department";
+	export default {
+		name: "AddLadder",
+		props: {
+			visible: {
+				type: Boolean,
+				default: false,
+			},
+			isEdit: {
+				type: Boolean,
+				default: false,
+			},
+			// 是否需要遮罩层
+			modal: {
+				type: Boolean,
+				default: true,
+			},
+			id: {
+				type: [String, Number],
+				default: '',
+			}
+		},
+		data() {
+			return {
+				form: {
+					//奖励名称
+					name: '',
+					//奖励股权
+					stock: 0,
+					// 销售总金额
+					number: 0,
+				},
+				rules: {
+					name: [{
+						required: true,
+						message: "请输入奖励名称",
+						trigger: "blur"
+					}],
+					number: [{
+						required: true,
+						message: "请输入销售总结",
+						trigger: "blur"
+					}],
+					stock: [{
+						required: true,
+						message: "请输入奖励股权",
+						trigger: "blur"
+					}],
+				}
+			};
+		},
+		created() {
+			if (this.id) {
+				this.form.id = this.id;
+				this.StaffLadderDetails();
+			}
+		},
+		methods: {
+			close() {
+				this.$emit("close");
+			},
+			//  详情 StaffLadderDetails
+			async StaffLadderDetails() {
+				if (!this.id) return;
+				const {
+					data
+				} = await StaffLadderDetails({
+					id: this.id
+				});
+				this.form = Object.assign(this.form, data)
+			},
+			async confirm() {
+				this.$refs.form.validate(async (valid) => {
+					if (valid) {
+						let data;
+						if (this.isEdit) {
+							data = await StaffLadderUpdate(this.form);
+						} else {
+							data = await StaffLadderAdd(this.form);
+						}
+						this.$message({
+							message: data.data,
+							type: "success",
+						});
+
+						this.close();
+						this.$emit("confirm");
+					}
+				});
+			},
+		},
+	};
+</script>
+
+<style scoped>
+	.btn-up {
+		position: relative;
+	}
+
+	.btn-department {
+		position: absolute;
+		left: 270px;
+		top: 4px;
+	}
+
+	.btn-role-up {
+		position: relative;
+	}
+
+	.add-role {
+		position: absolute;
+		left: 270px;
+		top: 4px;
+	}
+
+	.creat-shop {
+		color: #1890ff;
+		font-size: 12px;
+	}
+</style>

src/views/AppBase/ladder/ladderList.vue

@@ -1,66 +1,32 @@
 <template>
 	<ContainerQuery>
-		<div slot="more">
-			<el-form inline size="small">
-				<el-form-item>
-					<el-input v-model="searchKey" style="width: 220px" placeholder="股东名称/股东ID" clearable
-						@keyup.enter.native="pageChange(1)" @clear="pageChange(1)">
-						<el-button slot="append" @click="pageChange(1)">
-							<i class="el-icon-search"></i>
-						</el-button>
-					</el-input>
-				</el-form-item>
-				<el-form-item label="股份类型">
-					<el-select v-model="searchType" placeholder="股份类型" style="width: 150px" clearable
-						@change="pageChange(1)">
-						<el-option label="全部" value=""></el-option>
-						<el-option label="原始股份" :value="1"></el-option>
-						<el-option label="分红股份" :value="2"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="查询月份">
-					<el-date-picker v-model="time" clearable type="month" end-placeholder="选择月份" @change="pageChange(1)">
-					</el-date-picker>
-				</el-form-item>
-			</el-form>
+		<div slot="left">
+			<el-button size="small" type="primary" @click="openModel">
+				新增阶梯奖励
+			</el-button>
+			<el-button size="small" type="primary" @click="openStaffStockList">
+				股权发放记录
+			</el-button>
 		</div>
-		<!--    表格-->
+
 		<div class="table">
 			<el-table :data="tableData" style="width: 100%" type="index">
-				<el-table-column prop="goods" label="股东" width="180">
-					<template slot-scope="scope">
-						{{ scope.row.name }}<br />
-						ID:{{ scope.row.hol_id}}
-					</template>
-				</el-table-column>
-				<el-table-column prop="originNo" label="股份类型" width="180">
-					<template slot-scope="scope">
-						<span :class="{'success-status': scope.row.type === 1,'danger-status': scope.row.type === 2}">
-							{{ scope.row.type === 1 ? "原始股份" : "分红股份" }}
-						</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="shares" label="我的分红">
-					<template slot-scope="scope">
-						持有股份：{{scope.row.shares}}<br/>
-						分红奖金：{{scope.row.number}}<br/>
-					</template>
+				<el-table-column prop="name" label="奖励">
 				</el-table-column>
-				<el-table-column prop="number" label="股份奖池">
-					<template slot-scope="scope">
-						分红总金额：{{scope.row.total}}<br/>
-						分红总股份：{{scope.row.total_shares}}<br/>
-					</template>
+				<el-table-column prop="number" label="业绩">
 				</el-table-column>
-				<el-table-column prop="before" label="金额变动">
-					<template slot-scope="scope">
-						分红前：{{scope.row.before}}<br/>
-						分红后：{{scope.row.after}}<br/>
-					</template>
+				<el-table-column prop="stock" label="奖励股权">
 				</el-table-column>
-				<el-table-column prop="createTime" label="分红时间">
+				<el-table-column label="操作" width="130" fixed="right" header->
 					<template slot-scope="scope">
-						{{ $_common.formatDate(scope.row.createTime,'yyyy-MM-dd') }}
+						<el-button type="text"
+							@click="editOpenModel(scope.row.id)">
+							编辑
+						</el-button>
+						<el-button type="text"
+							@click="del(scope.row.id)">
+							删除
+						</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -68,23 +34,28 @@
 		<!--    分页查询-->
 		<FooterPage :page-size="pageSize" :total-page.sync="total" :current-page.sync="page" @pageChange="pageChange"
 			@sizeChange="sizeChange"></FooterPage>
+			<AddLadder v-if="showLadder" :id="ladderId" :is-edit="isEdit" :visible="showLadder" @close="showLadder = false" @confirm="Confirm"></AddLadder>
 	</ContainerQuery>
 </template>
 <script>
 	import {
-		holdersBonusList
-	} from "@/api/Holders";
-
+		StaffLadderList,
+		StaffLadderDelete
+	} from "@/api/Department";
+	import AddLadder from "./components/addLadder";
 	export default {
-		name: "ABonus",
+		name: "LadderList",
+		components: {
+			AddLadder
+		},
 		data() {
 			return {
-				// 查询的时间
-				time:'',
-				state: "状态",
-				searchType: '',//1原始股份2分红股份
-				searchKey: '',
-				searchPm:'',//1增加2减少
+				// actionid
+				ladderId:'',
+				// 添加阶梯奖励
+				showLadder:false,
+				// 是否为修改
+				isEdit:false,
 				total: 0,
 				page: 1,
 				pageSize: 10,
@@ -92,21 +63,55 @@
 			};
 		},
 		created() {
-			this.holdersBonusList();
+			this.StaffLadderList();
 		},
 		activated() {
 			if (this.$_isInit()) return;
-			this.holdersBonusList();
+			this.StaffLadderList();
 		},
 		methods: {
-			async holdersBonusList() {
+			// 打开发放股权记录
+			openStaffStockList(){
+				this.$router.push(`/ladder/staffStockList`);
+			},
+			// 删除
+			del(id){
+				this.$confirm("你确定删除阶梯奖励吗?", {
+					confirmButtonText: "确定",
+					cancelButtonText: "取消",
+					type: "warning",
+				}).then(async () => {
+					const data = await StaffLadderDelete({
+						id: id
+					});
+					this.StaffLadderList();
+					this.$message({
+						type: "success",
+						message: "删除成功!",
+					});
+				});
+			},
+			// 打开添加弹窗
+			openModel(){
+				this.ladderId = '';
+				this.isEdit = false;
+				this.showLadder = true;
+			},
+			// 
+			editOpenModel(id){
+				this.ladderId = id;
+				this.isEdit = true;
+				this.showLadder = true;
+			},
+			// 添加提交完成
+			Confirm(){
+				this.StaffLadderList();
+			},
+			async StaffLadderList() {
 				const {
 					data,
 					pageTotal
-				} = await holdersBonusList({
-					name: this.searchKey,
-					start_time: this.$_common.formatDate(new Date( this.time).getTime(),"yyyy-MM-dd") ,
-					type: this.searchType,
+				} = await StaffLadderList({
 					page: this.page,
 					pageSize: this.pageSize,
 				});
@@ -115,7 +120,7 @@
 			},
 			pageChange(page) {
 				this.page = page;
-				this.holdersBonusList();
+				this.StaffLadderList();
 			},
 			// 每页数据大小改变
 			sizeChange(val) {

src/views/AppBase/ladder/staffStockList.vue

@@ -0,0 +1,149 @@
+<template>
+	<ContainerQuery>
+		<el-form slot="more" size="small" :inline="true">
+			<el-form-item>
+				<el-input v-model="staffName" style="width: 220px" placeholder="员工名称/ID" clearable
+					@keyup.enter.native="pageChange(1)" @clear="pageChange(1)">
+					<el-button slot="append" @click="pageChange(1)">
+						<i class="el-icon-search"></i>
+					</el-button>
+				</el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-select v-model="pm" filterable placeholder="上下架" @change="pageChange(1)">
+					<el-option label="全部" value=""></el-option>
+					<el-option label="增加" :value="1"></el-option>
+					<el-option label="减少" :value="2"></el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item>
+				<el-date-picker v-model="searchTime" type="daterange" align="right" unlink-panels range-separator="至"
+					start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" @change='changeTime'>
+				</el-date-picker>
+			</el-form-item>
+		</el-form>
+		<div class="table">
+			<el-table :data="tableData" style="width: 100%" type="index">
+				<el-table-column prop="staffName" label="员工">
+					<template slot-scope="scope">
+						{{scope.row.staffName}}<br>
+						ID:{{scope.row.staff_id}}
+					</template>
+				</el-table-column>
+
+				<el-table-column prop="amount" label="股权变动">
+					<template slot-scope="scope">
+						<span :class="[
+				  scope.row.pm === 1 ? 'success-status' : 'danger-status',
+				]">
+							{{ scope.row.pm === 1 ? "+" : "-" }}{{ scope.row.number }}
+						</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="before" label="变动前">
+				</el-table-column>
+				<el-table-column prop="after" label="变动后">
+				</el-table-column>
+				<el-table-column prop="mark" label="说明">
+				</el-table-column>
+				<el-table-column prop="createTime" label="发放时间">
+					<template slot-scope="scope">
+						{{ $_common.formatDate(scope.row.createTime,'yyyy-MM-dd') }}
+					</template>
+				</el-table-column>
+			</el-table>
+		</div>
+		<!--    分页查询-->
+		<FooterPage :page-size="pageSize" :total-page.sync="total" :current-page.sync="page" @pageChange="pageChange"
+			@sizeChange="sizeChange"></FooterPage>
+	</ContainerQuery>
+</template>
+<script>
+	import {
+		StaffStockList,
+	} from "@/api/Department";
+	export default {
+		name: "LadderList",
+		data() {
+			return {
+				// 筛选的时间范围
+				searchTime:'',
+				"start_time": "",
+				"end_time": "",
+				staffName: '',
+				"pm": '', //1增加2减少
+				total: 0,
+				page: 1,
+				pageSize: 10,
+				tableData: [],
+				pickerOptions: {
+					shortcuts: [{
+						text: '最近一周',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近一个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近三个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+				   picker.$emit('pick', [start, end]);
+						}
+					}]
+				},
+			};
+		},
+		created() {
+			this.StaffStockList();
+		},
+		activated() {
+			if (this.$_isInit()) return;
+			this.StaffStockList();
+		},
+		methods: {
+			// 查询时间范围修改
+			changeTime(val){
+				this.start_time = this.$_common.formatDate(val[0].getTime())
+				this.end_time = this.$_common.formatDate(val[1].getTime())
+				this.pageChange(1)
+			},
+			async StaffStockList() {
+				const {
+					data,
+					pageTotal
+				} = await StaffStockList({
+					"start_time": this.start_time,
+					"end_time": this.end_time,
+					staffName: this.staffName,
+					"pm": this.pm, //1增加2减少
+					page: this.page,
+					pageSize: this.pageSize,
+				});
+				this.tableData = data;
+				this.total = pageTotal;
+			},
+			pageChange(page) {
+				this.page = page;
+				this.StaffStockList();
+			},
+			// 每页数据大小改变
+			sizeChange(val) {
+				this.pageSize = val;
+				this.pageChange(1);
+			},
+		},
+	};
+</script>
+<style></style>

src/views/SingleStore/subscribe/OrderSubscribe.vue

@@ -10,7 +10,7 @@
 				</el-input>
 			</el-form-item>
 			<el-form-item>
-				<el-select v-model="is_show" filterable placeholder="上下架" @change="(page = 1,getSubscribeList())">
+				<el-select v-model="is_show" filterable placeholder="上下架" @change="pageChange(1)">
 					<el-option label="全部" value=""></el-option>
 					<el-option label="待支付" :value="1"></el-option>
 					<el-option label="已支付" :value="2"></el-option>

src/views/SystemSettings/accountAdmin/Staff.vue

@@ -1,229 +1,171 @@
 <template>
-  <ContainerQuery>
-    <el-form slot="more" size="small" :inline="true">
-      <el-form-item>
-        <el-input
-          v-model="search_key"
-          placeholder="员工姓名"
-          clearable
-          style="width: 220px"
-          @keyup.enter.native="pageChange(1)"
-          @clear="pageChange(1)"
-        >
-          <el-button
-            slot="append"
-            icon="el-icon-search"
-            @click="pageChange(1)"
-          ></el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item>
-       <DepartmentSel
-          v-model="departmentPidPath"
-          width="150"
-          clearable
-          @change="departmentChange"
-        />
-      </el-form-item>
-      <el-form-item>
-       <RoleSelect
-          v-model="rolePidPath"
-          width="150"
-          clearable
-          @change="roleChange"
-        />
-      </el-form-item>
-    </el-form>
-    <el-button
-      v-if="$accessCheck($Access.StaffAddStaff)"
-      slot="left"
-      size="small"
-      type="primary"
-      @click="openModel"
-    >
-      新增成员
-    </el-button>
+	<ContainerQuery>
+		<el-form slot="more" size="small" :inline="true">
+			<el-form-item>
+				<el-input v-model="search_key" placeholder="员工姓名" clearable style="width: 220px"
+					@keyup.enter.native="pageChange(1)" @clear="pageChange(1)">
+					<el-button slot="append" icon="el-icon-search" @click="pageChange(1)"></el-button>
+				</el-input>
+			</el-form-item>
+			<el-form-item>
+				<DepartmentSel v-model="departmentPidPath" width="150" clearable @change="departmentChange" />
+			</el-form-item>
+			<el-form-item>
+				<RoleSelect v-model="rolePidPath" width="150" clearable @change="roleChange" />
+			</el-form-item>
+		</el-form>
+		<el-button v-if="$accessCheck($Access.StaffAddStaff)" slot="left" size="small" type="primary"
+			@click="openModel">
+			新增成员
+		</el-button>
 
-    <el-table size="small" :data="tableData">
-      <el-table-column prop="id" label="工号" min-width="100"></el-table-column>
-      <el-table-column
-        prop="staffCode"
-        label="员工编码"
-        min-width="100"
-      ></el-table-column>
-      <el-table-column
-        prop="staffName"
-        label="姓名"
-        min-width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="mobile"
-        label="电话"
-        min-width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="departmentName"
-        label="所属部门"
-        min-width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="roleName"
-        label="角色"
-        min-width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="shopName"
-        label="归属商铺"
-        min-width="180"
-      ></el-table-column>
-      <el-table-column label="操作" min-width="130" fixed="right" header->
-        <template slot-scope="scope">
-          <el-button
-            v-if="$accessCheck($Access.DepartmentUpdateDepartment)"
-            type="text"
-            @click="openEditModel(scope.row.id)"
-          >
-            编辑
-          </el-button>
-          <el-button
-            v-if="$accessCheck($Access.DepartmentDeleteDepartment)"
-            type="text"
-            @click="del(scope.row.id)"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <FooterPage
-      :page-size="page_size"
-      :total-page="total_count"
-      :current-page="page"
-      @pageChange="pageChange"
-      @sizeChange="sizeChange"
-    />
-    <!--   新增员工-->
-    <AddStaff
-      v-if="add_staff"
-      :id="staff_id"
-      :is-edit="isEdit"
-      :visible="add_staff"
-      @close="add_staff = false"
-      @confirm="staffConfirm"
-    ></AddStaff>
-  </ContainerQuery>
+		<el-table size="small" :data="tableData">
+			<el-table-column prop="id" label="工号" min-width="100"></el-table-column>
+			<el-table-column prop="staffCode" label="员工编码" min-width="120"></el-table-column>
+			<el-table-column prop="staffName" label="姓名" min-width="180"></el-table-column>
+			<el-table-column prop="mobile" label="电话" min-width="180"></el-table-column>
+			<el-table-column prop="departmentName" label="所属部门" min-width="180"></el-table-column>
+			<el-table-column prop="roleName" label="角色" min-width="180"></el-table-column>
+			<el-table-column prop="shopName" label="归属商铺" min-width="180"></el-table-column>
+			<el-table-column prop="cumulative_stock_right" label="累计股权" min-width="100"></el-table-column>
+			<el-table-column prop="use_stock" label="可使用股权" min-width="100"></el-table-column>
+			<el-table-column prop="used_stock" label="已使用股权" min-width="100"></el-table-column>
+			<el-table-column label="操作" min-width="130" fixed="right" header->
+				<template slot-scope="scope">
+					<el-button v-if="$accessCheck($Access.DepartmentUpdateDepartment)" type="text"
+						@click="openEditModel(scope.row.id)">
+						编辑
+					</el-button>
+					<el-button v-if="$accessCheck($Access.DepartmentDeleteDepartment)" type="text"
+						@click="del(scope.row.id)">
+						删除
+					</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<FooterPage :page-size="page_size" :total-page="total_count" :current-page="page" @pageChange="pageChange"
+			@sizeChange="sizeChange" />
+		<!--   新增员工-->
+		<AddStaff v-if="add_staff" :id="staff_id" :is-edit="isEdit" :visible="add_staff" @close="add_staff = false"
+			@confirm="staffConfirm"></AddStaff>
+	</ContainerQuery>
 </template>
 
 <script>
-  import { getAllStaff, deleteStaff } from "@/api/Department";
-  import AddStaff from "@/component/SystemSettings/AddStaff.vue";
-  import DepartmentSel from "@/component/common/DepartmentSel";
-  import RoleSelect from "../../../component/common/RoleSelect";
-  export default {
-    name: "Department",
-    components: {
-      RoleSelect,
-      DepartmentSel,
-      AddStaff,
-    },
-    data() {
-      return {
-        roleId: "",
-        search_key: "",
-        departmentId: "",
-        staff_id: 0,
-        total_count: 0,
-        page: 1,
-        page_size: 10,
-        pageTotal: 0,
-        add_staff: false,
-        id: "",
-        isEdit: false,
-        tableData: [],
-        departmentPidPath: [],
-        rolePidPath: [],
-        searchForm: {
-          region: "",
-          role: "",
-        },
-      };
-    },
-    created() {
-      this.getAllStaff();
-    },
-    activated() {
-      if (this.$_isInit()) return;
-      this.getAllStaff();
-    },
-    methods: {
-      //  选择角色
-      roleChange(val) {
-        this.roleId = val[val.length - 1];
-        this.departmentPidPath = val.join(",");
-		console.log( this.departmentPidPath,'ar');
-        this.page = 1;
-        this.getAllStaff();
-      },
-      // 选择部门
-      departmentChange(val) {
-        this.departmentId = val[val.length - 1];
-        this.departmentPidPath = val.join(",");
-        this.pageChange(1);
-      },
-      staffConfirm() {
-        this.getAllStaff();
-      },
-      //  获取列表
-      async getAllStaff() {
-        const data = await getAllStaff({
-          page: this.page,
-          pageSize: this.page_size,
-          departmentId: this.departmentId,
-          keyword: this.search_key,
-          roleId: this.roleId,
-        });
+	import {
+		getAllStaff,
+		deleteStaff
+	} from "@/api/Department";
+	import AddStaff from "@/component/SystemSettings/AddStaff.vue";
+	import DepartmentSel from "@/component/common/DepartmentSel";
+	import RoleSelect from "../../../component/common/RoleSelect";
+	export default {
+		name: "Department",
+		components: {
+			RoleSelect,
+			DepartmentSel,
+			AddStaff,
+		},
+		data() {
+			return {
+				roleId: "",
+				search_key: "",
+				departmentId: "",
+				staff_id: 0,
+				total_count: 0,
+				page: 1,
+				page_size: 10,
+				pageTotal: 0,
+				add_staff: false,
+				id: "",
+				isEdit: false,
+				tableData: [],
+				departmentPidPath: [],
+				rolePidPath: [],
+				searchForm: {
+					region: "",
+					role: "",
+				},
+			};
+		},
+		created() {
+			this.getAllStaff();
+		},
+		activated() {
+			if (this.$_isInit()) return;
+			this.getAllStaff();
+		},
+		methods: {
+			//  选择角色
+			roleChange(val) {
+				this.roleId = val[val.length - 1];
+				this.departmentPidPath = val.join(",");
+				console.log(this.departmentPidPath, 'ar');
+				this.page = 1;
+				this.getAllStaff();
+			},
+			// 选择部门
+			departmentChange(val) {
+				this.departmentId = val[val.length - 1];
+				this.departmentPidPath = val.join(",");
+				this.pageChange(1);
+			},
+			staffConfirm() {
+				this.getAllStaff();
+			},
+			//  获取列表
+			async getAllStaff() {
+				const data = await getAllStaff({
+					page: this.page,
+					pageSize: this.page_size,
+					departmentId: this.departmentId,
+					keyword: this.search_key,
+					roleId: this.roleId,
+				});
 
-        this.tableData = data.data;
-        this.total_count = data.pageTotal;
-      },
-      // 删除用户
-      del(id) {
-        this.$confirm("你确定删除此员工吗?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }).then(async () => {
-          const data = await deleteStaff({ id: [id] });
+				this.tableData = data.data;
+				this.total_count = data.pageTotal;
+			},
+			// 删除用户
+			del(id) {
+				this.$confirm("你确定删除此员工吗?", {
+					confirmButtonText: "确定",
+					cancelButtonText: "取消",
+					type: "warning",
+				}).then(async () => {
+					const data = await deleteStaff({
+						id: [id]
+					});
 
-          this.getAllStaff();
-          this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
-        });
-      },
+					this.getAllStaff();
+					this.$message({
+						type: "success",
+						message: "删除成功!",
+					});
+				});
+			},
 
-      pageChange(page) {
-        this.page = page;
-        this.getAllStaff();
-      },
-      sizeChange(size) {
-        this.page_size = size;
-        this.pageChange(1);
-      },
-      //  编辑员工
-      openEditModel(id) {
-        this.staff_id = id;
-        this.isEdit = true;
-        this.add_staff = true;
-      },
-      openModel() {
-        this.staff_id = 0;
-        this.isEdit = false;
-        this.add_staff = true;
-      },
-    },
-  };
+			pageChange(page) {
+				this.page = page;
+				this.getAllStaff();
+			},
+			sizeChange(size) {
+				this.page_size = size;
+				this.pageChange(1);
+			},
+			//  编辑员工
+			openEditModel(id) {
+				this.staff_id = id;
+				this.isEdit = true;
+				this.add_staff = true;
+			},
+			openModel() {
+				this.staff_id = 0;
+				this.isEdit = false;
+				this.add_staff = true;
+			},
+		},
+	};
 </script>
 
 <style scoped></style>