Skip to content

S
SuperMan
Commit 65ccc3f5 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents e10ba5fa 8e98a146
Show whitespace changes
Inline Side-by-side
Showing with 124 additions and 7 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 65ccc3f5
......@@ -491,11 +491,42 @@
<div v-else-if="item.SpecialNode!==0&&AuditOrRefundMsg.Status=='5'">
<textarea class="_textarea" v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea>
</div>
<div class="_radio_lsit">
<div class="_radio_lsit clearfix">
<div style="float:left">
<el-radio v-model="AuditOrRefundMsg.Status" label="5">通过</el-radio>
<el-radio v-model="AuditOrRefundMsg.Status" label="3">驳回</el-radio>
</div>
<div style="float:right" v-if="isShowChoice&&AuditOrRefundMsg.Status=='5'">
<el-radio v-model="choiceMsg.Status" label="1">常规</el-radio>
<el-radio v-model="choiceMsg.Status" label="2">原路退款</el-radio>
</div>
</div>
<!--<div class="_pay_box" v-if="AuditOrRefundMsg.Status=='5'&&item.SpecialNode==2">-->
<div class="_pay_box" v-if="choiceMsg.Status=='2'">
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;" v-if="GetDetail.TradeDetailList&&GetDetail.TradeDetailList.length>0">
<tr>
<th>账户名称</th>
<th>收款总额</th>
<th>收款日期</th>
<th>类型</th>
<th>交易流水号</th>
<th>可退金额</th>
<th>操作</th>
</tr>
<tr v-for="(subItem,index) in GetDetail.TradeDetailList">
<td>{{subItem.AccountName}}</td>
<td>{{subItem.Money}}</td>
<td>{{subItem.Pay_DateStr}}</td>
<td>{{subItem.Pay_WayName}}</td>
<td>{{subItem.Trade_Order}}</td>
<td>{{subItem.CanRefundMoney}}</td>
<td>
<el-checkbox v-model="subItem.isChecked" @change="changeStatus(subItem,index)"></el-checkbox>
<el-input v-if="subItem.isChecked" v-model="subItem.RefundMoney" @blur="addPayList(subItem,index)" @keyup.native="checkPrice(subItem,'RefundMoney')" class="w80" placeholder="请输入退款金额"/>
</td>
</tr>
</table>
</div>
<div class="_pay_box" v-if="AuditOrRefundMsg.Status=='5'&&item.SpecialNode==2">
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;" v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length<1">
<tr>
......@@ -560,7 +591,7 @@
<td>
<el-input v-model="i.Rate" @change="Calculation(1,index)" @blur="addList(2,index)" type="number" class=" _border_b_1"></el-input>
</td>
<td>{{i.allMoney.toFixed(2)}}</td>
<td>{{i.allMoney}}</td>
</tr>
</template>
<tr @keyup.enter="addList()">
......@@ -593,7 +624,7 @@
</td>
<!-- <td>{{payMsg.balance}}</td> -->
<td>
<el-input v-model="payMsg.OriginalMoney" @change="Calculation()" @blur="addList()" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input>
<el-input v-model="payMsg.OriginalMoney" @change="Calculation()" @blur="addList()" @keyup.native="checkPrice(payMsg,'OriginalMoney')" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input>
</td>
<td>
<p>{{payMsg.CurrenName}}</p>
......@@ -655,6 +686,7 @@
</el-date-picker>
</div>
</div>
<div class="_upload_box">
<ul class="clearfix">
<li v-for="(img,imgIndex) in uploadImgList">
......@@ -763,7 +795,7 @@
<td>
<el-input v-model="i.Rate" @change="Calculation(1,index)" @blur="addList(2,index)" type="number" class=" _border_b_1"></el-input>
</td>
<td>{{i.allMoney.toFixed(2)}}</td>
<td>{{i.allMoney}}</td>
</tr>
</template>
<tr @keyup.enter="addList()">
......@@ -1049,6 +1081,8 @@ export default {
}
],
emList:[],
IsRefundAutoGoBack:0,
TradeDetailList:[]
},
AuditListData:{
AuditList:[]
......@@ -1109,6 +1143,12 @@ export default {
userId:0,
RB_Post_Id: 0,
ISGZ: false,
isBook: true,
choiceMsg:{
Status:'1'
},
//是否显示原路退款选项
isShowChoice:false,
}
},components:{
"my-FlowChartModule": myFlowChartModule,
......@@ -1174,7 +1214,7 @@ export default {
this.payMsgList.forEach(x=>{
allMoney+=x.allMoney
})
this.allMoney = allMoney
this.allMoney = allMoney;
},
Financial_post_GetFinancLogList(){ // 获取单据日志
if(this.checkboxShow) return
......@@ -1557,6 +1597,7 @@ export default {
}, err => {})
},
AuditOrRefund(){ // 保存
console.log(this.GetDetail,'getdetail');
this.loading = true;
let imgArr = [];
this.uploadImgList.forEach(x=>{
......@@ -1586,6 +1627,7 @@ export default {
// }
// }
// });
this.AuditOrRefundMsg.TradeDetailList = this.GetDetail.TradeDetailList;
this.apipost('Financial_post_AuditOrRefund',this.AuditOrRefundMsg,res=>{
if(res.data.resultCode==1){
this.$message.success(res.data.message);
......@@ -1650,11 +1692,13 @@ export default {
this.apipost('Financial_post_GetDetail',{ID:id,Type:2}, res => {
if(res.data.resultCode == 1) {
let data= res.data.data;
console.log(data,'datas');
data.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(x.UnitPrice.toFixed(2))
x.Money = x.Money.toFixed(2)
x.OriginalMoney = x.OriginalMoney.toFixed(2)
})
data.Money = this.$commonUtils.addCommas(data.Money.toFixed(2))
data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money)
this.FinancialFlowTemplate_post_GetProcessList(data.FrID,data.TemplateType)
......@@ -1672,6 +1716,16 @@ export default {
this.SourceID = this.GetDetail.SourceID;
this.Callback = this.GetDetail.Callback;
this.FrID = this.GetDetail.FrID;
let lastSpecialNode = this.GetDetail.AuditSteps[this.GetDetail.AuditSteps.length-1].SpecialNode;
let lastStatus = this.GetDetail.AuditSteps[this.GetDetail.AuditSteps.length-1].Status;
if(lastSpecialNode==2&&lastStatus==1&&this.GetDetail.TradeDetailList.length>0){
this.isShowChoice = true;
}
//遍历默认不勾选
this.GetDetail.TradeDetailList.forEach(x=>{
x.isChecked = false;
})
console.log(this.GetDetail,'getdetails');
// 拼接团号显示团信息
let str = '';
if(data.TCIDList.length>0){
......@@ -1704,6 +1758,45 @@ export default {
}
},err=>{})
},
//点击操作
changeStatus(subItem,index){
this.$forceUpdate();
if(!subItem.isChecked){
this.payMsgList.forEach((x,index)=>{
if(x.Trade_Order==subItem.Trade_Order){
this.payMsgList.splice(index,1);
}
})
}
},
addPayList(subItem,index){
if(subItem.RefundMoney>subItem.CanRefundMoney){
subItem.RefundMoney=0;
this.Error('退款金额不能大于可退金额');
return;
}
var payMsg = {
AccName: subItem.AccountName,
Account: subItem.BackNo,
AccountId: subItem.AccountTypeId,
CurrenName: "人民币",
CurrencyId: 1,
Fee: 0,
FinanceId: "",
ID: 0,
Name: subItem.Pay_WayName,
OriginalMoney: subItem.RefundMoney,
Rate: 1,
Type: subItem.Type,
allMoney: subItem.RefundMoney,
balance: 0,
isChecked:subItem.isChecked,
Trade_Order:subItem.Trade_Order,
show: false
}
this.payMsgList.push(payMsg);
this.Calculation();
},
},created(){
if(this.$route.query.pageIndex){
this.pageIndex = this.$route.query.pageIndex;
......@@ -1721,6 +1814,30 @@ export default {
if(this.$route.query.Conditon){
this.returnCode = this.$route.query.Conditon;
}
},
watch : {
'choiceMsg.Status':function(val) {
if(val==1){
this.payMsgList.forEach((x,index)=>{
if(x.isChecked){
this.payMsgList.splice(index,1);
}
})
this.AuditOrRefundMsg.IsRefundAutoGoBack=0;
}else{
this.AuditOrRefundMsg.IsRefundAutoGoBack=1;
}
},
'AuditOrRefundMsg.Status':function(val){
if(val==3){
this.payMsgList.forEach((x,index)=>{
if(x.isChecked){
this.payMsgList.splice(index,1);
}
})
}
}
}
}
</script>
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