user-serve

src/pages/agent/global/index.vue

@@ -300,7 +300,7 @@
 					title: tit,
 					num: num,
 					url: `user/global/delete`,
-					method: "DELETE",
+					method: "post",
 					ids: {
 						id: row.id
 					},

src/pages/store/department/create.vue

@@ -27,7 +27,14 @@
 						clearable @change="changeBm"></el-cascader>
 				</FormItem>
 				<FormItem label="部门领导">
-					<Input v-model="formData.department_leader" v-width="320" placeholder="请输入部门名称"></Input>
+					<el-cascader placeholder="请选择部门领导" :options="staffList" :value="formData.department_leader"
+						v-width="320" :props="{ checkStrictly: true,value: 'id',label: 'name' }"
+						clearable @change="changeLeader"></el-cascader>
+				</FormItem>
+				<!-- leader_commission -->
+				<FormItem label="领导提成比例(%)">
+					<InputNumber v-model="formData.leader_commission" v-width="320"></InputNumber>
+					</InputNumber>
 				</FormItem>
 				<FormItem label="排序">
 					<InputNumber v-model="formData.srot" v-width="320"></InputNumber>
@@ -61,7 +68,8 @@
 	import {
 		getDepartmentList,
 		addDepartment,
-		editDepartment
+		editDepartment,
+		getYgList
 	} from '@/api/store'
 	// import { formatDate } from '@/utils/validate';
 	import Setting from "@/setting";
@@ -82,7 +90,8 @@
 					name_en: '',
 					department_leader: '',
 					srot: 0,
-					parentid: 1
+					parentid: 1,
+					leader_commission: 0
 				},
 				isMinPrice: 0,
 				isCouponTime: 1,
@@ -93,6 +102,7 @@
 				storeModals: false,
 				currentTab: '1',
 				departmentList: [],
+				staffList: []
 			};
 		},
 		computed: {
@@ -100,6 +110,7 @@
 		},
 		created() {
 			// 获取部门列表
+			this.getStaffList()
 			this.getDepartmentList()
 			if (this.$route.query.id) {
 				let data = this.$route.query
@@ -107,10 +118,11 @@
 					id: data.id*1,
 					name: data.name,
 					name_en: data.name_en,
-					department_leader: data.department_leader,
+					department_leader: data.department_leader*1,
 					srot: data.srot,
 					parentid: data.parentid*1,
-					department_id: data.department_id*1
+					department_id: data.department_id*1,
+					leader_commission: data.leader_commission ? data.leader_commission*1 : 0
 				}
 
 				// this.getCouponDetail();
@@ -121,12 +133,25 @@
 				console.log(res);
 				this.formData.parentid = res[res.length -1 ]
 			},
+			changeLeader(res) {
+				console.log(res)
+				this.formData.department_leader = res[res.length -1 ]
+				console.log(this.formData.department_leader)
+			},
 			getDepartmentList() {
 				getDepartmentList().then(res => {
 					console.log(res);
 					this.departmentList = res.data
 				})
 			},
+			getStaffList() {
+				getYgList({
+					page: 1,
+					limit: 1000
+				}).then(res => {
+					this.staffList = res.data.list
+				})
+			},
 			downTab() {
 				if (!this.formData.name) {
 					return this.$Message.error("请输入部门名称");

src/pages/store/department/index.vue

@@ -40,12 +40,15 @@
 				:tree-config="{ children: 'children',reserve:true }" :data="tableData">
 				<vxe-table-column field="department_id" title="ID" tooltip max-width="70"></vxe-table-column>
 				<vxe-table-column field="name" tree-node title="部门名称" min-width="200"></vxe-table-column>
-				<vxe-table-column
-		  field="srot"
-		  tree-node
-		  title="排序"
-		  min-width="200"
-		></vxe-table-column>
+				<vxe-table-column field="department_leader" tree-node title="领导" min-width="200">
+					<template v-slot="{row}">
+						{{showLeader(row.department_leader)}}
+					</template>
+				</vxe-table-column>
+				<vxe-table-column field="leader_commission" tree-node title="提成比例" min-width="200">
+					
+				</vxe-table-column>
+				<vxe-table-column field="srot" tree-node title="排序" min-width="200"></vxe-table-column>
 				<!-- <vxe-table-column field="api_url" title="接口路径" min-width="150">
           <template v-slot="{ row }">
             <span>{{
@@ -106,10 +109,11 @@
 	} from "@/api/systemMenus";
 	import {
 		getDepartmentList,
-		delDepartment
+		delDepartment,
+		getYgList
 	} from "@/api/store"
 	import formCreate from "@form-create/iview";
-		import Setting from "@/setting";
+	import Setting from "@/setting";
 	export default {
 		name: "systemMenus",
 		data() {
@@ -134,6 +138,7 @@
 				formValidate: {},
 				titleFrom: "",
 				modalTitleSs: "",
+				staffList: []
 			};
 		},
 		components: {
@@ -151,8 +156,27 @@
 		mounted() {
 			// this.formValidate.auth_type = '1';
 			this.getData();
+			this.getStaffList()
 		},
 		methods: {
+			getStaffList() {
+				getYgList({
+					page: 1,
+					limit: 1000
+				}).then(res => {
+					this.staffList = res.data.list
+				})
+			},
+			showLeader(id) {
+				let leader = this.staffList.find(item => {
+					return item.id == id
+				})
+				if(leader) {
+					return leader.name
+				}else {
+					return ''
+				}
+			},
 			// 修改规则状态
 			onchangeIsShow(row) {
 				let data = {
@@ -213,7 +237,10 @@
 			// 编辑
 			edit(row, title, index) {
 				this.$router.push({
-					path: this.roterPre + "/store/department/create?id=" + row.id + '&name=' + row.name + '&name_en=' + row.name_en + '&srot=' + row.srot + '&department_leader=' + row.department_leader + '&parentid=' + row.parentid + '&department_id=' + row.department_id
+					path: this.roterPre + "/store/department/create?id=" + row.id + '&name=' + row.name +
+						'&name_en=' + row.name_en + '&srot=' + row.srot + '&department_leader=' + row
+						.department_leader + '&parentid=' + row.parentid + '&department_id=' + row.department_id +
+						'&leader_commission=' + row.leader_commission
 				});
 			},
 			// 添加