Skip to content

C
confucius
Commit 332ebdfe authored by Mac's avatar Mac
Browse files
Options

销售制单和课时制单修改

parent ee3ee9b3
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 24 deletions
src/pages/course/classHourReward.vue
View file @ 332ebdfe
......@@ -81,9 +81,7 @@
</template>
<template v-slot:body-cell-optioned="props">
<q-td :props="props">
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;"
v-if="props.row.State==1 || ((props.row.State==1 || props.row.State==2) && props.row.FrIdList==0) || (props.row.State==2 && props.row.FrIdList==0 && props.row.Money>0) "
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;" v-if="props.row.State!= 3"
>
<q-list>
<q-item clickable v-close-popup v-if="props.row.State==1">
......@@ -91,6 +89,11 @@
<q-item-label>确认</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup v-if="(props.row.State==2) && props.row.Money>0">
<q-item-section @click="generalFinancacls(props.row)">
<q-item-label>制单</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup
v-if="(props.row.State==1 || props.row.State==2) && props.row.FrIdList==0">
<q-item-section @click="gostudent(props.row,2)">
......@@ -102,11 +105,7 @@
<q-item-label>制单</q-item-label>
</q-item-section>
</q-item> -->
<q-item clickable v-close-popup v-if="props.row.State==2 && props.row.FrIdList==0 && props.row.Money>0">
<q-item-section @click="generalFinancacls(props.row)">
<q-item-label>制单</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-btn-dropdown>
<q-btn flat size="xs" icon="iconfont icon-xiangqing-" style="font-weight:400;color: #3FC4FF" class="q-mr-xs"
......@@ -629,14 +628,14 @@
this.saveLoading = true
setTeachingRewardsSendEmployee({PeriodId:this.CheckID,EmpIds:EmpIds}).then(res => {
this.saveLoading = false
this.goaddFinancial(this.totalAmount,this.CheckID)
this.goaddFinancial(this.totalAmount,this.CheckID,EmpIds)
this.$message.success('设置成功');
}).catch(() => {
})
});
},
goaddFinancial(Money,Id){
goaddFinancial(Money,Id,EmpIds){
let School_Id = 0;
let obj = {
......@@ -647,7 +646,8 @@
School_Id:0,
OtherType:26,
ReFinanceId:Id,
ReFinanceId2:0
ReFinanceId2:0,
EduCommissionEmp:EmpIds
}
let query = {
blank: "y",
......
src/pages/course/rewardDetailed.vue
View file @ 332ebdfe
......@@ -181,10 +181,11 @@
data: [],
loading: true,
msg: {
rowsPerPage: 999,
rowsPerPage: 9999,
BonusId: 0,
TeacherId: 0,
Type: 0
Type: 0,
TeacherIds:'',
},
TeacherList: [], //关联教师下拉数据
TypeList: [{
......@@ -205,7 +206,12 @@
created() {
if (this.$route.query) {
this.msg.BonusId = this.$route.query.Id;
this.msg.TeacherId = Number(this.$route.query.TeacherId);
if(this.$route.query.TeacherId){
this.msg.TeacherId = Number(this.$route.query.TeacherId);
}
if(this.$route.query.TeacherIds){
this.msg.TeacherIds = this.$route.query.TeacherIds;
}
}
this.getList();
this.GetTeacherList()
......
src/pages/financial/financalDocument/BasicDocuments.vue
View file @ 332ebdfe
......@@ -785,6 +785,8 @@
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教育耗材出库:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==39"
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 销售提成:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==26"
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教师课时:{{GetDetail.ReFinanceId}}</span>
<span v-if="GetDetail.OtherType==18&&GetDetail.ReFinanceId>0"
style="cursor: pointer;float: right;color: #000;font-size: 12px;">
<span @click="goOrderDetails(GetDetail.ReFinanceId)">账单：{{GetDetail.ReFinanceId}}</span>
......@@ -3400,7 +3402,9 @@
}else if(OtherType==33){
tempStr = '/financial/financalDocument/InAndOutDdetails?id='+ID;
}else if(OtherType==39){
tempStr = '/financial/CommissionDetail?id='+ID+'&School_Id='+this.GetDetail.RB_Branch_Id;
tempStr = '/financial/userCommissionDetails?UserIds='+this.GetDetail.EduCommissionEmp+'&preriodId='+ID;
}else if(OtherType==26){
tempStr = '/course/rewardDetailed?TeacherIds='+this.GetDetail.EduCommissionEmp+'&Id='+ID;
}
this.$router.push({
......
src/pages/financial/financalDocument/FinancialDocumentsDetail.vue
View file @ 332ebdfe
......@@ -825,8 +825,10 @@
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教育耗材采购:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==33"
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教育耗材出库:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==39"
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==39"
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 销售提成:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==26"
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教师课时:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==17"
......@@ -2156,7 +2158,9 @@
}else if(OtherType==33){
tempStr = '/financial/financalDocument/InAndOutDdetails?id='+ID;
}else if(OtherType==39){
tempStr = '/financial/CommissionDetail?id='+ID+'&School_Id='+this.GetDetail.RB_Branch_Id;
tempStr = '/financial/userCommissionDetails?UserIds='+this.GetDetail.EduCommissionEmp+'&preriodId='+ID;
}else if(OtherType==26){
tempStr = '/course/rewardDetailed?TeacherIds='+this.GetDetail.EduCommissionEmp+'&Id='+ID;
}
this.$router.push({
......
src/pages/financial/financalDocument/addFinancialDocuments.vue
View file @ 332ebdfe
......@@ -873,6 +873,7 @@
InvoiceType:1,
InvoiceMoney:'0',
InvoiceRemark:'',
EduCommissionEmp:'',
},
detailList: {
ID: 0,
......@@ -1195,6 +1196,7 @@
this.msg.OtherType = this.orderObj.OtherType ? this.orderObj.OtherType : 0;
this.msg.ReFinanceId = this.orderObj.ReFinanceId ? this.orderObj.ReFinanceId : 0;
this.msg.ReFinanceId2 = this.orderObj.ReFinanceId2 ? this.orderObj.ReFinanceId2 : 0;
this.msg.EduCommissionEmp = this.orderObj.EduCommissionEmp ? this.orderObj.EduCommissionEmp : '';
this.msg.ECOrderList = this.orderObj.ECOrderList ? this.orderObj.ECOrderList : [];
}
// 2019-12-3 18:29:31 新增费用类型判断
......
src/pages/financial/salesCommission.vue
View file @ 332ebdfe
......@@ -41,7 +41,7 @@
<div class="page-body salesCommission">
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div style="margin-right: 20px;" v-if='iscMaker==true'>
<!-- <div style="margin-right: 20px;" v-if='iscMaker==true'>
<div class="block">
<span style="margin-right: 5px;">校区</span>
<el-select v-model="msg.SchoolId" filterable @change="handleCurrentChanges(1)">
......@@ -49,7 +49,7 @@
<el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'></el-option>
</el-select>
</div>
</div>
</div> -->
<div v-if='isgenerate==true'>
<div class="block" style="display:flex">
<span style="margin-right: 5px;">选择月份</span>
......@@ -272,14 +272,14 @@
}
}else{
if(item.SchooldCommission>0){
this.goaddFinancial(item.SchooldCommission,item.Id)
this.goaddFinancial(item.SchooldCommission,item.Id,'')
}else{
this.$message.error('校区提成总金额为0')
}
}
},
goaddFinancial(Money,Id){
goaddFinancial(Money,Id,EmpIds){
let School_Id = 0;
let obj = {
......@@ -290,7 +290,8 @@
School_Id:this.msg.SchoolId == -1?0:this.msg.SchoolId,
OtherType:39,
ReFinanceId:Id,
ReFinanceId2:this.msg.SchoolId
ReFinanceId2:this.msg.SchoolId,
EduCommissionEmp:EmpIds
}
let query = {
blank: "y",
......@@ -323,7 +324,6 @@
focus: true
}
}).onOk(() => {
// this.goaddFinancial(Money,Id)
this.getcomSendEmployeeList(Id)
});
},
......@@ -381,7 +381,7 @@
})
EmpIds = data.join(',')
setSellCommissionSendEmployee({PeriodId:this.CheckID,EmpIds:EmpIds}).then(res => {
this.goaddFinancial(this.totalAmount,this.CheckID)
this.goaddFinancial(this.totalAmount,this.CheckID,EmpIds)
this.$message.success('设置成功');
}).catch(() => {
......
src/pages/financial/userCommissionDetails.vue
View file @ 332ebdfe
......@@ -152,6 +152,7 @@
UserId: 0,
ClassId: 0,
OrderId: '',
UserIds:'',
},
pageCount: 0,
persistent: false,
......@@ -171,6 +172,9 @@
if (this.$route.query && this.$route.query.preriodId) {
this.msg.PeriodId = this.$route.query.preriodId
}
if (this.$route.query && this.$route.query.UserIds) {
this.msg.UserIds = this.$route.query.UserIds
}
this.getList()
this.setClass()
},
......
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