diff --git a/src/router/index.js b/src/router/index.js index e295e0d..7003ad8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -145,6 +145,8 @@ const mainRoutes = { { path: '/jjrData', component: _import('bl/commission/jjr/jjrData'), name: 'jjrData', meta: { title: '经纪人数据', isTab: true } }, { path: '/ywyConfig', component: _import('bl/commission/ywy/ywyConfig'), name: 'ywyConfig', meta: { title: '业务员设置', isTab: true } }, { path: '/ywyApply', component: _import('bl/commission/ywy/ywyApply'), name: 'ywyApply', meta: { title: '业务员审核', isTab: true } }, + { path: '/artificerAchievementIntegral', component: _import('bl/artificer/artificerAchievementIntegral'), name: 'artificerAchievementIntegral', meta: { title: '技师业绩积分关系列表', isTab: true } }, + { path: '/artificerPartitioningDetails', component: _import('bl/artificer/artificerPartitioningDetails'), name: 'artificerPartitioningDetails', meta: { title: '技师分成明细配置列表', isTab: true } }, ], beforeEnter(to, from, next) { let token = Vue.cookie.get('token') diff --git a/src/views/allocation/allocationList.vue b/src/views/allocation/allocationList.vue index 3c3f60a..821b3cd 100644 --- a/src/views/allocation/allocationList.vue +++ b/src/views/allocation/allocationList.vue @@ -313,40 +313,6 @@ - - -
-
请选择服务类型：
- - - -
- - - - - - - - - - - - - - - - - - - - - - @@ -576,37 +542,6 @@ 确 定 - - - - - - - - - - - - - - - - - - - - - - - - - -
- 取 消 - 确 定 -
- @@ -673,7 +608,6 @@ export default { dialogFormVisible1: false, tableDataLoading6: false, tableDataLoading: true, - dividedDialogFormVisible: false, formLabelWidth: '200px', form: { id: '', @@ -682,16 +616,6 @@ export default { value2: '', type: '', }, - dividedDetailsForm: { - id: "", - grade: "", - outstandingAchievement: "", - clockRate: "", - durationOnline: "", - integral: "", - proportionalSharing: "", - depositRate: "", - }, form2: { id: '', min: '', @@ -763,25 +687,6 @@ export default { let txts = value.split(splitTxt); return txts[index] || defTxt; }, - changeServerType() { - console.log(this.serverValue); - this.getDividedDetailsList(); - }, - getServer() { - this.$http({ - url: this.$http.adornUrl('sys/dict/list'), - method: 'get', - params: this.$http.adornParams({ - 'page': 1, - 'limit': 100, - 'parentId': 22, - }) - }).then(({ data }) => { - if (data && data.code === 0) { - this.serverList = data.page.list; - } - }) - }, //上传成功 handleAvatarSuccess(file) { this.form.value = file.data @@ -828,10 +733,6 @@ export default { } else if (tab._props.label == '图片配置') { this.condition = 'image' this.dataSelect() - } else if (tab._props.label == '分成明细配置') { - this.condition = 'fcmx'; - this.getDividedDetailsList(); - this.getServer(); } else if (tab._props.label == '出行配置-') { this.condition = 'chuxing' this.dataSelect() @@ -855,34 +756,6 @@ export default { this.dataSelect() } }, - getDividedDetailsList() { - this.tableDataLoading = true; - console.log(this.condition, "12312hhh"); - console.log(this.serverValue); - // if(!this.serverValue){ - // this.serverValue = '91' - // } - this.tableData = []; - this.$http({ - // type服务类型 1精油2中医推拿 - url: this.$http.adornUrl(`common/fcmx/` + (this.serverValue?this.serverValue:'91')), - method: 'get', - }).then(({ - data - }) => { - if (data && data.code === 0) { - this.tableDataLoading = false - data.data.forEach((item) => { - item.clockRate = (item.clockRate * 100) + "%"; - item.depositRate = (item.depositRate * 100) + "%"; - item.durationOnline = item.durationOnline + "分钟"; - item.proportionalSharing = (item.proportionalSharing * 100) + "%"; - }); - let returnData = data.data; - this.tableData = returnData; - } - }) - }, // 修改弹框 amend(index, rows) { this.dialogFormVisible = true; @@ -900,18 +773,6 @@ export default { this.form.value2 = [ this.getSplitOtherValue(rows.value,0), this.getSplitOtherValue(rows.value,1) ]; } }, - openDividedDialog(index, rows) { - console.log(this.tableData, "dwdwdw00"); - this.dividedDialogFormVisible = true; - this.dividedDetailsForm.id = rows.id; - this.dividedDetailsForm.grade = rows.grade; - this.dividedDetailsForm.outstandingAchievement = rows.outstandingAchievement; - this.dividedDetailsForm.clockRate = (rows.clockRate.substring(0, rows.clockRate.length - 1)) / 100; - this.dividedDetailsForm.durationOnline = rows.durationOnline.substring(0, rows.durationOnline.length - 2); - this.dividedDetailsForm.integral = rows.integral; - this.dividedDetailsForm.proportionalSharing = (rows.proportionalSharing.substring(0, rows.proportionalSharing.length - 1)) / 100; - this.dividedDetailsForm.depositRate = (rows.depositRate.substring(0, rows.depositRate.length - 1)) / 100; - }, // 修改 amendNoticeTo() { if (this.form.type == 330) { @@ -967,51 +828,6 @@ export default { } }) }, - //分成比例编辑提交 - dividedDetailsSubmit() { - let _this = this; - let paramsObj = { - id: this.dividedDetailsForm.id, - grade: this.dividedDetailsForm.grade, - outstandingAchievement: this.dividedDetailsForm.outstandingAchievement, - clockRate: this.dividedDetailsForm.clockRate, - durationOnline: this.dividedDetailsForm.durationOnline, - integral: this.dividedDetailsForm.integral, - proportionalSharing: this.dividedDetailsForm.proportionalSharing, - depositRate: this.dividedDetailsForm.depositRate, - } - // 编辑提交时提取value中的数值 - // paramsObj.clockRate = Number(paramsObj.clockRate.substring(0, paramsObj.clockRate.length - 1)); - // paramsObj.durationOnline = Number(paramsObj.durationOnline.substring(0, paramsObj.durationOnline.length - 2)); - // paramsObj.proportionalSharing = Number(paramsObj.proportionalSharing.substring(0, paramsObj.proportionalSharing.length - 1)); - this.$http({ - url: this.$http.adornUrl('common/fcmx/upd'), - method: 'POST', - data: this.$http.adornData(paramsObj) - }).then(({ - data - }) => { - if (data && data.code === 0) { - this.dividedDialogFormVisible = false; - this.$message({ - message: '操作成功', - type: 'success', - duration: 1500, - onClose: () => { - this.getDividedDetailsList(); - for (let item in this.dividedDetailsForm) { - this.dividedDetailsForm[item] = ""; - } - // if (this.form.type == 330) { - // this.amendNoticeToJw() - // } - } - }) - } else { - this.$message.error(data.msg) - } - }) - }, // 修改经纬度 amendNoticeToJw() { var values = this.latitude + ',' + this.longitude diff --git a/src/views/bl/artificer/artificerAchievementIntegral.vue b/src/views/bl/artificer/artificerAchievementIntegral.vue new file mode 100644 index 0000000..b6e7f84 --- /dev/null +++ b/src/views/bl/artificer/artificerAchievementIntegral.vue @@ -0,0 +1,379 @@ + + + + + diff --git a/src/views/bl/artificer/artificerPartitioningDetails.vue b/src/views/bl/artificer/artificerPartitioningDetails.vue new file mode 100644 index 0000000..30561ea --- /dev/null +++ b/src/views/bl/artificer/artificerPartitioningDetails.vue @@ -0,0 +1,420 @@ + + + + + diff --git a/src/views/bl/commission/jjr/jjrConfigLevel.vue b/src/views/bl/commission/jjr/jjrConfigLevel.vue index 1d2dcfc..9bc803e 100644 --- a/src/views/bl/commission/jjr/jjrConfigLevel.vue +++ b/src/views/bl/commission/jjr/jjrConfigLevel.vue @@ -1,6 +1,7 @@