Commit 9891d11c authored by youjie's avatar youjie

no message

parent e8287ada
...@@ -168,7 +168,10 @@ ...@@ -168,7 +168,10 @@
<span slot="reference" class="_flow_chart">{{$t('fnc.liuchengtu')}}</span> <span slot="reference" class="_flow_chart">{{$t('fnc.liuchengtu')}}</span>
</el-popover> </el-popover>
<p class="rb_tit">{{BillName}} <p class="rb_tit">{{BillName}}
(<el-select filterable v-model='msg.RB_Branch_Id' ref='CostTypeId' @change="admin_get_DepartmentGetList(msg.RB_Branch_Id)" class="w120 _border_b_1"> (<el-select filterable v-model='msg.RB_Branch_Id' ref='CostTypeId'
@change="admin_get_DepartmentGetList(msg.RB_Branch_Id)"
class="w120 _border_b_1"
:disabled="orderObj&&orderObj.Rate?true:false">
<el-option v-for='item in companyList' <el-option v-for='item in companyList'
:label='item.BName' :label='item.BName'
:value='item.Id' :value='item.Id'
...@@ -336,7 +339,9 @@ ...@@ -336,7 +339,9 @@
<el-input v-model="da.UnitPrice" @input="chages($event)" type="text" :disabled="((msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 56 || msg.TemplateId == 53) && !ZhuiJiaTK) || (daIn === 0 && XSTC)" @keyup.native="checkPrice(da,'UnitPrice',true)" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></el-input> <el-input v-model="da.UnitPrice" @input="chages($event)" type="text" :disabled="((msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 56 || msg.TemplateId == 53) && !ZhuiJiaTK) || (daIn === 0 && XSTC)" @keyup.native="checkPrice(da,'UnitPrice',true)" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></el-input>
</td> </td>
<td height="26px"> <td height="26px">
<el-select filterable :disabled="detailCurrDis || (daIn === 0 && XSTC)" v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1"> <el-select filterable :disabled="detailCurrDis || (daIn === 0 && XSTC)"
v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')"
@change="getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1">
<el-option v-for='item in coinGetList' <el-option v-for='item in coinGetList'
:label='item.Name' :label='item.Name'
:value='item.ID' :value='item.ID'
...@@ -583,6 +588,7 @@ import myFlowChartModule from "./FinancialSubmodule/FlowChartModule.vue"; ...@@ -583,6 +588,7 @@ import myFlowChartModule from "./FinancialSubmodule/FlowChartModule.vue";
export default { export default {
data(){ data(){
return{ return{
yballPriceTo: 0,//原币合计
maxmoneyData:0, maxmoneyData:0,
detailCurrDis:false, detailCurrDis:false,
Description:"", Description:"",
...@@ -892,6 +898,7 @@ export default { ...@@ -892,6 +898,7 @@ export default {
e.target.value = (e.target.value.match(/^\d*(\.?\d{0,1})/g)[0]) || null e.target.value = (e.target.value.match(/^\d*(\.?\d{0,1})/g)[0]) || null
}, },
AddFinancial(z){ //保存 AddFinancial(z){ //保存
if(z){ if(z){
this.msg.Status = 0; this.msg.Status = 0;
}else{ }else{
...@@ -930,6 +937,17 @@ export default { ...@@ -930,6 +937,17 @@ export default {
this.msg.ReFinanceId2 = this.orderObj.ReFinanceId2?this.orderObj.ReFinanceId2:0; this.msg.ReFinanceId2 = this.orderObj.ReFinanceId2?this.orderObj.ReFinanceId2:0;
this.msg.ECOrderList = this.orderObj.ECOrderList?this.orderObj.ECOrderList:[]; this.msg.ECOrderList = this.orderObj.ECOrderList?this.orderObj.ECOrderList:[];
} }
if(this.orderObj&&this.orderObj.Rate&&this.orderObj.Money){
let yballPrice = 0
this.msg&&this.msg.detailList&&this.msg.detailList.forEach((item,i)=>{
yballPrice += Number(yballPrice+item.UnitPriceTo)
})
this.yballPriceTo = yballPrice
if(this.orderObj.Money!=this.yballPriceTo){
this.Error(`原币总金额必须等于${this.orderObj.Money}!`)
return
}
}
if(this.commissionObj){ if(this.commissionObj){
this.msg.OtherType = this.commissionObj.OtherType?this.commissionObj.OtherType:0; this.msg.OtherType = this.commissionObj.OtherType?this.commissionObj.OtherType:0;
this.msg.ReFinanceId = this.commissionObj.PeroidsId?this.commissionObj.PeroidsId:0; this.msg.ReFinanceId = this.commissionObj.PeroidsId?this.commissionObj.PeroidsId:0;
...@@ -1025,6 +1043,8 @@ export default { ...@@ -1025,6 +1043,8 @@ export default {
this.msg.OtherType=this.czmsg.OtherType; this.msg.OtherType=this.czmsg.OtherType;
this.msg.ReTCID=this.czmsg.ReTCID; this.msg.ReTCID=this.czmsg.ReTCID;
} }
console.log(this.allPriceTo,this.msg,'====--------')
this.apipost('Financial_post_Set',this.msg,res=>{ this.apipost('Financial_post_Set',this.msg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
//清除旅客名单数据 //清除旅客名单数据
...@@ -1065,7 +1085,6 @@ export default { ...@@ -1065,7 +1085,6 @@ export default {
this.$set(this.msg.detailList,i,this.msg.detailList[i]); this.$set(this.msg.detailList,i,this.msg.detailList[i]);
}, },
addList(t,i){ // 添加 addList(t,i){ // 添加
let list ={}; let list ={};
if(t==2&&i){ if(t==2&&i){
list = JSON.parse(JSON.stringify(this.msg.detailList[i-1])); list = JSON.parse(JSON.stringify(this.msg.detailList[i-1]));
...@@ -1201,7 +1220,6 @@ export default { ...@@ -1201,7 +1220,6 @@ export default {
this.msg.detailList[index].currenName = x.Name; this.msg.detailList[index].currenName = x.Name;
} }
} }
this.$forceUpdate(); this.$forceUpdate();
} }
}) })
...@@ -1329,15 +1347,23 @@ export default { ...@@ -1329,15 +1347,23 @@ export default {
this.coinGetList.forEach(x=>{ this.coinGetList.forEach(x=>{
if(x.ID==this.detailList.CurrencyId){ if(x.ID==this.detailList.CurrencyId){
this.detailList.currenName = x.Name this.detailList.currenName = x.Name
if(this.orderObj&&this.orderObj.Rate){
this.detailList.Rate = this.orderObj.Rate
}else{
this.detailList.Rate = x.Rate this.detailList.Rate = x.Rate
} }
}
this.msg&&this.msg.detailList&&this.msg.detailList.forEach((item,i)=>{ this.msg&&this.msg.detailList&&this.msg.detailList.forEach((item,i)=>{
if(item.CurrencyId==x.ID){ if(item.CurrencyId==x.ID){
item.currenName = x.Name item.currenName = x.Name
if(this.orderObj&&this.orderObj.Rate){
item.Rate = this.orderObj.Rate
}else{
item.Rate = x.Rate item.Rate = x.Rate
} }
numberC = parseFloat(item.Number); }
price = parseFloat(item.UnitPrice); price = parseFloat(item.UnitPrice);
rate = parseFloat(item.Rate); rate = parseFloat(item.Rate);
if(price==0){ if(price==0){
...@@ -1415,6 +1441,7 @@ export default { ...@@ -1415,6 +1441,7 @@ export default {
this.financeinfo_post_GetClientAccountListEdit(data.ClientType); this.financeinfo_post_GetClientAccountListEdit(data.ClientType);
this.Financial_post_GetCostTypeList(data.TemplateId,2); this.Financial_post_GetCostTypeList(data.TemplateId,2);
let allPrice = 0 let allPrice = 0
let yballPrice = 0
data.DetailList.forEach(x=>{ data.DetailList.forEach(x=>{
// 20190815 新增领款单据重新生成自动带上计算后的金额 // 20190815 新增领款单据重新生成自动带上计算后的金额
x.UnitPrice = this.$route.query.dijieEditMoney ? this.$route.query.dijieEditMoney : x.UnitPrice x.UnitPrice = this.$route.query.dijieEditMoney ? this.$route.query.dijieEditMoney : x.UnitPrice
...@@ -1436,6 +1463,11 @@ export default { ...@@ -1436,6 +1463,11 @@ export default {
x.currenName = y.Name; x.currenName = y.Name;
} }
}) })
if(this.orderObj&&this.orderObj.Rate){
x.rate = this.orderObj.Rate
}else{
x.rate = x.Rate;
}
this.msg.detailList.push(x); this.msg.detailList.push(x);
allPrice = allPrice+parseFloat(x.bTotalPrice); allPrice = allPrice+parseFloat(x.bTotalPrice);
}); });
...@@ -1443,6 +1475,7 @@ export default { ...@@ -1443,6 +1475,7 @@ export default {
this.allPriceTo =this.$commonUtils.addCommas(Math.round(this.allPrice* 100) / 100) this.allPriceTo =this.$commonUtils.addCommas(Math.round(this.allPrice* 100) / 100)
this.allPriceTocalc =Math.round(this.allPrice* 100) / 100 this.allPriceTocalc =Math.round(this.allPrice* 100) / 100
this.chinaAllPrice=this.$commonUtils.changeMoneyToChinese(this.allPrice) this.chinaAllPrice=this.$commonUtils.changeMoneyToChinese(this.allPrice)
this.BillName = data.CompanyName; this.BillName = data.CompanyName;
this.BillSonName = data.FinanceName; this.BillSonName = data.FinanceName;
...@@ -1759,6 +1792,8 @@ export default { ...@@ -1759,6 +1792,8 @@ export default {
this.coinGetList = res.data.data; this.coinGetList = res.data.data;
} }
}, err => {}) }, err => {})
}, },
mounted(){ mounted(){
...@@ -1811,7 +1846,6 @@ export default { ...@@ -1811,7 +1846,6 @@ export default {
} }
this.getCompany(); this.getCompany();
// this.admin_get_DepartmentGetList(); // this.admin_get_DepartmentGetList();
}, },
......
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