Skip to content

C
confucius
Commit 8b5a9861 authored by Mac's avatar Mac
Browse files
Options

1

parent 31bd509f
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 3 deletions
src/components/sale/myOrder-form.vue
View file @ 8b5a9861
......@@ -265,7 +265,7 @@
</q-td>
</template>
<template v-slot:body-cell-CostTypeList="props">
<q-td :props="props" v-for="(s,si) in props.row.CostTypeList" :key="si">
<q-td :props="props" v-for="(s,si) in props.row.CostTypeList" :key="si" >
<span
style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;margin-right: 4px;">{{s}}</span>
</q-td>
......@@ -327,7 +327,7 @@
<div class="row " style="align-items: center;margin: 20px 0;">
<div style="width: 3px;height: 15px;background: #3FC4FF;margin-right: 10px"></div>付款单
</div>
<q-table :pagination="financiaMsg" style="padding-bottom:80px;" :loading="floading" no-data-label="暂无相关数据" flat
<q-table :pagination="financiaMsg" style="padding-bottom:20px;" :loading="floading" no-data-label="暂无相关数据" flat
class="sticky-tow-column-table" :hide-pagination="true" :data="dataListP" :columns="receiptColumns"
row-key="name">
<template v-slot:body-cell-FrID="props">
......@@ -393,6 +393,79 @@
</q-td>
</template>
</q-table>
<!--成本单-->
<div class="row " style="align-items: center;margin: 20px 0;">
<div style="width: 3px;height: 15px;background: #3FC4FF;margin-right: 10px"></div>成本单
</div>
<q-table :pagination="financiaMsg" style="padding-bottom:80px;" :loading="floading" no-data-label="暂无相关数据" flat
class="sticky-tow-column-table" :hide-pagination="true" :data="dataListCB" :columns="receiptColumns"
row-key="name">
<template v-slot:body-cell-FrID="props">
<q-td :props="props" @click="goUrl('FinancialDocumentsDetail',props.row)">
<span style="font-size: 14px;color: #2961FE;font-weight: bold;cursor: pointer;">{{props.row.FrID}}</span>
</q-td>
</template>
<template v-slot:body-cell-CostTypeList="props">
<q-td :props="props" v-for="(s,si) in props.row.CostTypeList" :key="si">
<span v-if="s&& s!=''"
style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;margin-right: 4px;">{{s}}</span>
</q-td>
</template>
<template v-slot:body-cell-TradeWayList="props">
<q-td :props="props" class="row" style="align-items: center;min-height: 48px;">
<div v-if="props.row.TradeWayList&&props.row.TradeWayList.length>0" class="my-table-details">
<div v-for="(tw,twIn) in props.row.TradeWayList" :key="twIn"
style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;width:210px;display: flex;flex-direction: column;align-items: center">
<p><span style="font-weight: bold;color:#333333">{{tw.Alias}}</span><span class="_bank_name"
style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">{{props.row.TradeWayList[0].TypeName}}</span><span
style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;"
:style="{'background-color':tw.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{tw.AccountType==""?'无':tw.AccountType}}</span>
</p>
<p style="color:#333333">{{tw.BankNo}}</p>
</div>
</div>
</q-td>
</template>
<template v-slot:body-cell-zhaungt="props">
<q-td :props="props">
<i v-if="props.row.Status==1" class="iconfont icon-daiqueren" style="color: #4BCA81"></i>
<i v-if="props.row.Status==4" class="iconfont icon-yiquxiao" style="color: #4BCA81"></i>
<i v-if="props.row.Status==2" class="iconfont icon-yiqueren" style="color: #959595"></i>
<i v-if="props.row.Status==3" class="iconfont icon-shenhebohui" style="color: #E95252"></i>
<i v-if="props.row.Status==0" class="iconfont icon-zancun" style="color: #FF9C01"></i>
<span style="cursor: pointer;"
@click="Financial_post_GetFinancLogList(props.row.FrID)">{{props.row.StatusStr}}</span>
<q-popup-proxy>
<q-banner>
<div style="height: auto;max-height: 220px;background-color: #FFFFFF;width: 230px">
<div class="changLog">
<p class="_log_t">流程日志</p>
<ul style="padding-left: 20px;max-height: 180px;overflow: auto;" v-if="GetFinancLogList"
v-loading='LogLoading'>
<li
style="border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;"
v-for="(log,lIndex) in GetFinancLogList" :key="lIndex">
<span
style="background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;"></span>
<p class="row" style="justify-content: space-between"> <span
class="_color_blue">{{log.EmName}}</span> <span
class="fr changLog_time">{{log.UpdateDate}}</span> </p>
<p class="_dtel">{{log.StartValue}}</p>
</li>
</ul>
<ul v-else>
<li>暂无修改日志</li>
</ul>
</div>
</div>
</q-banner>
</q-popup-proxy>
</q-td>
</template>
</q-table>
saveObj.OrderType==2
</div>
<div v-if="tab==5" style="padding: 10px 20px">
<div class="q-px-lg q-pb-md" style="padding-bottom: 50px;">
......@@ -623,6 +696,7 @@
},
dataList: [],
dataListP: [],
dataListCB:[],
floading: false,
LogLoading: false,
GetFinancLogList: [],
......@@ -630,6 +704,7 @@
}
},
created() {
console.log(this.saveObj)
if (this.saveObj.tab) {
this.tab = (this.saveObj.tab).toString();
}
......@@ -743,7 +818,22 @@
this.dataList = data;
this.getfinanciaALLPageList(2, TCID, OrderID)
} else {
this.dataListP = data;
if(this.saveObj.OrderType==1){
this.dataListP = data;
}else if(this.saveObj.OrderType==2){//等于留学的时候 成本单据
this.dataListCB = []
this.dataListP = []
data.forEach(x=>{
if(x.OtherType==45){
this.dataListCB.push(x)
}else{
this.dataListP.push(x)
}
})
this.getAskfor()
}
this.floading = false
}
} else {
......@@ -752,6 +842,52 @@
}
}, err => {})
},
getAskfor(){
let obj = {
FrID:'',
CostTypeList:[''],
TradeWayList:[],
Money: 0,
PayMoney: 0,
Fee: 0,
TradeDate:'',
EmName:'',
}
this.dataListCB.forEach((x) => {
if (x.Money) {
obj.Money = this.accAdd(x.Money, obj.Money)
};
if (x.PayMoney) {
obj.PayMoney = this.accAdd(x.PayMoney, obj.PayMoney)
};
if (x.Fee) {
obj.Fee = this.accAdd(x.Fee, obj.Fee)
};
})
this.dataListCB.push(obj)
},
accAdd(arg1, arg2) { //js 加法精确计算
var r1, r2, m;
try {
r1 = arg1.toString().split(".")[1].length;
} catch (e) {
r1 = 0;
}
try {
r2 = arg2.toString().split(".")[1].length;
} catch (e) {
r2 = 0;
}
m = Math.pow(10, Math.max(r1, r2));
return (arg1 * m + arg2 * m) / m;
},
goUrl(path, rowData, ) {
this.$router.push({
path: '/financial/financalDocument/' + path,
......
src/pages/financial/financalDocument/FinancialDocumentsDetail.vue
View file @ 8b5a9861
......@@ -833,6 +833,8 @@
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教育活动:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==42 "
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 活动提成:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==44 "
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 留学销售提成:{{GetDetail.ReFinanceId}}</span>
<template v-if="GetDetail.RelevanceFrId">
<span class="fr" style="margin-right:10px;">
相关单据：<span @click="goFinancal(sItem)" v-for="(sItem,sIndex) in getRelevanArr(GetDetail.RelevanceFrId)" style="text-decoration:underline;cursor:pointer;margin-right:5px;">
......@@ -2180,6 +2182,8 @@
tempStr = '/sale/activityList?Id='+ID;
}else if(OtherType==42){
tempStr = '/financial/reportform/activityCommissionDetails?id='+ID +'&UserIds='+this.GetDetail.EduCommissionEmp;
}else if(OtherType==44){
tempStr = '/financial/studyabroad/sBuserCommissionDetails?preriodId='+ID;
}
this.$router.push({
......
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