Skip to content

C
confucius
Commit 25cbf688 authored by Mac's avatar Mac
Browse files
Options

1

parent 59a07bee
Show whitespace changes
Inline Side-by-side
Showing with 107 additions and 5 deletions
src/components/sale/orderlist.vue
View file @ 25cbf688
......@@ -63,6 +63,8 @@
<div>
<span @click="goOrderdetails(item,1)" class="order_OfferId">{{item.OrderId}}</span>
<q-badge v-if="item.JoinType==3" color="red" label="续费订单" style="margin-left:5px;" class="q-mr-xs" />
<q-badge v-if="item.OrderType==2 && item.LXConfirmState==1" color="primary" label="已确认" style="margin-left:5px;" class="q-mr-xs" />
<q-badge v-if="item.TargetJoinType==3" color="green" label="已续费" style="margin-left:5px;"
class="q-mr-xs" />
<div style="display:inline-block;">
......@@ -332,9 +334,9 @@
</q-item-section>
</q-item>
</div>
<div v-if="item.OrderType==2">
<div v-if="item.OrderType==2 && item.LXConfirmState!=1 && AuthorityObj.isshoworderconfirm == true">
<q-item clickable v-close-popup disabled
v-if="(item.DueInMoney&&item.DueInMoney!=0) ">
v-if="(item.DueInMoney&&item.DueInMoney!=0 ) ">
<q-item-section>
<q-item-label>
订单确认
......@@ -585,6 +587,8 @@
<span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
</div>
</div>
<div class="row" style="justify-content: space-between">
<span>付款单据：</span>
<q-btn flat size="xs" icon="edit"
......@@ -619,7 +623,48 @@
</template>
</div>
<div class="row wrap">
<div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j"
<div class="finance row" v-for="(x,j) in item.RefundFinanceList" v-if="x.OtherType!=45" :index="j"
:style="{
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
<span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
</div>
</div>
<div class="row" style="justify-content: space-between" v-if="item.OrderType==2">
<span>成本单据：</span>
<q-btn flat size="xs" icon="edit"
v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowEdit&&item.OrderType==2"
style="font-weight:400;color: #02C499" label="修改" @click="chanceType_lx(item)" />
<template v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowEdit&&item.OrderType==1">
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改"
@click="showChooseStudent=true" />
<q-popup-proxy v-if="showChooseStudent">
<q-banner>
<div style="width:500px;max-height:400px;overflow-y:auto;">
<table class="Contract_Table">
<tr>
<th>选择</th>
<th>姓名</th>
<th style="width:180px;">合同编号</th>
<th>状态</th>
</tr>
<tr v-for="subItem in item.GuestList">
<td>
<q-radio dense v-model="chooseStudent" :val="subItem.Id" />
<td>{{subItem.GuestName}}</td>
<td>{{subItem.ContractNo}}</td>
<td>{{subItem.ContractStatusStr}}</td>
</tr>
</table>
</div>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,2)" label="制单"
style="min-width:70px;float:right;margin-top:10px" />
</q-banner>
</q-popup-proxy>
</template>
</div>
<div class="row wrap" v-if="item.OrderType==2">
<div class="finance row" v-for="(x,j) in item.RefundFinanceList" v-if="x.OtherType==45" :index="j"
:style="{
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
......@@ -1050,7 +1095,8 @@
isShowContract: true, //是否显示合同
isShowEdit: true, //是否显示修改订单按钮
isShowTransClassOrder: false, //是否显示转班按钮
isShowSeparater: false //是否显示分拆
isShowSeparater: false, //是否显示分拆
isshoworderconfirm:false,//留学的订单确认按钮
},
isShowEduForm: false, //是否显示新增修改合同弹窗
......@@ -1183,6 +1229,10 @@
if (this.authObj.isShowSeparater != null && this.authObj.isShowSeparater) {
this.AuthorityObj.isShowSeparater = this.authObj.isShowSeparater;
}
if (this.authObj.isshoworderconfirm != null && this.authObj.isshoworderconfirm) {
this.AuthorityObj.isshoworderconfirm = this.authObj.isshoworderconfirm;
}
}
},
//回归原班
......@@ -1507,6 +1557,57 @@
}
});
},
chanceType_lx(obj){//留学的时 成本制单
let TCIDARR = []
if (obj && obj.OrderType == 2) {
//留学就业订单
TCIDARR.push(obj.SourceId);
} else {
}
var orderObj = {
OrderID: obj.OrderId,
OrderSource: 17,
Obj: {},
SourceID: 0,
TCIDList: TCIDARR
}
orderObj.OtherType = 45;//成本单据
if(obj.OfferId>0){
orderObj.ReFinanceId = obj.OfferId;
}
let ContractNo = ''
if (obj && obj.GuestList.length > 0) {
obj.GuestList.forEach(x => {
if (this.chooseStudent == x.Id) {
ContractNo = x.ContractNo
}
})
}
//留学就业订单
if (obj && obj.OrderType == 2) {
//财务单据类型【教育留学】
orderObj.OrderSource = 18;
}
var guestId = 0;
if (this.chooseStudent != "") {
guestId = this.chooseStudent;
}
this.$router.push({
path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
query: {
"Type": 2,
"companyID": obj.ClassSchoolId,
"path": "",
'blank': 'y',
'orderObj': JSON.stringify(orderObj),
'tradeWay': obj.tradeWay,
"GuestId": guestId
}
});
},
//打开班级详情组件
getClassInfo(obj) {
this.classObjOption = obj;
......
src/pages/financial/studyabroad/studyAbroadCommission.vue
View file @ 25cbf688
......@@ -288,7 +288,7 @@
CurrencyId: 21,
XSTC: 1,
School_Id:this.msg.SchoolId == -1?0:this.msg.SchoolId,
OtherType:44,
OtherType:44,//留学销售提成
ReFinanceId:Id,
ReFinanceId2:this.msg.SchoolId,
EduCommissionEmp:EmpIds
......
src/pages/studyAbroad/studyemploymentorder.vue
View file @ 25cbf688
......@@ -46,6 +46,7 @@
isShowManagerRemark: true, //显示总经理备注
isShowCommissionEdit: true, //显示修改提成按钮
isShowRewardEdit: true, //显示修改额外提成按钮
isshoworderconfirm:true,//订单确认按钮
}
}
},
......
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