Skip to content

C
confucius
Commit 484dcace authored by Mac's avatar Mac
Browse files
Options

修改

parent 8e6960a4
Hide whitespace changes
Inline Side-by-side
Showing with 220 additions and 93 deletions
src/api/finance/index.js
View file @ 484dcace
...@@ -595,6 +595,16 @@ export function getTeacherContributeConfig(data) { ...@@ -595,6 +595,16 @@ export function getTeacherContributeConfig(data) {
data data
}); });
} }
/**
* 市场顾问保存删除
*/
export function delSellAchievementsRule(data) {
return request({
url: '/SellAchievements/DelSellAchievementsRule',
method: 'post',
data
});
}
/** /**
* 获取人头奖金配置分页列表 * 获取人头奖金配置分页列表
......
src/components/finance/marketCommissionfrom.vue
View file @ 484dcace
...@@ -39,6 +39,18 @@ ...@@ -39,6 +39,18 @@
map-options map-options
@input="$forceUpdate()" @input="$forceUpdate()"
/> />
<div style="display: flex;align-items: center;">
<span style="width: 75px;">类型：</span>
<q-radio v-model="addMsg.Type" val="1" label="市场" />
<q-radio v-model="addMsg.Type" val="2" label="顾问" />
<q-radio v-model="addMsg.Type" val="3" label="教师" />
</div>
<div style="display: flex;align-items: center;">
<span style="width: 75px;">课程类型：</span>
<q-radio v-model="addMsg.CourseType" val="1" label="包含" />
<q-radio v-model="addMsg.CourseType" val="2" label="不包含" />
</div>
<q-select <q-select
filled filled
stack-label stack-label
...@@ -56,17 +68,6 @@ ...@@ -56,17 +68,6 @@
map-options map-options
@filter="filterFn" @filter="filterFn"
/> />
<div style="display: flex;align-items: center;">
<span style="width: 75px;">类型：</span>
<q-radio v-model="addMsg.Type" val="1" label="市场" />
<q-radio v-model="addMsg.Type" val="2" label="顾问" />
<q-radio v-model="addMsg.Type" val="3" label="教师" />
</div>
<div style="display: flex;align-items: center;">
<span style="width: 75px;">课程类型：</span>
<q-radio v-model="addMsg.CourseType" val="1" label="包含" />
<q-radio v-model="addMsg.CourseType" val="2" label="不包含" />
</div>
<div style="margin-top: 10px;" > <div style="margin-top: 10px;" >
...@@ -99,41 +100,57 @@ ...@@ -99,41 +100,57 @@
/> />
</div> </div>
<div style="display: flex;align-items: center;margin-bottom: 15px;">
<q-select
filled
stack-label
option-value="Id"
option-label="EmployeeName"
v-model="addMsg.EmpList"
use-chips
use-input
:options="myEmployeeList"
label="提成人员"
:dense="false"
emit-value
multiple
map-options
@filter="filterEmployee"
style="flex:1;"
@input='getpersonnel(1)'
/>
<div class="q-gutter-sm" style="margin-right: 18px;">
<q-checkbox v-model="personnel" label="全选" @input='getallpersonnel(1)'/>
</div>
</div>
<div style="display: flex;align-items: center;margin-bottom: 15px;">
<q-select
filled
stack-label
option-value="Id"
option-label="EmployeeName"
v-model="addMsg.ChildEmpList"
use-chips
use-input
:options="myEmployeeList"
label="部门人员"
:dense="false"
emit-value
multiple
map-options
@filter="filterEmployee"
style="flex:1;"
@input='getpersonnel(2)'
/>
<div class="q-gutter-sm" style="margin-right: 18px;">
<q-checkbox v-model="branch" label="全选" @input='getallpersonnel(2)'/>
</div>
</div>
<q-select
filled
stack-label
option-value="Id"
option-label="EmployeeName"
v-model="addMsg.EmpList"
use-chips
use-input
:options="myEmployeeList"
label="提成人员"
:dense="false"
class="col-6 q-pr-lg q-pb-lg"
emit-value
multiple
map-options
@filter="filterEmployee"
/>
<q-select
filled
stack-label
option-value="Id"
option-label="EmployeeName"
v-model="addMsg.ChildEmpList"
use-chips
use-input
:options="myEmployeeList"
label="部门人员"
:dense="false"
class="col-6 q-pr-lg q-pb-lg"
emit-value
multiple
map-options
@filter="filterEmployee"
/>
<div style="margin-bottom: 80px;"> <div style="margin-bottom: 80px;">
<div>业绩比例</div> <div>业绩比例</div>
...@@ -206,10 +223,7 @@ ...@@ -206,10 +223,7 @@
</q-dialog> </q-dialog>
</template> </template>
<script> <script>
import {
queryEmployee
} from '../../api/users/user'
import recruitFormVue from '../system/recruit-form.vue'
export default { export default {
...@@ -251,6 +265,8 @@ export default { ...@@ -251,6 +265,8 @@ export default {
myEmployeeList: [], myEmployeeList: [],
allCourseList: [], allCourseList: [],
myCourseList:[], myCourseList:[],
personnel:false,//人员全选
branch:false,//部门人员
} }
}, },
created() { created() {
...@@ -264,7 +280,7 @@ export default { ...@@ -264,7 +280,7 @@ export default {
Name: '', Name: '',
Type: '1', Type: '1',
CourseType: '1', CourseType: '1',
SchoolIds: '', SchoolIds: [],
CourseList: [],//课程列表 CourseList: [],//课程列表
EmpList: [],//提现人员 EmpList: [],//提现人员
ChildEmpList: [],//部门人员 ChildEmpList: [],//部门人员
...@@ -279,11 +295,9 @@ export default { ...@@ -279,11 +295,9 @@ export default {
this.addMsg.Type = this.addMsg.Type.toString() this.addMsg.Type = this.addMsg.Type.toString()
this.addMsg.CourseType = this.addMsg.CourseType.toString() this.addMsg.CourseType = this.addMsg.CourseType.toString()
this.addMsg.SchoolIds = this.selectData.SchoolIds?this.selectData.SchoolIds.split(',').map(Number):[] ; this.addMsg.SchoolIds = this.selectData.SchoolIds?this.selectData.SchoolIds.split(',').map(Number):[] ;
console.log(this.addMsg.SchoolIds)
this.addMsg.CourseList = this.getId(this.selectData.CourseList,2) this.addMsg.CourseList = this.getId(this.selectData.CourseList,2)
this.addMsg.EmpList = this.getId(this.selectData.EmpList,3) this.addMsg.EmpList = this.getId(this.selectData.EmpList,3)
this.addMsg.ChildEmpList = this.getId(this.selectData.ChildEmpList,3) this.addMsg.ChildEmpList = this.getId(this.selectData.ChildEmpList,3)
console.log(this.addMsg)
} }
}, },
mounted() { mounted() {
...@@ -354,16 +368,7 @@ export default { ...@@ -354,16 +368,7 @@ export default {
}else{ }else{
msg.SchoolIds = this.addMsg.SchoolIds.join(',') msg.SchoolIds = this.addMsg.SchoolIds.join(',')
} }
if (this.addMsg.CourseList.length == 0) { msg.CourseList = this.getList(this.allCourseList,this.addMsg.CourseList,2,'CourseId','CourseName')//课程
this.$q.notify({
type: 'negative',
message: `请选择课程`,
position: 'top'
})
return
}else{
msg.CourseList = this.getList(this.allCourseList,this.addMsg.CourseList,2,'CourseId','CourseName')
}
if (this.addMsg.EmpList.length == 0) { if (this.addMsg.EmpList.length == 0) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -374,16 +379,7 @@ export default { ...@@ -374,16 +379,7 @@ export default {
}else{ }else{
msg.EmpList = this.getList(this.employeeList,this.addMsg.EmpList,3,) msg.EmpList = this.getList(this.employeeList,this.addMsg.EmpList,3,)
} }
if (this.addMsg.ChildEmpList.length == 0) { msg.ChildEmpList = this.getList(this.employeeList,this.addMsg.ChildEmpList,3,)//部门人员
this.$q.notify({
type: 'negative',
message: `请选择部门人员`,
position: 'top'
})
return
}else{
msg.ChildEmpList = this.getList(this.employeeList,this.addMsg.ChildEmpList,3,)
}
for(let i=0;i<msg.RateList.length;i++){ for(let i=0;i<msg.RateList.length;i++){
let x = msg.RateList[i] let x = msg.RateList[i]
console.log(x.StartValue) console.log(x.StartValue)
...@@ -443,7 +439,46 @@ export default { ...@@ -443,7 +439,46 @@ export default {
} }
}); });
return list return list
} },
getallpersonnel(type){
if(type==1){//人员全选
if(this.personnel== true){
this.addMsg.EmpList = []
this.myEmployeeList.forEach(x=>{
this.addMsg.EmpList.push(x.Id)
})
}else{
this.addMsg.EmpList = []
}
}else{//部门人员全选
if(this.branch== true){
this.addMsg.ChildEmpList = []
this.myEmployeeList.forEach(x=>{
this.addMsg.ChildEmpList.push(x.Id)
})
}else{
this.addMsg.ChildEmpList = []
}
}
},
getpersonnel(type){
if(type==1){//人员全选
if(this.addMsg.EmpList.length== this.myEmployeeList.length){
this.personnel=true
}else{
this.personnel=false
}
}else{//部门人员全选
if(this.addMsg.ChildEmpList.length== this.myEmployeeList.length){
this.branch=true
}else{
this.branch=false
}
}
},
......
src/pages/financial/market/commissionRule.vue
View file @ 484dcace
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<div class="cycle_Title">市场顾问提成规则</div> <div class="cycle_Title">市场顾问提成规则</div>
<div <div
class="cm_content" class="cm_content"
style="width: 100%;margin-bottom: 25px;margin-top: 10px;" style="width: 100%;margin-bottom: 35px;margin-top: 10px;"
v-for=" ( item , index ) in dataList " v-for=" ( item , index ) in dataList "
:key="index" :key="index"
> >
...@@ -60,15 +60,15 @@ ...@@ -60,15 +60,15 @@
> >
<tr> <tr>
<th width="8%">方案名称</th> <th width="8%">方案名称</th>
<th>类型</th> <th width="5%">类型</th>
<th width="200">校区</th> <th width="15%">校区</th>
<th>课程类型</th> <th width="5%">课程类型</th>
<th width="300">课程</th> <th width="25%">课程</th>
<th>首次发放比例</th> <th width="7%">首次发放比例</th>
<th>课程比例</th> <th width="5%">课程比例</th>
<th>提成人员</th> <th width="10%">提成人员</th>
<th>部门人员</th> <th width="10%">部门人员</th>
<th width="100">操作</th> <th width="10%">操作</th>
</tr> </tr>
<tr> <tr>
<td> <td>
...@@ -87,7 +87,18 @@ ...@@ -87,7 +87,18 @@
<span v-if="item.CourseType == 2">不包含</span> <span v-if="item.CourseType == 2">不包含</span>
</td> </td>
<td style="padding: 0 10px;"> <td style="padding: 0 10px;">
<span v-for="( son , sIndex ) in item.CourseList">{{ son.CourseName }}{{item.CourseList.length==sIndex+1?'':'、'}}</span> <span v-for="( son , sIndex ) in item.CourseList">
<span v-if="sIndex<4"> {{ son.CourseName }}{{item.CourseList.length==sIndex+1?'':'、'}}</span>
</span>
<el-popover
v-if="item.CourseList.length>=5"
placement="top-start"
title="课程"
width="400"
trigger="click"
:content="item.CourseListtext">
<el-button slot="reference" style="border: none;" type="text">查看更多</el-button>
</el-popover>
</td> </td>
<td> <td>
<span >{{ item.FirstRate + '%' }}</span> <span >{{ item.FirstRate + '%' }}</span>
...@@ -96,10 +107,32 @@ ...@@ -96,10 +107,32 @@
<span >{{ item.CourseRate + '%' }}</span> <span >{{ item.CourseRate + '%' }}</span>
</td> </td>
<td style="padding: 0 10px;"> <td style="padding: 0 10px;">
<span v-for="( son , sIndex ) in item.EmpList">{{ son.EmployeeName }}{{item.EmpList.length==sIndex+1?'':'、'}}</span> <span v-for="( son , sIndex ) in item.EmpList">
<span v-if="sIndex<8">{{ son.EmployeeName }}{{item.EmpList.length==sIndex+1?'':'、'}}</span>
</span>
<el-popover
v-if="item.EmpList.length>=9"
placement="top-start"
title="提成人员"
width="400"
trigger="click"
:content="item.EmpListtext">
<el-button slot="reference" style="border: none;" type="text">查看更多</el-button>
</el-popover>
</td> </td>
<td style="padding: 0 10px;"> <td style="padding: 0 10px;">
<span v-for="( son , sIndex ) in item.ChildEmpList">{{ son.EmployeeName }}{{item.ChildEmpList.length==sIndex+1?'':'、'}}</span> <span v-for="( son , sIndex ) in item.ChildEmpList">
<span v-if="sIndex<8">{{ son.EmployeeName }}{{item.ChildEmpList.length==sIndex+1?'':'、'}}</span>
</span>
<el-popover
v-if="item.ChildEmpList.length>=9"
placement="top-start"
title="部门人员"
width="400"
trigger="click"
:content="item.ChildEmpListtext">
<el-button slot="reference" style="border: none;" type="text">查看更多</el-button>
</el-popover>
</td> </td>
<td> <td>
<q-btn <q-btn
...@@ -118,7 +151,7 @@ ...@@ -118,7 +151,7 @@
color="negative" color="negative"
style="font-weight:400" style="font-weight:400"
label="删除" label="删除"
@click="RemoveTask(props.row.Id)" @click="RemoveTask(item.Id)"
/> />
</td> </td>
</tr> </tr>
...@@ -128,7 +161,6 @@ ...@@ -128,7 +161,6 @@
style="border:1px solid #E6E6E6;" style="border:1px solid #E6E6E6;"
cellspacing="0" cellspacing="0"
cellpadding="0" cellpadding="0"
v-loading="loading"
> >
<tr> <tr>
<th >业绩比例</th> <th >业绩比例</th>
...@@ -140,14 +172,13 @@ ...@@ -140,14 +172,13 @@
style="border:1px solid #E6E6E6;" style="border:1px solid #E6E6E6;"
cellspacing="0" cellspacing="0"
cellpadding="0" cellpadding="0"
v-loading="loading"
> >
<tr> <tr>
<th style="min-width: 260px;" <th style="min-width: 260px;"
v-for="( son , sIndex ) in item.RateList" v-for="( son , sIndex ) in item.RateList"
:key="sIndex" :key="sIndex"
>{{ son.StartValue }}{{ '<业绩<=' }}{{ son.EndValue }}</th> >{{ son.StartValue }} <span>{{son.EndValue && son.EndValue!=-1?'<业绩<=':'<业绩'}}</span><span v-if="son.EndValue && son.EndValue!=-1">{{ son.EndValue }}</span></th>
</tr> </tr>
<tr style="width: 1040px;overflow-x: auto;"> <tr style="width: 1040px;overflow-x: auto;">
<td style="min-width: 260px;" v-for="( son , sIndex ) in item.RateList" :key="sIndex">{{ son.Rate }}%</td> <td style="min-width: 260px;" v-for="( son , sIndex ) in item.RateList" :key="sIndex">{{ son.Rate }}%</td>
...@@ -188,7 +219,8 @@ import { ...@@ -188,7 +219,8 @@ import {
} from '../../../api/course/index' } from '../../../api/course/index'
import { import {
getSellAchievementsRuleList, getSellAchievementsRuleList,
setSellAchievementsRule setSellAchievementsRule,
delSellAchievementsRule
} from '../../../api/finance/index' } from '../../../api/finance/index'
import { import {
getSchoolDropdown, getSchoolDropdown,
...@@ -239,7 +271,30 @@ export default { ...@@ -239,7 +271,30 @@ export default {
this.loading = true; this.loading = true;
getSellAchievementsRuleList({}).then(res => { getSellAchievementsRuleList({}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.dataList = res.Data this.dataList = res.Data;
this.dataList.forEach(j=>{
if(j.ChildEmpList.length>=9){//人员
j.ChildEmpListtext = '';
j.ChildEmpList.forEach(x=>{
j.ChildEmpListtext = j.ChildEmpListtext+x.EmployeeName+'、'
})
}
if(j.EmpList.length>=9){//部门人员
j.EmpListtext = '';
j.EmpList.forEach(x=>{
j.EmpListtext = j.EmpListtext+x.EmployeeName+'、'
})
}
if(j.CourseList.length>=5){//课程
j.CourseListtext = '';
j.CourseList.forEach(x=>{
j.CourseListtext = j.CourseListtext+x.CourseName+'、'
})
}
})
} }
this.loading = false this.loading = false
}) })
...@@ -274,7 +329,6 @@ export default { ...@@ -274,7 +329,6 @@ export default {
refreshList(data) { //保存规则 refreshList(data) { //保存规则
console.log(this.dataList,'datalist')
setSellAchievementsRule(data).then(res => { setSellAchievementsRule(data).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.$q.notify({ this.$q.notify({
...@@ -302,6 +356,34 @@ export default { ...@@ -302,6 +356,34 @@ export default {
this.isAdd = false; this.isAdd = false;
}, },
RemoveTask(Id){//删除
let delMsg = {
RuleId: Id
};
this.$q.dialog({
title: '提示信息',
message: '是否确定删除？',
cancel: true,
persistent: true,
ok: "确定",
cancel: "取消",
}).onOk(() => {
delSellAchievementsRule(delMsg).then(res => {
if (res.Code == 1) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '删除成功！',
position: 'top'
})
this.getSellAchievementsRuleList();
}
})
}).onCancel(() => {
});
},
closeForm() { closeForm() {
this.persistent = false; this.persistent = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment