Skip to content

C
confucius
Commit 64353acd authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

parents bbd25345 aa622f7b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 714 additions and 171 deletions
src/api/customerstudent/customerstudent.js
View file @ 64353acd
......@@ -222,3 +222,15 @@ export function ForwardStudent(data) {
data
})
}
/**
* 设置客户状态
* @param {JSON参数} data
*/
export function SetStuStage(data) {
return request({
url: '/User/SetStudentStage',
method: 'post',
data
})
}
\ No newline at end of file
src/components/school/student/student-genjin.vue
View file @ 64353acd
......@@ -5,11 +5,20 @@
<div>
<div class="row wrap">
<q-btn label="新增" color="accent q-mb-lg" size="sm" @click="isShowAdd=true" />
<q-btn label="取消" style="margin-left:20px;" v-if="isShowAdd" flat color="grey-10 q-mb-lg" size="sm" @click="isShowAdd=false" />
<q-btn label="取消" style="margin-left:20px;" v-if="isShowAdd" flat color="grey-10 q-mb-lg" size="sm"
@click="isShowAdd=false" />
</div>
<template v-if="isShowAdd">
<UeEditor v-if="isShowAdd" v-model="flowMsg.Remark" class="q-pb-lg" :config="config"></UeEditor>
<q-btn label="新增" color="accent q-mb-lg" size="md" @click="saveFlow()" />
<UeEditor v-if="isShowAdd" v-model="flowMsg.Remark" class="q-pb-sm" :config="config"></UeEditor>
<div class="row q-mb-lg flex justify-between items-center">
<q-select filled v-model="stuStageId" dense :options="cusStateList" option-label="Name" option-value="Id"
emit-value map-options label="客户状态" class="col-6" />
<div>
<q-btn label="保存" color="accent " size="md" @click="saveFlow()" />
</div>
</div>
</template>
<div style="display:flex;flex:1;flex-direction: column;overflow:hidden;">
<div class="TimeLineDiv">
......@@ -42,7 +51,8 @@
import {
queryStudentFollowPage, //获取到访列表
saveStudentFollow,
deleteStudentFollow
deleteStudentFollow,
SetStuStage
} from '../../../api/customerstudent/customerstudent';
export default {
......@@ -53,6 +63,14 @@
UeEditor
},
props: {
stateId:{
type:Number,
default:0
},
stateList: {
type: Array,
default: () => []
},
saveObj: {
type: Object,
default: null
......@@ -60,22 +78,25 @@
},
data() {
return {
isShowAdd:false,
isShowAdd: false,
config: {
initialFrameWidth: null,
initialFrameHeight: 90
},
flowMsg:{
StuId:0,
Remark:''
flowMsg: {
StuId: 0,
Remark: '',
stuState: 0,
},
msg: {
pageIndex: 1,
pageSize: 12,
StuId: 0
},
dataList:[],
page_Count:0
dataList: [],
page_Count: 0,
stuStageId:0,
cusStateList: [],
}
},
created() {
......@@ -86,12 +107,14 @@
},
mounted() {
this.stuStageId=this.stateId
this.cusStateList = this.stateList;
this.getList();
},
methods: {
//保存跟进
saveFlow() {
if(this.flowMsg.Remark==''){
if (this.flowMsg.Remark == '') {
this.$q.notify({
type: 'negative',
position: "top",
......@@ -115,8 +138,11 @@
}).catch(() => {
})
if(this.stuStageId??0>0){
this.setStuStage()
}
},
getList(){
getList() {
queryStudentFollowPage(this.msg).then(res => {
if (res.Code == 1) {
this.dataList = res.Data.PageData;
......@@ -127,16 +153,16 @@
})
},
//清除
clearMsg(){
this.flowMsg.Remark='';
clearMsg() {
this.flowMsg.Remark = '';
this.isShowAdd = false;
},
changePage(val){
changePage(val) {
this.msg.pageIndex = val;
this.getList();
},
//删除跟进
delFollow(Id){
delFollow(Id) {
let that = this
this.$q.dialog({
title: '提示信息',
......@@ -158,7 +184,16 @@
that.getList()
})
}).onCancel(() => {});
},
setStuStage(){
const msg={
StuId:this.saveObj.StuId,
StuStage:this.stuStageId,
}
SetStuStage(msg).then(res=>{
this.$emit('update')
})
},
},
}
......
src/components/school/student/student-left.vue
View file @ 64353acd
......@@ -328,6 +328,10 @@
},
props: {
stuData:{
type: Object,
default: null
},
saveObj: {
type: Object,
default: null
......@@ -406,13 +410,19 @@
this.getCustomTypeList();
this.getStudentDorpDown();
this.getGetNeedsList();
if (this.saveObj && this.saveObj.StuId > 0) {
this.customMsg.StuId = this.saveObj.StuId;
this.checkMsg.StuId = this.saveObj.StuId;
this.queryStuInfo();
}
},
watch:{
stuData(){
this.init();
}
},
mounted() {},
methods: {
//获取客户需求
getGetNeedsList(){
......@@ -646,12 +656,37 @@
);
});
},
queryStuInfo() {
getStudentInfo({
StuId: this.customMsg.StuId
}).then(res => {
if (res.Code == 1) {
var tempDate = res.Data;
// queryStuInfo() {
// getStudentInfo({
// StuId: this.customMsg.StuId
// }).then(res => {
// if (res.Code == 1) {
// var tempDate = res.Data;
// this.customObj.StuId = tempDate.StuId;
// this.customObj.StuName = tempDate.StuName;
// this.customObj.StuTel = tempDate.StuTel;
// this.customObj.CreateType = tempDate.CreateType;
// this.customObj.StuSourceId = tempDate.StuSourceId;
// this.customObj.StuChannel = tempDate.StuChannel;
// this.customObj.PlatformName = tempDate.PlatformName;
// this.customObj.StuSex = tempDate.StuSex;
// this.customObj.StuBirth = tempDate.StuBirth;
// this.customObj.StuStage = tempDate.StuStage;
// this.customObj.JapanBaseInfo = tempDate.JapanBaseInfo;
// this.customObj.StuProfession = tempDate.StuProfession;
// this.customObj.StuEducation = tempDate.StuEducation;
// this.customObj.StuPurpose = tempDate.StuPurpose;
// this.customObj.CreateBy = tempDate.CreateBy;
// this.customObj.CustomerId = tempDate.CustomerId;
// this.customObj.StuType = tempDate.StuType;
// this.customObj.QQ = tempDate.QQ;
// this.customObj.WeChatNo = tempDate.WeChatNo;
// this.customObj.StuNeeds = tempDate.StuNeeds;
// }
// });
// },
init(){
const tempDate = this.stuData;
this.customObj.StuId = tempDate.StuId;
this.customObj.StuName = tempDate.StuName;
this.customObj.StuTel = tempDate.StuTel;
......@@ -672,8 +707,6 @@
this.customObj.QQ = tempDate.QQ;
this.customObj.WeChatNo = tempDate.WeChatNo;
this.customObj.StuNeeds = tempDate.StuNeeds;
}
});
},
//新增协助人员
addAssist() {
......
src/components/school/student/student-shiting.vue
View file @ 64353acd
......@@ -57,8 +57,8 @@
ref="ClassRoomId" :options="ClassRoomList" label="关联教室" class="col-6 q-pb-lg q-pr-lg"
emit-value map-options />
</div>
<div class="row wrap" style="margin-bottom:10px;">
<q-btn label="新增" color="accent q-mb-lg" size="md" @click="saveAppointForm()" />
<div class="row wrap justify-end q-pr-lg" style="margin-bottom:10px;">
<q-btn label="保存" color="accent q-mb-lg" size="md" @click="saveAppointForm()" />
</div>
</template>
<div style="display:flex;flex:1;flex-direction: column;overflow:hidden;">
......
src/components/school/student/student-visit.vue
View file @ 64353acd
......@@ -2,14 +2,17 @@
.studentDate .el-input__inner {
background-color: transparent;
border: 0;
height: 28px!important;
height: 28px !important;
}
.studentDate .el-input{
height:28px!important;
.studentDate .el-input {
height: 28px !important;
}
.el-select-dropdown{
z-index:8888!important;
.el-select-dropdown {
z-index: 8888 !important;
}
</style>
<template>
<div>
......@@ -30,7 +33,8 @@
<div class="row warp studentDate">
<q-field filled class="q-pb-lg q-pr-lg" dense>
 <template v-slot:control>
<el-time-select v-model="VisitMsg.VisitTime" size="mini" ref="ClassTime" style="width:230px" :picker-options="{
<el-time-select v-model="VisitMsg.VisitTime" size="mini" ref="ClassTime" style="width:230px"
:picker-options="{
start: '09:00',
step: '00:15',
end: '21:00',
......@@ -40,23 +44,22 @@
</q-field>
<q-field filled class="q-pb-lg" dense>
 <template v-slot:control>
<el-select v-model="VisitMsg.ReceptionPersion" filterable style="width:230px;" size="mini" placeholder="接待人">
<el-option
v-for="item in myEmployeeList"
:key="item.Id"
:label="item.EmployeeName"
:value="item.Id">
<el-select v-model="VisitMsg.ReceptionPersion" filterable style="width:230px;" size="mini"
placeholder="接待人">
<el-option v-for="item in myEmployeeList" :key="item.Id" :label="item.EmployeeName" :value="item.Id">
</el-option>
</el-select>
 </template>
 
</template>
</q-field>
</div>
<div class="row wrap">
<q-input filled v-model="VisitMsg.Remark" dense :rows="3" type="textarea" class="col-12 q-pb-lg q-pr-lg" label="备注">
<q-input filled v-model="VisitMsg.Remark" dense :rows="3" type="textarea" class="col-12 q-pb-lg q-pr-lg"
label="备注">
</q-input>
</div>
<div class="row wrap" style="margin-bottom:10px;">
<div class="row wrap justify-end q-pr-lg" style="margin-bottom:10px;">
<q-btn label="保存" color="accent q-mb-lg" size="md" @click="saveVisit()" />
</div>
</template>
......@@ -97,14 +100,17 @@
<q-banner v-if="isShowEdit">
<div class="row wrap" style="margin-top:10px;width:300px;">
<q-input filled v-model="feedBackMsg.Feedback" :rows="3" type="textarea"
class="col-12 q-pb-lg" label="请输入反馈内容">
class="col-12 q-pb-sm" label="请输入反馈内容">
</q-input>
</div>
<div class="row wrap" style="margin-top:10px;width:300px;">
<q-radio v-model="feedBackMsg.IsVisit" :val="0" label="未到访" />
<q-radio v-model="feedBackMsg.IsVisit" :val="1" label="已到访" />
<div class="row wrap q-col-gutter-sm" style="width:300px;">
<q-select filled v-model="stuStageId" dense :options="cusStateList" option-label="Name"
option-value="Id" emit-value map-options label="客户状态" class="col-6" />
<q-select filled v-model="feedBackMsg.IsVisit" dense :options="VisitList"
emit-value map-options label="是否到访" class="col-6" />
</div>
<div class="row wrap" style="float:right;margin-bottom:10px;">
<div class="row wrap q-my-sm" style="float:right;">
<q-btn label="保存" color="accent" size="sm" @click="SetFeedBack()" />
</div>
</q-banner>
......@@ -132,23 +138,32 @@
<script>
import {
getSchoolDropdown, //获取校区列表
queryStuStageList, //获取客户阶段列表
} from '../../../api/school/index';
import {
queryStudentVisitPage, //获取到访列表
saveStudentVisit,
deleteStudentVisit,
saveStudentVisitFeedback
saveStudentVisitFeedback,
SetStuStage
} from '../../../api/customerstudent/customerstudent';
import {
queryEmployee
} from '../../../api/users/user'
export default {
meta: {
title: ""
},
props: {
stateId:{
type:Number,
default:0
},
stateList: {
type: Array,
default: () => []
},
saveObj: {
type: Object,
default: null
......@@ -182,8 +197,19 @@
feedBackMsg: {
Id: 0, //编号
IsVisit: 0, //到访状态(1-已到访，0-未到访)
Feedback: '' //反馈
Feedback: '', //反馈
},
VisitList:[
{
label:'未到访',
value:0
},{
label:'已到访',
value:1
}
],
stuStageId:0,
cusStateList: [],
}
},
created() {
......@@ -192,11 +218,13 @@
}
},
mounted() {
this.stuStageId=this.stateId
this.cusStateList = this.stateList;
this.getSchool();
this.getEmployeeList();
this.getList();
let userInfo = this.getLocalStorage();
if(userInfo){
if (userInfo) {
this.VisitMsg.ReceptionPersion = parseInt(userInfo.Id);
}
},
......@@ -225,6 +253,9 @@
this.isShowEdit = false;
}
});
if(this.stuStageId??0>0){
this.setStuStage()
}
},
//获取校区列表
getSchool() {
......@@ -260,7 +291,7 @@
//保存数据
saveVisit() {
this.VisitMsg.StuId = this.saveObj.StuId;
if(this.VisitMsg.Date==''){
if (this.VisitMsg.Date == '') {
this.$q.notify({
type: 'negative',
position: "top",
......@@ -269,7 +300,7 @@
})
return;
}
if(this.VisitMsg.VisitTime==''){
if (this.VisitMsg.VisitTime == '') {
this.$q.notify({
type: 'negative',
position: "top",
......@@ -333,7 +364,16 @@
changePage(val) {
this.msg.pageIndex = val;
this.getList();
},
setStuStage(){
const msg={
StuId:this.saveObj.StuId,
StuStage:this.stuStageId,
}
SetStuStage(msg).then(res=>{
this.$emit('update')
})
},
},
}
......
src/components/school/student/student-yuefang.vue
View file @ 64353acd
......@@ -13,21 +13,18 @@
<q-input filled class="col-6 q-pb-lg q-pr-lg" dense v-model="yueMsg.AppointmentPoint" label="约访地点"></q-input>
<q-field filled class="q-pb-lg" dense>
 <template v-slot:control>
<el-date-picker
v-model="yueMsg.AppointmentTime"
type="datetime"
size="mini"
style="width:228px"
<el-date-picker v-model="yueMsg.AppointmentTime" type="datetime" size="mini" style="width:228px"
placeholder="选择约访日期时间！">
</el-date-picker>
</template>
</q-field>
</div>
<div class="row wrap">
<q-input filled v-model="yueMsg.Remark" dense :rows="3" type="textarea" class="col-12 q-pb-lg q-pr-lg" label="备注">
<q-input filled v-model="yueMsg.Remark" dense :rows="3" type="textarea" class="col-12 q-pb-lg q-pr-lg"
label="备注">
</q-input>
</div>
<div class="row wrap" style="margin-bottom:10px;">
<div class="row wrap justify-end q-pr-lg" style="margin-bottom:10px;">
<q-btn label="保存" color="accent q-mb-lg" size="md" @click="savePoint()" />
</div>
</template>
......@@ -57,8 +54,10 @@
<q-banner v-if="isShowEdit">
<div class="row wrap" style="margin-top:10px;width:300px;">
<q-input filled v-model="feedBackMsg.Feedback" :rows="3" type="textarea"
class="col-12 q-pb-lg" label="请输入反馈内容">
class="col-12 q-pb-sm" label="请输入反馈内容">
</q-input>
<q-select filled v-model="stuStageId" dense :options="cusStateList"
option-label="Name" option-value="Id" emit-value map-options label="客户状态" class="col-12 q-pb-sm" />
</div>
<div class="row wrap" style="float:right;margin-bottom:10px;">
<q-btn label="保存" color="accent" size="sm" @click="SetFeedBack()" />
......@@ -91,7 +90,8 @@
saveStudentAppointment,
queryStudentAppointmentPage,
deleteStudentAppointment,
saveStudentAppointmentFeedBack
saveStudentAppointmentFeedBack,
SetStuStage
} from '../../../api/customerstudent/customerstudent';
export default {
......@@ -102,6 +102,14 @@
},
props: {
stateId:{
type:Number,
default:0
},
stateList: {
type: Array,
default: () => []
},
saveObj: {
type: Object,
default: null
......@@ -125,11 +133,13 @@
//反馈信息
feedBackMsg: {
Id: 0,
Feedback: '' //反馈
Feedback: '', //反馈
},
isShowEdit: false,
dataList: [],
page_Count: 0
page_Count: 0,
cusStateList: [],
stuStageId:0,
}
},
created() {
......@@ -138,6 +148,8 @@
}
},
mounted() {
this.stuStageId=this.stateId
this.cusStateList = this.stateList;
this.getList();
},
methods: {
......@@ -163,11 +175,14 @@
this.isShowEdit = false;
}
});
if(this.stuStageId??0>0){
this.setStuStage()
}
},
//保存约访
savePoint() {
this.yueMsg.StuId = this.saveObj.StuId;
if(this.yueMsg.AppointmentPoint==''){
if (this.yueMsg.AppointmentPoint == '') {
this.$q.notify({
type: 'negative',
position: "top",
......@@ -176,7 +191,7 @@
})
return;
}
if(this.yueMsg.AppointmentTime==''){
if (this.yueMsg.AppointmentTime == '') {
this.$q.notify({
type: 'negative',
position: "top",
......@@ -249,7 +264,16 @@
changePage(val) {
this.msg.pageIndex = val;
this.getList();
},
setStuStage(){
const msg={
StuId:this.saveObj.StuId,
StuStage:this.stuStageId,
}
SetStuStage(msg).then(res=>{
this.$emit('update')
})
},
}
}
......
src/components/school/student/studentRight-form.vue
View file @ 64353acd
......@@ -30,7 +30,7 @@
</div>
<div class="custom_Bottom">
<div class="detail-info">
<student-left :save-obj="saveObj" @success="refreshStudentPage" @getrecord="getrecord"></student-left>
<student-left :stuData="stuData" :save-obj="saveObj" @success="refreshStudentPage" @getrecord="getrecord"></student-left>
</div>
<div class="detail-travel">
<div class="detail_first">
......@@ -55,10 +55,14 @@
<!-- 操作 -->
<template v-if="ckedTab==2">
<div class="operate_Content" style="margin-top:20px;">
<student-visit :save-obj="baseObj" :StuId="baseObj.StuId" v-if="secondType==1" @success="refreshStudentPage"></student-visit>
<student-yuefang :save-obj="baseObj" v-if="secondType==2" @success="refreshStudentPage"></student-yuefang>
<student-genjin :save-obj="baseObj" v-if="secondType==3" @success="refreshStudentPage"></student-genjin>
<student-shiting :save-obj="baseObj" v-if="secondType==4" @success="refreshStudentPage"></student-shiting>
<student-visit :stateId="stateId" :stateList="customStateList" @update="queryStuInfo" :save-obj="baseObj" :StuId="baseObj.StuId"
v-if="secondType==1" @success="refreshStudentPage"></student-visit>
<student-yuefang :stateId="stateId" :stateList="customStateList" @update="queryStuInfo" :save-obj="baseObj" v-if="secondType==2"
@success="refreshStudentPage"></student-yuefang>
<student-genjin :stateId="stateId" :stateList="customStateList" @update="queryStuInfo" :save-obj="baseObj" v-if="secondType==3"
@success="refreshStudentPage"></student-genjin>
<student-shiting :save-obj="baseObj" v-if="secondType==4" @success="refreshStudentPage">
</student-shiting>
</div>
</template>
<!-- 订单 -->
......@@ -91,7 +95,10 @@
import {
ForwardStudent
} from '../../../api/customerstudent/customerstudent'
import {
getStudentInfo,//获取学员客户信息
queryStuStageList, //获取客户阶段列表
} from '../../../api/school/index';
import studentLeft from '../student/student-left';
import studentRecord from '../student/student-record';
import studentVisit from '../student/student-visit';
......@@ -121,7 +128,7 @@
type: Object,
default: null
},
isJudgeTrans:{
isJudgeTrans: {
type: Number,
default: null
}
......@@ -156,26 +163,32 @@
//员工列表
employeeList: [],
myEmployeeList: [],
isShowTrans: false
isShowTrans: false,
customStateList: [],
stateId:0,
stuData:{},
}
},
created() {
this.getStuStageList()
this.queryStuInfo()
},
mounted() {
this.baseObj = this.saveObj;
this.getEmployeeList();
console.log(this.baseObj,'baseObj');
},
methods: {
//判断是否显示转交
getJudgeTrans(){
getJudgeTrans() {
let userInfo = this.getLocalStorage();
let Id = userInfo.Id;
if(this.isJudgeTrans==1){
if(this.baseObj.CreateBy==Id){
if (this.isJudgeTrans == 1) {
if (this.baseObj.CreateBy == Id) {
return true
}else{
} else {
return false
}
}else{
} else {
return true
}
},
......@@ -224,11 +237,28 @@
})
},
//保存成功后调用记录
getrecord(){
getrecord() {
this.$refs.mychild.getStuLogPage();
},
//获取客户阶段列表
getStuStageList() {
queryStuStageList().then(res => {
this.customStateList = res.Data;
})
},
queryStuInfo() {
getStudentInfo({
StuId: this.saveObj.StuId
}).then(res => {
if (res.Code == 1) {
this.stuData=res.Data
this.stateId = res.Data.StuStage;
}
});
},
},
}
</script>
<style>
.custom_RModel {
......@@ -495,18 +525,22 @@
width: 57px;
text-align-last: justify;
}
.Stu_OrderId{
.Stu_OrderId {
color: #2961FE;
font-weight: bold;
text-decoration: underline;
cursor: pointer;
}
.Stu_HtLeft{
width:57px;
.Stu_HtLeft {
width: 57px;
display: inline-block;
text-align-last: justify;
}
.fullscreen{
z-index:3000;
.fullscreen {
z-index: 3000;
}
</style>
src/pages/financial/market/commissionRule.vue
View file @ 64353acd
......@@ -32,6 +32,11 @@
.marketRules .singeRowTable tr th {
border: 1px solid #d2d2d2;
}
.cycle_Title {
font-size: 20px;
font-weight: 500;
color: #1f2329;
}
</style>
<template>
<div class="page-body marketRules">
......@@ -39,10 +44,10 @@
<div class="col row wrap q-mr-lg q-col-gutter-md"></div>
</div>
<template>
<div>市场顾问提成规则</div>
<div class="cycle_Title">市场顾问提成规则</div>
<div
class="cm_content"
style="width: 100%;"
style="width: 100%;margin-bottom: 25px;margin-top: 10px;"
v-for=" ( item , index ) in dataList "
:key="index"
>
......@@ -54,11 +59,13 @@
v-loading="loading"
>
<tr>
<th>方案名称</th>
<th width="8%">方案名称</th>
<th>类型</th>
<th width="200">校区</th>
<th>课程类型</th>
<th>课程</th>
<th>提成方式</th>
<th width="300">课程</th>
<th>首次发放比例</th>
<th>课程比例</th>
<th>提成人员</th>
<th>部门人员</th>
<th width="100">操作</th>
......@@ -73,27 +80,27 @@
<span v-if="item.Type == 3">教师</span>
</td>
<td>
<span v-if="item.Type == 1">包含</span>
<span v-if="item.Type == 2">不包含</span>
<span>{{ item.SchoolName }}</span>
</td>
<td>
<p v-for="( son , sIndex ) in item.CourseList">{{ son.CourseName }}</p>
<span v-if="item.CourseType == 1">包含</span>
<span v-if="item.CourseType == 2">不包含</span>
</td>
<td>
<span v-if="item.CommissionType == 1">课耗提成</span>
<span v-if="item.CommissionType == 2">次月全提</span>
<span v-if="item.CommissionType == 3">课程比例:{{ item.CourseRate + '%' }}</span>
<td style="padding: 0 10px;">
<span v-for="( son , sIndex ) in item.CourseList">{{ son.CourseName }}{{item.CourseList.length==sIndex+1?'':'、'}}</span>
</td>
<td>
<p v-for="( son , sIndex ) in item.EmpList">{{ son.EmployeeName }}</p>
<span >{{ item.FirstRate + '%' }}</span>
</td>
<td>
<p v-for="( son , sIndex ) in item.ChildEmpList">{{ son.EmployeeName }}</p>
<span >{{ item.CourseRate + '%' }}</span>
</td>
<td style="padding: 0 10px;">
<span v-for="( son , sIndex ) in item.EmpList">{{ son.EmployeeName }}{{item.EmpList.length==sIndex+1?'':'、'}}</span>
</td>
<td style="padding: 0 10px;">
<span v-for="( son , sIndex ) in item.ChildEmpList">{{ son.EmployeeName }}{{item.ChildEmpList.length==sIndex+1?'':'、'}}</span>
</td>
<!-- <td v-for="( son , sIndex ) in item.RateList">{{ son.StartValue }}</td>
<td v-for="( son , sIndex ) in item.RateList">{{ son.EndValue }}</td>
<td v-for="( son , sIndex ) in item.RateList">{{ son.Rate }}</td>-->
<td>
<q-btn
flat
......@@ -102,7 +109,7 @@
color="accent"
style="font-weight:400"
label="编辑"
@click="EditTask(props.row)"
@click="EditTask(item)"
/>
<q-btn
flat
......@@ -116,7 +123,6 @@
</td>
</tr>
</table>
<div></div>
<table
class="po_content singeRowTable"
style="border:1px solid #E6E6E6;"
......@@ -125,26 +131,39 @@
v-loading="loading"
>
<tr>
<th :rowspan="item.RateList.length">业绩比例</th>
<th >业绩比例</th>
</tr>
</table>
<div style="width:100%;overflow-x: auto;">
<table
class="po_content singeRowTable"
style="border:1px solid #E6E6E6;"
cellspacing="0"
cellpadding="0"
v-loading="loading"
>
<tr>
<th
<th style="min-width: 260px;"
v-for="( son , sIndex ) in item.RateList"
:key="sIndex"
>{{ son.StartValue }}{{ '<业绩<=' }}{{ son.EndValue }}</th>
</tr>
<tr>
<td v-for="( son , sIndex ) in item.RateList" :key="sIndex">{{ son.Rate }}%</td>
<tr style="width: 1040px;overflow-x: auto;">
<td style="min-width: 260px;" v-for="( son , sIndex ) in item.RateList" :key="sIndex">{{ son.Rate }}%</td>
</tr>
</table>
</div>
</div>
<div
v-if="dataList.length == 0"
style="width: 100%;border:1px solid #E6E6E6;display: flex;align-items: center;justify-content: center;height: 60px;"
>暂无数据</div>
<div style="width: 100%;display: flex;justify-content: flex-end;margin-top: 10px;">
<q-btn color="accent" size="sm" icon="add" label="新增规则" @click="AddMsg()" />
<q-btn color="accent" size="sm" label="保存" @click="setMsg()" style="margin-left: 15px;" />
<!-- <q-btn color="accent" size="sm" label="保存" @click="setMsg()" style="margin-left: 15px;" /> -->
</div>
</template>
<marketCommissionfrom
......@@ -152,6 +171,8 @@
:isAdd="isAdd"
:loyeeList='loyeeList'
:CourseList='CourseList'
:SchoolList='SchoolList'
:selectData= 'selectData'
@close="closeForm"
@success="refreshList"
></marketCommissionfrom>
......@@ -167,7 +188,11 @@ import {
} from '../../../api/course/index'
import {
getSellAchievementsRuleList,
setSellAchievementsRule
} from '../../../api/finance/index'
import {
getSchoolDropdown,
} from '../../../api/school/index'
import marketCommissionfrom from "../../../components/finance/marketCommissionfrom";
export default {
meta: {
......@@ -186,6 +211,8 @@ export default {
isAdd: false,
loyeeList: [],//人员列表
CourseList:[],//课程列表
SchoolList:[],//校区下拉
selectData:{},
}
},
created() {
......@@ -202,6 +229,7 @@ export default {
this.getSellAchievementsRuleList(); //获取规则
this.getEmployeeList();
this.getCourseList();//获取课程下拉
this.getSchool();//校区下拉
},
methods: {
......@@ -234,23 +262,51 @@ export default {
}
})
},
getSchool() {
getSchoolDropdown({}).then(res => {
if (res.Code == 1) {
this.SchoolList = res.Data;
}
})
},
preservation() { //保存规则
refreshList(data) { //保存规则
console.log(this.dataList,'datalist')
setSellAchievementsRule(data).then(res => {
if (res.Code == 1) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: res.Message,
position: 'top'
})
this.persistent = false;
this.getSellAchievementsRuleList(); //获取规则
}
})
},
AddMsg() {
AddMsg() {//新增
this.selectData = {}
this.persistent = true;
this.isAdd = true;
},
EditTask(item){//编辑
this.persistent = true;
this.selectData = item
this.isAdd = false;
},
closeForm() {
this.persistent = false;
},
refreshList() {//成功之后返回
}
},
}
......
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