Skip to content

S
SuperMan
Commit 9f820bc8 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents 332193d8 55eb3fdf
Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 146 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 9f820bc8
......@@ -629,7 +629,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>{{Math.round(i.allMoney * 100) / 100}}</td>
</tr>
</template>
<tr @keyup.enter="addList()" v-if="choiceMsg.Status=='1'">
......@@ -864,7 +864,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>{{Math.round(i.allMoney * 100) / 100}}</td>
</tr>
</template>
<tr @keyup.enter="addList()" v-if="choiceMsg.Status=='1'">
......@@ -1303,7 +1303,7 @@ export default {
this.payMsgList.forEach(x=>{
allMoney+= parseFloat(x.allMoney);
})
this.allMoney = allMoney.toFixed(2);
this.allMoney = Math.round(allMoney * 100) / 100;
},
Financial_post_GetFinancLogList(){ // 获取单据日志
if(this.checkboxShow) return
......@@ -1498,7 +1498,7 @@ export default {
let fee = this.payMsgList[index].Fee,
Rate = this.payMsgList[index].Rate==0?1:this.payMsgList[index].Rate,
Money = this.payMsgList[index].OriginalMoney;
this.payMsgList[index].allMoney = (Money*Rate)+fee;
this.payMsgList[index].allMoney = Math.round(((Money*Rate)+fee) * 100) / 100;
} else {
this.payMsg.Fee = isNaN(parseFloat(this.payMsg.Fee))?0:parseFloat(this.payMsg.Fee);
this.payMsg.Rate = isNaN(parseFloat(this.payMsg.Rate))?0:parseFloat(this.payMsg.Rate);
......@@ -1506,7 +1506,7 @@ export default {
let fee = this.payMsg.Fee,
Rate = this.payMsg.Rate==0?1:this.payMsg.Rate,
Money = this.payMsg.OriginalMoney;
this.payMsg.allMoney = (Money*Rate)+fee;
this.payMsg.allMoney = Math.round(((Money*Rate)+fee) * 100) / 100;
}
},
......@@ -1517,7 +1517,7 @@ export default {
this.payMsgList[index].Account = x.allName;
console.log(x)
this.payMsgList[index].CurrenName =x.CurrencyName;
this.payMsgList[index].Rate = x.CurrencyRate?x.CurrencyRate:x.CurrentRate;
this.payMsgList[index].Rate = x.PayRate;
this.payMsgList[index].CurrencyId = x.CurrencyId;
this.payMsgList[index].balance = x.Initialbalance;
this.Calculation(1, index);
......@@ -1525,7 +1525,7 @@ export default {
this.payMsg.Account = x.allName;
console.log(x)
this.payMsg.CurrenName =x.CurrencyName;
this.payMsg.Rate = x.CurrencyRate?x.CurrencyRate:x.CurrentRate;
this.payMsg.Rate = x.PayRate;
this.payMsg.CurrencyId = x.CurrencyId;
this.payMsg.balance = x.Initialbalance;
this.Calculation();
......@@ -1819,12 +1819,12 @@ export default {
if(res.data.resultCode == 1) {
let data= res.data.data;
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)
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = Math.round(x.Money * 100) / 100
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
this.benMoney += parseFloat(x.Money);
})
data.Money = this.$commonUtils.addCommas(data.Money.toFixed(2))
data.Money = this.$commonUtils.addCommas( Math.round(data.Money * 100) / 100)
data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money)
this.FinancialFlowTemplate_post_GetProcessList(data.FrID,data.TemplateType)
if(data.VorcherInos.length>0){
......@@ -1950,7 +1950,7 @@ export default {
this.payMsgList.forEach(x=>{
total +=parseFloat(x.OriginalMoney);
})
this.allMoney = total.toFixed(2);
this.allMoney = Math.round(total * 100) / 100
},
//获取列表
getTuikuan(){
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 9f820bc8
......@@ -1165,12 +1165,12 @@ export default {
if(res.data.resultCode == 1) {
let data= res.data.data;
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)
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = Math.round(x.Money * 100) / 100
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
})
data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money)
data.Money = this.$commonUtils.addCommas(data.Money.toFixed(2))
data.Money = this.$commonUtils.addCommas( Math.round(data.Money * 100) / 100)
if(data.Status==2){
let len = data.AuditSteps.length - 1;
let sLen = data.AuditSteps[len].AuditRecordList[data.AuditSteps[len].AuditRecordList.length-1];
......
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ 9f820bc8
......@@ -362,19 +362,19 @@ export default {
if(res.data.resultCode == 1) {
let data= res.data.data;
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);
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = Math.round(x.Money * 100) / 100
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
this.currentMoney += parseFloat(x.OriginalMoney);
this.benMoney += parseFloat(x.Money);
})
this.currentMoney = this.currentMoney.toFixed(2);
this.benMoney = this.benMoney.toFixed(2);
this.currentMoney = Math.round(this.currentMoney * 100) / 100;
this.benMoney = Math.round(this.benMoney * 100) / 100;
this.$emit('headCallBack', this.currentMoney);
data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money)
data.ChinesePayMoney = this.$commonUtils.changeMoneyToChinese(data.PayMoney)
data.PayMoney = this.$commonUtils.addCommas(data.PayMoney.toFixed(2))
data.Money = this.$commonUtils.addCommas(data.Money.toFixed(2))
data.PayMoney = this.$commonUtils.addCommas(Math.round(data.PayMoney * 100) / 100)
data.Money = this.$commonUtils.addCommas(Math.round(data.Money * 100) / 100)
data.AuditSteps.reverse()
this.GetDetail = data;
console.log(this.GetDetail)
......
src/components/FinancialModule/FinancialSubmodule/CashierBillModule.vue
View file @ 9f820bc8
......@@ -144,18 +144,18 @@ export default {
let data= res.data.data;
let Money = 0;
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);
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100);
x.Money = Math.round(x.Money * 100) / 100;
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100;;
})
data.CashierDetail.forEach(y=>{
Money = Money+parseFloat(y.Money);
})
this.cnAllMoney = this.$commonUtils.changeMoneyToChinese(Money.toFixed(2));
this.allMoney = this.$commonUtils.addCommas(Money.toFixed(2));
this.cnAllMoney = this.$commonUtils.changeMoneyToChinese(Math.round(Money * 100) / 100);
this.allMoney = this.$commonUtils.addCommas(Math.round(Money * 100) / 100);
data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money);
data.Money = this.$commonUtils.addCommas(data.Money.toFixed(2));
data.Money = this.$commonUtils.addCommas(Math.round(data.Money * 100) / 100);
data.AuditSteps.reverse();
this.GetDetail = data;
this.loading=false;
......
src/components/FinancialModule/FinancialSubmodule/GZBillModule.vue
View file @ 9f820bc8
......@@ -380,18 +380,18 @@ export default {
if(res.data.resultCode == 1) {
let data= res.data.data;
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);
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = Math.round(x.Money * 100) / 100
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
this.currentMoney += parseFloat(x.OriginalMoney);
this.benMoney += parseFloat(x.Money);
})
this.currentMoney = this.currentMoney.toFixed(2);
this.benMoney = this.benMoney.toFixed(2);
this.currentMoney = Math.round(this.currentMoney * 100) / 100;
this.benMoney = Math.round(this.benMoney * 100) / 100;
data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money)
data.ChinesePayMoney = this.$commonUtils.changeMoneyToChinese(data.Money)
data.PayMoney = this.$commonUtils.addCommas(data.Money.toFixed(2))
data.Money = this.$commonUtils.addCommas(data.Money.toFixed(2))
data.PayMoney = this.$commonUtils.addCommas(Math.round(data.PayMoney * 100) / 100)
data.Money = this.$commonUtils.addCommas(Math.round(data.Money * 100) / 100)
data.AuditSteps.reverse()
this.GetDetail = data;
console.log(this.GetDetail)
......
src/components/FinancialModule/FinancialSubmodule/MergeBillModule.vue
View file @ 9f820bc8
......@@ -289,13 +289,13 @@
if(res.data.resultCode == 1) {
let data= res.data.data;
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)
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = Math.round(x.Money * 100) / 100
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
})
data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Merge.Money)
data.WBChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Merge.WBMoney)
data.Money = this.$commonUtils.addCommas(data.Money.toFixed(2))
data.Money = this.$commonUtils.addCommas(Math.round(data.Money * 100) / 100)
data.Merge.TradeDateV2 = new Date(data.Merge.TradeDateV2).Format('yyyy-MM-dd')
data.AuditSteps.reverse()
this.GetDetail = data;
......
src/components/FinancialModule/FinancialSubmodule/ReceivablesModule.vue
View file @ 9f820bc8
......@@ -347,19 +347,19 @@ export default {
let price = 0;
let rate = 0;
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);
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100);
x.Money = Math.round(x.Money * 100) / 100
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100;
this.currentMoney += parseFloat(x.OriginalMoney);
this.benMoney += parseFloat(x.Money);
})
this.currentMoney = this.currentMoney.toFixed(2);
this.benMoney = this.benMoney.toFixed(2);
this.currentMoney = Math.round(this.currentMoney * 100) / 100;
this.benMoney = Math.round(this.benMoney * 100) / 100;
// let m = data.PayMoney?data.PayMoney:data.Money;
data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money);
data.ChinesePayMoney = this.$commonUtils.changeMoneyToChinese(data.PayMoney)
data.PayMoney = this.$commonUtils.addCommas(data.PayMoney.toFixed(2))
data.Money = this.$commonUtils.addCommas(data.Money.toFixed(2));
data.PayMoney = this.$commonUtils.addCommas(Math.round(data.PayMoney * 100) / 100)
data.Money = this.$commonUtils.addCommas(Math.round(data.Money * 100) / 100);
data.AuditSteps.reverse();
this.GetDetail = data;
this.loading=false
......
src/components/FinancialModule/addCapitalAllocation.vue
View file @ 9f820bc8
......@@ -194,7 +194,7 @@
<span class="_lable">{{$t('hotel.hotel_Currency')}}：</span>
<el-input disabled="disabled" v-model='item.CurrencyName' class="w80 _border_b_1"></el-input>
<span class="_lable">{{$t('hotel.hotel_CurrentRate')}}：</span>
<el-input v-model='item.Rate' class="w60 _border_b_1"></el-input>
<el-input v-model='item.Rate' class="w60 _border_b_1" :disabled="true"></el-input>
<span class="_lable">{{$t('fnc.bwyue')}}：</span>
<el-input v-model='item.Money' class="w100 _border_b_1"></el-input>
</div>
......@@ -286,7 +286,7 @@
<span class="_lable">{{$t('hotel.hotel_Currency')}}：</span>
<el-input disabled="disabled" v-model='item.CurrencyName' class="w80 _border_b_1"></el-input>
<span class="_lable">{{$t('hotel.hotel_CurrentRate')}}：</span>
<el-input v-model='item.Rate' class="w60 _border_b_1"></el-input>
<el-input v-model='item.Rate' class="w60 _border_b_1" :disabled="true"></el-input>
<span class="_lable">{{$t('fnc.bwyue')}}：</span>
<el-input v-model='item.Money' class="w100 _border_b_1"></el-input>
</div>
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 9f820bc8
......@@ -317,7 +317,8 @@
</el-select>
</td>
<td height="26px">{{da.yTotalPrice}}</td>
<td height="26px"><el-input v-model="da.Rate" type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td>
<!-- @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" -->
<td height="26px"><el-input v-model="da.Rate" type="text" :disabled="true" class="w80 _border_b_1"></el-input></td>
<td height="26px">{{da.bTotalPrice}}</td>
<td height="26px"><el-input v-model="da.Remark" type="textarea" class="w80 _border_b_1"></el-input> <i @click="deleteRow(daIn,da)" class="_delete_row iconfont icon-img_delete_small"></i></td>
</tr>
......@@ -355,7 +356,8 @@
</el-select>
</td>
<td>{{detailList.yTotalPrice}}</td>
<td><el-input v-model="detailList.Rate" type="text" @blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input></td>
<!-- @blur="addList(1)" @change="Calculation(1)" -->
<td><el-input v-model="detailList.Rate" type="text" :disabled="true" class="w80 _border_b_1"></el-input></td>
<td>{{detailList.bTotalPrice}}</td>
<td><el-input v-model="detailList.Remark" type="textarea" @blur="addList(1)" class="w80 _border_b_1"></el-input></td>
</tr>
......@@ -955,7 +957,7 @@ export default {
allPrice = allPrice+parseFloat(x.bTotalPrice);
})
this.allPrice = allPrice;
this.allPriceTo =this.$commonUtils.addCommas(this.allPrice.toFixed(2))
this.allPriceTo =this.$commonUtils.addCommas(Math.round(this.allPrice* 100) / 100)
this.chinaAllPrice=this.$commonUtils.changeMoneyToChinese(this.allPrice)
this.detailList = {
ID:0,
......@@ -987,12 +989,12 @@ export default {
this.msg.detailList[i-1].UnitPrice='';
}
if(numberC&&price){
this.msg.detailList[i-1].UnitPriceTo = this.$commonUtils.addCommas(price.toFixed(2))
this.msg.detailList[i-1].UnitPriceTo = this.$commonUtils.addCommas(Math.round(price * 100) / 100)
this.msg.detailList[i-1].yTotalPrice = numberC*price;
this.msg.detailList[i-1].yTotalPriceTo = this.$commonUtils.addCommas(this.msg.detailList[i-1].yTotalPrice.toFixed(2));
this.msg.detailList[i-1].yTotalPriceTo = this.$commonUtils.addCommas(Math.round(this.msg.detailList[i-1].yTotalPrice* 100) / 100);
if(!isNaN(rate)){
let num = (numberC*price)*rate;
num = num.toFixed(2);
num = Math.round(num* 100) / 100;
this.msg.detailList[i-1].bTotalPrice = num;
this.msg.detailList[i-1].bTotalPriceTo = this.$commonUtils.addCommas(num)
}
......@@ -1006,12 +1008,12 @@ export default {
this.detailList.UnitPrice='';
}
if(numberC&&price){
this.detailList.UnitPriceTo = this.$commonUtils.addCommas(price.toFixed(2))
this.detailList.UnitPriceTo = this.$commonUtils.addCommas(Math.round(price * 100) / 100)
this.detailList.yTotalPrice = numberC*price;
this.detailList.yTotalPriceTo = this.$commonUtils.addCommas(this.detailList.yTotalPrice.toFixed(2));
this.detailList.yTotalPriceTo = this.$commonUtils.addCommas(Math.round(this.detailList.yTotalPrice* 100) / 100);
if(!isNaN(rate)){
let num = (numberC*price)*rate;
num = num.toFixed(2);
num = Math.round(num* 100) / 100;
this.detailList.bTotalPrice = num;
this.detailList.bTotalPriceTo = this.$commonUtils.addCommas(num)
}
......@@ -1039,11 +1041,11 @@ export default {
this.coinGetList.forEach(x=>{
if(x.ID==i){
if(t==1){
this.detailList.Rate=x.CurrentRate;
this.detailList.Rate = x.PayRate;
this.detailList.currenName = x.Name;
}else{
console.log(x)
this.msg.detailList[index].Rate =x.CurrentRate;
this.msg.detailList[index].Rate =x.PayRate;
this.msg.detailList[index].currenName = x.Name;
}
this.$forceUpdate();
......@@ -1201,18 +1203,17 @@ export default {
this.Financial_post_GetCostTypeList(data.TemplateId,2);
let allPrice = 0
data.DetailList.forEach(x=>{
x.UnitPriceTo = this.$commonUtils.addCommas(x.UnitPrice.toFixed(2));
x.UnitPriceTo = this.$commonUtils.addCommas(Math.round(x.UnitPrice* 100) / 100);
x.yTotalPrice = x.Number*x.UnitPrice;
x.rate = x.Rate;
let num = (x.Number*x.UnitPrice)*x.Rate;
num = num.toFixed(2);
num = Math.round(num* 100) / 100;
x.bTotalPrice = num;
console.log(x.Money, x.Money.toFixed(2))
x.Money = x.Money.toFixed(2);
x.Money = Math.round(x.Money* 100) / 100;
x.yTotalPriceTo = this.$commonUtils.addCommas(x.yTotalPrice.toFixed(2));
x.yTotalPriceTo = this.$commonUtils.addCommas(Math.round(x.yTotalPrice* 100) / 100);
x.bTotalPriceTo = this.$commonUtils.addCommas(num);
x.OriginalMoney = x.OriginalMoney.toFixed(2);
x.OriginalMoney = Math.round(x.OriginalMoney* 100) / 100;
x.show = false;
this.msg.detailList.push(x);
this.coinGetList.forEach(y=>{
......@@ -1223,7 +1224,7 @@ export default {
allPrice = allPrice+parseFloat(x.bTotalPrice);
});
this.allPrice = allPrice;
this.allPriceTo =this.$commonUtils.addCommas(this.allPrice.toFixed(2))
this.allPriceTo =this.$commonUtils.addCommas(Math.round(this.allPrice* 100) / 100)
this.chinaAllPrice=this.$commonUtils.changeMoneyToChinese(this.allPrice)
this.BillName = data.CompanyName;
this.BillSonName = data.FinanceName;
......
src/components/FinancialModule/addFinancialGZDocuments.vue
View file @ 9f820bc8
......@@ -988,7 +988,7 @@ export default {
}
})
this.allPrice = allPrice;
this.allPriceTo =this.$commonUtils.addCommas(this.allPrice.toFixed(2))
this.allPriceTo =this.$commonUtils.addCommas(Math.round(this.allPrice * 100) / 100)
this.chinaAllPrice=this.$commonUtils.changeMoneyToChinese(this.allPrice)
this.detailList = {
ID:0,
......@@ -1023,12 +1023,12 @@ export default {
this.msg.detailList[i-1].UnitPrice='';
}
if(numberC&&price){
this.msg.detailList[i-1].UnitPriceTo = this.$commonUtils.addCommas(price.toFixed(2))
this.msg.detailList[i-1].UnitPriceTo = this.$commonUtils.addCommas(Math.round(price * 100) / 100)
this.msg.detailList[i-1].yTotalPrice = numberC*price;
this.msg.detailList[i-1].yTotalPriceTo = this.$commonUtils.addCommas(this.msg.detailList[i-1].yTotalPrice.toFixed(2));
this.msg.detailList[i-1].yTotalPriceTo = this.$commonUtils.addCommas(Math.round(this.msg.detailList[i-1].yTotalPrice * 100) / 100);
if(!isNaN(rate)){
let num = (numberC*price)*rate;
num = num.toFixed(2);
num = Math.round(num * 100) / 100;
this.msg.detailList[i-1].bTotalPrice = num;
this.msg.detailList[i-1].bTotalPriceTo = this.$commonUtils.addCommas(num)
}
......@@ -1042,12 +1042,12 @@ export default {
this.detailList.UnitPrice='';
}
if(numberC&&price){
this.detailList.UnitPriceTo = this.$commonUtils.addCommas(price.toFixed(2))
this.detailList.UnitPriceTo = this.$commonUtils.addCommas(Math.round(price * 100) / 100)
this.detailList.yTotalPrice = numberC*price;
this.detailList.yTotalPriceTo = this.$commonUtils.addCommas(this.detailList.yTotalPrice.toFixed(2));
this.detailList.yTotalPriceTo = this.$commonUtils.addCommas(Math.round(this.detailList.yTotalPrice * 100) / 100);
if(!isNaN(rate)){
let num = (numberC*price)*rate;
num = num.toFixed(2);
num = Math.round(num * 100) / 100;
this.detailList.bTotalPrice = num;
this.detailList.bTotalPriceTo = this.$commonUtils.addCommas(num)
}
......@@ -1226,16 +1226,16 @@ export default {
this.Financial_post_GetCostTypeList(data.TemplateId,2);
let allPrice = 0
data.DetailList.forEach(x=>{
x.UnitPriceTo = this.$commonUtils.addCommas(x.UnitPrice.toFixed(2));
x.UnitPriceTo = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100);
x.yTotalPrice = x.Number*x.UnitPrice;
x.rate = x.Rate;
let num = (x.Number*x.UnitPrice)*x.Rate;
num = num.toFixed(2);
num = Math.round(num * 100) / 100;
x.bTotalPrice = num;
x.Money = x.Money.toFixed(2);
x.yTotalPriceTo = this.$commonUtils.addCommas(x.yTotalPrice.toFixed(2));
x.Money = Math.round(x.Money * 100) / 100;
x.yTotalPriceTo = this.$commonUtils.addCommas(Math.round(x.yTotalPrice * 100) / 100);
x.bTotalPriceTo = this.$commonUtils.addCommas(num);
x.OriginalMoney = x.OriginalMoney.toFixed(2);
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100;
x.show = false;
this.msg.detailList.push(x);
this.coinGetList.forEach(y=>{
......@@ -1246,7 +1246,7 @@ export default {
allPrice = allPrice+parseFloat(x.bTotalPrice);
});
this.allPrice = allPrice;
this.allPriceTo =this.$commonUtils.addCommas(this.allPrice.toFixed(2))
this.allPriceTo =this.$commonUtils.addCommas(Math.round(this.allPrice * 100) / 100)
this.chinaAllPrice=this.$commonUtils.changeMoneyToChinese(this.allPrice)
this.BillName = data.CompanyName;
this.BillSonName = data.FinanceName;
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 9f820bc8
......@@ -241,8 +241,8 @@
<span class="w80">{{da.currenName}}</span>
</td>
<td height="26px">{{da.yTotalPrice}}</td>
<!-- -->
<td height="26px"><el-input v-model="da.Rate" @change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" type="text" class="w80 _border_b_1"></el-input></td>
<!-- @change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" -->
<td height="26px"><el-input v-model="da.Rate" :disabled="true" type="text" class="w80 _border_b_1"></el-input></td>
<td height="26px">{{da.bTotalPrice}}</td>
<td height="26px"><el-input v-model="da.Remark" type="textarea" class="w80 _border_b_1"></el-input> <i @click="deleteRow(daIn,da)" class="_delete_row iconfont icon-img_delete_small"></i> </td>
</tr>
......@@ -273,7 +273,8 @@
<span class="w110">{{detailList.currenName}}</span>
</td>
<td>{{detailList.yTotalPrice}}</td>
<td><el-input v-model="detailList.Rate" @change="Calculation(1)" @blur="addList(1)" type="text" class="w80 _border_b_1"></el-input></td>
<!-- @change="Calculation(1)" @blur="addList(1)" -->
<td><el-input v-model="detailList.Rate" type="text" :disabled="true" class="w80 _border_b_1"></el-input></td>
<td>{{detailList.bTotalPrice}}</td>
<td><el-input v-model="detailList.Remark" @blur="addList(1)" type="textarea" class="w80 _border_b_1"></el-input></td>
</tr>
......@@ -825,7 +826,7 @@ export default {
if(this.msg.detailList.length>0&&this.msg.detailList[0].Rate&&this.msg.OriginalFee){
let r = parseFloat(this.msg.detailList[0].Rate);
let f = parseFloat(this.msg.OriginalFee);
this.msg.Fee = (r*f).toFixed(2);
this.msg.Fee = Math.round((r*f) * 100) / 100;
let allPrice = 0;
// this.msg.detailList.forEach(x=>{ //2019-02-01注释：页面手续费只需要计算一次，多个费用说明，重复计算 BY:W
// allPrice = allPrice+parseFloat(x.bTotalPrice)-parseFloat(this.msg.Fee);
......@@ -834,14 +835,14 @@ export default {
allPrice = allPrice+parseFloat(x.bTotalPrice);
})
allPrice =allPrice-parseFloat(this.msg.Fee);
this.allPrice = allPrice.toFixed(2);
this.allPriceTo =this.$commonUtils.addCommas(this.allPrice);
this.allPrice = Math.round(allPrice * 100) / 100;
this.allPriceTo = this.$commonUtils.addCommas(this.allPrice);
this.chinaAllPrice=this.$commonUtils.changeMoneyToChinese(this.allPrice);
this.$forceUpdate();
}else{
let r = 1;
let f = parseFloat(this.msg.OriginalFee);
this.msg.Fee = (r*f).toFixed(2);
this.msg.Fee = Math.round((r*f) * 100) / 100;
let allPrice = 0;
// this.msg.detailList.forEach(x=>{ //2019-02-01注释：页面手续费只需要计算一次，多个费用说明，重复计算 BY:W
......@@ -851,7 +852,7 @@ export default {
allPrice = allPrice+parseFloat(x.bTotalPrice);
})
allPrice =allPrice-parseFloat(this.msg.Fee);
this.allPrice = allPrice.toFixed(2);
this.allPrice = Math.round(allPrice * 100) / 100;
this.allPriceTo =this.$commonUtils.addCommas(this.allPrice);
this.chinaAllPrice=this.$commonUtils.changeMoneyToChinese(this.allPrice) ;
this.$forceUpdate();
......@@ -1150,7 +1151,7 @@ export default {
allPrice = allPrice+parseFloat(x.bTotalPrice);
})
this.allPrice = allPrice;
this.allPriceTo =this.$commonUtils.addCommas(this.allPrice.toFixed(2))
this.allPriceTo =this.$commonUtils.addCommas(Math.round(this.allPrice * 100) / 100)
this.chinaAllPrice=this.$commonUtils.changeMoneyToChinese(this.allPrice)
this.detailList = {
ID:0,
......@@ -1192,9 +1193,10 @@ export default {
this.msg.detailList[i-1].UnitPrice='';
};
if(numberC&&price){
this.msg.detailList[i-1].UnitPriceTo = this.$commonUtils.addCommas(price.toFixed(2))
// alert(1111)
this.msg.detailList[i-1].UnitPriceTo = this.$commonUtils.addCommas(Math.round(price * 100) / 100)
this.msg.detailList[i-1].yTotalPrice = numberC*price;
this.msg.detailList[i-1].yTotalPriceTo = this.$commonUtils.addCommas(this.msg.detailList[i-1].yTotalPrice.toFixed(2));
this.msg.detailList[i-1].yTotalPriceTo = this.$commonUtils.addCommas(Math.round(this.msg.detailList[i-1].yTotalPrice * 100) / 100);
if(this.msg.BankList[0].Type==2){
let id = this.msg.BankList[0].AccountId;
this.accountList.forEach(x=>{
......@@ -1204,10 +1206,11 @@ export default {
talPrice = talPrice+(parseFloat(y.Number)*parseFloat(y.UnitPrice))
});
let num = talPrice*(x.Commission/100);
this.msg.BankList[0].ybFee = num.toFixed(2);
this.msg.BankList[0].ybFee = Math.round(num * 100) / 100;
// alert(Math.round(num * 100) / 100)
if(!isNaN(rate)){
let num = talPrice*(x.Commission/100)*rate;
this.msg.BankList[0].bbFee = num.toFixed(2);
this.msg.BankList[0].bbFee = Math.round(num * 100) / 100;
}else{
this.msg.detailList[i-1].bbFee =0;
}
......@@ -1218,7 +1221,7 @@ export default {
}
if(!isNaN(rate)){
let num = (numberC*price)*rate;
num = num.toFixed(2);
num = Math.round(num * 100) / 100;
this.msg.detailList[i-1].bTotalPrice = num;
this.msg.detailList[i-1].bTotalPriceTo = this.$commonUtils.addCommas(num);
};
......@@ -1234,9 +1237,9 @@ export default {
this.detailList.UnitPrice='';
};
if(numberC&&price){
this.detailList.UnitPriceTo = this.$commonUtils.addCommas(price.toFixed(2));
this.detailList.UnitPriceTo = this.$commonUtils.addCommas(Math.round(price * 100) / 100);
this.detailList.yTotalPrice = numberC*price;
this.detailList.yTotalPriceTo = this.$commonUtils.addCommas(this.detailList.yTotalPrice.toFixed(2));
this.detailList.yTotalPriceTo = this.$commonUtils.addCommas(Math.round(this.detailList.yTotalPrice * 100) / 100);
if(this.msg.BankList[0].Type==2){
let id = this.msg.BankList[0].AccountId;
this.accountList.forEach(x=>{
......@@ -1249,10 +1252,10 @@ export default {
}
talPrice = talPrice+(parseFloat(this.detailList.Number)*parseFloat(this.detailList.UnitPrice))
let num = talPrice*(x.Commission/100);
this.msg.BankList[0].ybFee = num.toFixed(2);
this.msg.BankList[0].ybFee = Math.round(num * 100) / 100;
if(!isNaN(rate)){
let num = talPrice*(x.Commission/100)*rate;
this.msg.BankList[0].bbFee = num.toFixed(2);
this.msg.BankList[0].bbFee = Math.round(num * 100) / 100;
}else{
this.detailList.bbFee =0;
}
......@@ -1264,7 +1267,7 @@ export default {
}
if(!isNaN(rate)){
let num = (numberC*price)*rate;
num = num.toFixed(2);
num = Math.round(num * 100) / 100;
this.detailList.bTotalPrice = num;
this.detailList.bTotalPriceTo = this.$commonUtils.addCommas(num);
};
......@@ -1337,15 +1340,15 @@ export default {
this.Financial_post_GetCostTypeList(data.TemplateId,2);
let allPrice = 0
data.DetailList.forEach(x=>{
x.UnitPriceTo = this.$commonUtils.addCommas(x.UnitPrice.toFixed(2));
x.UnitPriceTo = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100);
x.yTotalPrice = x.Number*x.UnitPrice;
let num = (x.Number*x.UnitPrice)*x.Rate;
num = num.toFixed(2);
num = Math.round(num * 100) / 100;
x.bTotalPrice = num;
x.Money = x.Money.toFixed(2);
x.yTotalPriceTo = this.$commonUtils.addCommas(x.yTotalPrice.toFixed(2));
x.Money = Math.round(x.Money * 100) / 100;
x.yTotalPriceTo = this.$commonUtils.addCommas(Math.round(x.yTotalPrice * 100) / 100);
x.bTotalPriceTo = this.$commonUtils.addCommas(num);
x.OriginalMoney = x.OriginalMoney.toFixed(2);
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 10;
x.show = false;
this.msg.detailList.push(x);
this.coinGetList.forEach(y=>{
......@@ -1356,7 +1359,7 @@ export default {
allPrice = allPrice+parseFloat(x.bTotalPrice);
});
this.allPrice = allPrice;
this.allPriceTo =this.$commonUtils.addCommas(data.Money.toFixed(2))
this.allPriceTo =this.$commonUtils.addCommas(Math.round(data.Money * 100) / 100)
this.chinaAllPrice=this.$commonUtils.changeMoneyToChinese(data.Money)
this.BillName = data.CompanyName;
this.BillSonName = data.FinanceName;
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 9f820bc8
......@@ -117,7 +117,7 @@
<td>
<div class="w80">
<p class="pHouseStyle" v-for="o in subItem.OrderDetailsList">
<el-input class='w50 tcenter' @keyup.native="checkInteger(o,'HouseTypeCount')"
<el-input class='w50 tcenter' @keyup.native="checkPrice(o,'HouseTypeCount')"
v-model='o.HouseTypeCount'></el-input>
</p>
</div>
......@@ -392,12 +392,6 @@
});
this.calculationPrice(subItem);
subItem.OrderDetailsList.forEach((x, index1) => {
if (x.HouseTypeCount <= 0) {
x.HouseTypeCount = subItem.HouseStatistics.HouseTypeList[index1].HouseTypeCount
.toString();
} else {
x.HouseTypeCount = x.HouseTypeCount.toString();
}
x.HouseTypeCount = x.HouseTypeCount.toString();
x.UnitPrice = x.UnitPrice.toString();
x.HotelDiscount = x.HotelDiscount.toString();
......@@ -468,7 +462,7 @@
this.list.forEach(item => {
item.HotelOrderList.forEach(subItem => {
subItem.OrderDetailsList.forEach(y => {
y.HouseTypeCount = parseInt(y.HouseTypeCount);
y.HouseTypeCount = parseFloat(y.HouseTypeCount);
if(y.UnitPrice)
{
y.UnitPrice = parseInt(y.UnitPrice);
......@@ -501,7 +495,7 @@
this.list.forEach(item => {
item.HotelOrderList.forEach(subItem => {
subItem.OrderDetailsList.forEach(y => {
y.HouseTypeCount = parseInt(y.HouseTypeCount);
y.HouseTypeCount = parseFloat(y.HouseTypeCount);
y.UnitPrice = parseInt(y.UnitPrice);
y.HotelDiscount = parseInt(y.HotelDiscount);
if (y.BookNum == "") {
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 9f820bc8
......@@ -31,6 +31,10 @@
.TC_firTable td{height:20px!important;text-align: center!important;}
.TC_midTable td{text-align: center!important;}
.TC_showUnion{float:right;color:#2aaef2;cursor: pointer;margin-bottom:10px;}
.TCL_Content span{
display: inline-block;
margin-right:10px;
}
</style>
<template>
<div>
......@@ -59,6 +63,16 @@
</el-select>
</span>
</li>
<li>
<span>
<em>团控类型</em>
<el-select class="w150" v-model="queryMsg.FreePlanType" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option label="自由行" :value="1" :key="1"></el-option>
<el-option label="计划方案" :value="2" :key="2"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>团号</em>
......@@ -263,6 +277,7 @@
<div>
<div class="TC_teamType">
<span v-if="item.IsB2B==0" title="内部团">内</span>
<span v-if="item.FreePlan==1" title="计划方案">方</span>
</div>
<div class="TCL-OutBranchName" title="销售公司">{{item.OutBranchName}}</div>
<div class="TCL-TOPTCNUM">({{item.TCID}}) {{item.TCNUM}}</div>
......@@ -526,8 +541,8 @@
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown" class="TC-dropdown">
<el-dropdown-item @click.native="goToOpenTravel('TravelManager3',item.ID,0)">系列团修改</el-dropdown-item>
<el-dropdown-item @click.native="goToOpenTravel('TravelManager3',item.ID,item.TCID)">当团修改</el-dropdown-item>
<el-dropdown-item @click.native="goToOpenTravel('TravelManager5',item.ID,0)">系列团修改</el-dropdown-item>
<el-dropdown-item @click.native="goToOpenTravel('TravelManager5',item.ID,item.TCID)">当团修改</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary" style="background:#67c23a; border-color:#67c23a">广告&nbsp;{{item.AdvertCount}}</el-button>
......@@ -542,6 +557,9 @@
<el-dropdown-item @click.native="removeTeamInfo(item.TCID)">删除</el-dropdown-item>
<el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1" @click.native="setUpPlat(item)">上架</el-dropdown-item>
<el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">下架</el-dropdown-item>
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
{{$t('Operation.Op_jietuan')}}
</el-dropdown-item>
<el-dropdown-item @click.native="goB2B(item.ConfigId)">B2B预览</el-dropdown-item>
<el-dropdown-item @click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>分销联运</el-dropdown-item>
<el-dropdown-item @click.native='ckSellPoint(item)'>本团卖点</el-dropdown-item>
......@@ -550,7 +568,7 @@
</div>
</div>
</div>
<div class="TC_remarkContent" v-if="item.OPRemark||item.OPInnerRemark">
<div class="TC_remarkContent" v-if="item.OPRemark||item.OPInnerRemark||item.PriceTagList">
<div class="clearfix TCL-redType" v-if="item.OPRemark">
<div class="TCL_remarkTitle">OP对外备注：</div>
<div class="TCL_Content">{{item.OPRemark}}</div>
......@@ -559,6 +577,12 @@
<div class="TCL_remarkTitle">OP对内备注：</div>
<div class="TCL_Content">{{item.OPInnerRemark}}</div>
</div>
<div class="clearfix TCL-redType" v-if="item.PriceTagList.length>0">
<div class="TCL_remarkTitle">标签：</div>
<div class="TCL_Content">
<span v-for="chidItem in item.PriceTagList">{{chidItem.Content}}</span>
</div>
</div>
</div>
</li>
</ul>
......@@ -721,7 +745,9 @@
RateOn: "-1",
TeamType:1,//小包团
//是否显示联运
IsShowUnion: 1
IsShowUnion: 1,
//团控状态
FreePlanType:-1
},
remarkMsg: {
TCID: 0,
......@@ -874,6 +900,7 @@
});
}
});
console.log(this.queryCommonData.dataList,'dataList');
}
},
err => {}
......@@ -1273,7 +1300,24 @@
}else{
this.queryCommonData.UnionText = '显示联运'
}
}
},
//结团/正常
OutGroup(TCID, Status) {
let msg = {
TCID: TCID,
Status: Status,
}
this.apipost('travel_post_SetPriceStatus', msg, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.getControlList()
this.queryCommonData.checkDialogAll = false
this.queryCommonData.ckedplat = []
} else {
this.Info(res.data.message)
}
})
},
},
filters: {
formatStartDate(value) {
......
src/components/index.vue
View file @ 9f820bc8
......@@ -826,12 +826,12 @@
<button class="normalBtn" @click="updateTeamName">保存</button>
</div>
</el-dialog>
<el-dialog custom-class='w800' :title="dialogTitleNot" :visible.sync="outerVisibleNot" center :before-close="closeChangeMachie">
<el-dialog custom-class='w800 PingFangSC' :title="dialogTitleNot" :visible.sync="outerVisibleNot" center :before-close="closeChangeMachie">
<div>
<p style="text-align: right; padding: 5px 0;">{{detailMessage.EmName}}&nbsp;&nbsp;&nbsp;&nbsp;{{detailMessage.UpdateTime}}</p>
<pre style="letter-spacing: 1px; font-size: 14px; color: #333;">{{detailMessage.Content}}</pre>
<p style="text-align: right; padding: 5px 0;font-size: 12px;">{{detailMessage.EmName}}&nbsp;&nbsp;&nbsp;&nbsp;{{detailMessage.UpdateTime}}</p>
<pre style="letter-spacing: 1px; font-size: 14px; color: #333;line-height: 30px;">{{detailMessage.Content}}</pre>
<p style="padding:0 10px; margin: 10px 0; background: #f1f1f1;">{{$t('adm.adm_fujian')}}：</p>
<p style="height: 28px; padding: 0 10px; line-height: 28px;" v-for="item in downLoadList" class="AnnFileListPMeta">
<p style="height: 28px; padding: 0 10px; line-height: 28px; color: blue;" v-for="item in downLoadList" class="AnnFileListPMeta">
<i class="iconfont icon-xiazai"></i>--<span @click="downloadSingle(item)">{{item.Name}}</span>
</p>
</div>
......@@ -849,6 +849,7 @@
</div>
</div>
<a id='groupTourOrderByTuan_DownLoad' target="_blank" style="display:none"></a>
</div>
</template>
......@@ -1444,8 +1445,11 @@ export default {
},
methods: {
downloadSingle(obj){
let reg = /^http(s)?:\/\/(.*?)\//
this.downloadFileRename(obj.Url.replace(reg,''),obj.Name);
// let reg = /^http(s)?:\/\/(.*?)\//
// this.downloadFileRename(obj.Url.replace(reg,''),obj.Name);
let dom = document.querySelector("#groupTourOrderByTuan_DownLoad");
dom.href = obj.Url;
dom.click();
},
closeChangeMachie(done) { //弹出框关闭初始化弹框内表单
done();
......
src/components/public/leftNav.vue
View file @ 9f820bc8
......@@ -104,11 +104,11 @@
},
// 删除会计菜单
deleteFlash: function (item, index) {
item.IsShortcutMenu = item.IsShortcutMenu === 1 ? 2 : 1
this.ShortcutMenu.splice(index, 1)
this.apipost('admin_get_SetShortcutMenu', {MenuId: item.MenuId}, res=>{
if(res.data.resultCode == 1) {
console.log(res)
item.IsShortcutMenu = item.IsShortcutMenu === 1 ? 2 : 1
this.ShortcutMenu.splice(index, 1)
this.setLocalStorage(res.data.data)
this.getMenu()
}
......@@ -117,26 +117,26 @@
},
// 添加快捷菜单
addFlash: function (item, index, fIndex) {
item.IsShortcutMenu = item.IsShortcutMenu === 1 ? 2 : 1
if (item.IsShortcutMenu === 1) {
let repeat = false
this.ShortcutMenu.forEach(x=>{
if (x.MenuId===item.MenuId) {
repeat = true
}
})
if (!repeat) {
this.ShortcutMenu.push(item)
}
} else {
this.ShortcutMenu.forEach((x, index)=>{
if (x.MenuId===item.MenuId) {
this.ShortcutMenu.splice(index, 1)
}
})
}
this.apipost('admin_get_SetShortcutMenu', {MenuId: item.MenuId}, res=>{
if(res.data.resultCode == 1) {
item.IsShortcutMenu = item.IsShortcutMenu === 1 ? 2 : 1
if (item.IsShortcutMenu === 1) {
let repeat = false
this.ShortcutMenu.forEach(x=>{
if (x.MenuId===item.MenuId) {
repeat = true
}
})
if (!repeat) {
this.ShortcutMenu.push(item)
}
} else {
this.ShortcutMenu.forEach((x, index)=>{
if (x.MenuId===item.MenuId) {
this.ShortcutMenu.splice(index, 1)
}
})
}
this.setLocalStorage(res.data.data)
}
}, null)
......
src/components/systemManagement/currencyManagement.vue
View file @ 9f820bc8
......@@ -160,8 +160,8 @@
<th>{{$t('fnc.sfbenweibi')}}</th>
<th>{{$t('fnc.chushihuilv')}}</th>
<th>{{$t('fnc.benqihuilv')}}</th>
<th>现汇买入价</th>
<th>现钞买入价</th>
<th>现汇买入价</th>
<th>现钞卖出价</th>
<th>现汇卖出价</th>
<th>上调汇率</th>
......
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