Commit 056f45db authored by youjie's avatar youjie

no message

parent 3bfd9679
...@@ -1061,7 +1061,8 @@ ...@@ -1061,7 +1061,8 @@
</div> </div>
</template> </template>
</div> </div>
<div style="margin-top: 102px;" class="page_fdd" v-if="isShowAttachment&&GetDetail.IsUploadPic===1"> <!-- isShowAttachment&&GetDetail.IsUploadPic===1 -->
<div style="margin-top: 102px;" class="page_fdd">
<div v-if="saveMsg.length>0"> <div v-if="saveMsg.length>0">
<div class="_addUpload_box _addUpload_box_btm clearfix"> <div class="_addUpload_box _addUpload_box_btm clearfix">
<template v-for="(file,fIndex) in saveMsg"> <template v-for="(file,fIndex) in saveMsg">
......
...@@ -417,7 +417,8 @@ export default { ...@@ -417,7 +417,8 @@ export default {
BillMakingMsg: { BillMakingMsg: {
OtherType: 0, OtherType: 0,
StandardCurrencyName: "", StandardCurrencyName: "",
Money: 0 Money: 0,
IsUploadPic: 1,
}, },
rules:{ rules:{
HandFeeFrId: [{ HandFeeFrId: [{
...@@ -603,9 +604,16 @@ export default { ...@@ -603,9 +604,16 @@ export default {
let query = { let query = {
blank: "y", blank: "y",
tab: `新增${text}单据`, tab: `新增${text}单据`,
Name: 'PIC手配费月结收款单',
Type: type, Type: type,
id: 271,
orderObj: JSON.stringify(this.BillMakingMsg), orderObj: JSON.stringify(this.BillMakingMsg),
}; };
this.$router.push({
path: "/addReceivablesDocuments",
query
});
return
this.$store.commit("ChoiceAddFinancialDocuments"); this.$store.commit("ChoiceAddFinancialDocuments");
this.$router.push({ this.$router.push({
path: "/ChoiceAddFinancialDocuments", path: "/ChoiceAddFinancialDocuments",
......
...@@ -180,8 +180,7 @@ export default { ...@@ -180,8 +180,7 @@ export default {
x.Money = x.Rate*x.OriginalMoney x.Money = x.Rate*x.OriginalMoney
// x.Money = x.Money.toFixed(2) // x.Money = x.Money.toFixed(2)
// x.Money = Math.round(x.Money * 100) / 100 // x.Money = Math.round(x.Money * 100) / 100
x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(3))
x.Money = this.RoundItUp(x.Money)
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100 x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
this.currentMoney += parseFloat(x.OriginalMoney); this.currentMoney += parseFloat(x.OriginalMoney);
...@@ -197,8 +196,7 @@ export default { ...@@ -197,8 +196,7 @@ export default {
this.GetDetail.CashierDetail.forEach(x=>{ this.GetDetail.CashierDetail.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100) x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = x.Rate*x.OriginalMoney x.Money = x.Rate*x.OriginalMoney
x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(3))
x.Money = this.RoundItUp(x.Money)
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100 x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
Money1 = parseFloat(x.Money)*100 Money1 = parseFloat(x.Money)*100
......
...@@ -146,7 +146,7 @@ export default { ...@@ -146,7 +146,7 @@ export default {
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100) x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = x.Rate*x.OriginalMoney x.Money = x.Rate*x.OriginalMoney
x.Money = this.RoundItUp(x.Money) x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(3))
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100 x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
this.currentMoney += parseFloat(x.OriginalMoney); this.currentMoney += parseFloat(x.OriginalMoney);
...@@ -163,7 +163,7 @@ export default { ...@@ -163,7 +163,7 @@ export default {
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100) x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = x.Rate*x.OriginalMoney x.Money = x.Rate*x.OriginalMoney
x.Money = this.RoundItUp(x.Money) x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(3))
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100 x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
Money1 = parseFloat(x.Money)*100 Money1 = parseFloat(x.Money)*100
......
...@@ -120,8 +120,8 @@ export default { ...@@ -120,8 +120,8 @@ export default {
let crmUrl = ""; //crm API let crmUrl = ""; //crm API
let locationName = window.location.hostname; let locationName = window.location.hostname;
domainUrl = "http://192.168.10.25:8083"; // 刘东电脑 domainUrl = "http://192.168.10.25:8083"; // 刘东电脑
domainUrl = "http://192.168.10.128"; domainUrl = "http://192.168.10.226:8015"; //春姐
//domainUrl = "http://reborn.oytour.com"; // domainUrl = "http://reborn.oytour.com";
let crmLocalFileStreamDownLoadUrl = ""; let crmLocalFileStreamDownLoadUrl = "";
crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com"; crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
...@@ -138,7 +138,7 @@ export default { ...@@ -138,7 +138,7 @@ export default {
lxymallUrl = "https://erpmallapi.oytour.com"; lxymallUrl = "https://erpmallapi.oytour.com";
crmUrl = "http://testcrm.oytour.com" crmUrl = "http://testcrm.oytour.com"
} else if (locationName.indexOf('oytour') !== -1) { } else if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com"; domainUrl = "http://192.168.10.25:8083";
mallUrl = "https://mallapi.oytour.com"; mallUrl = "https://mallapi.oytour.com";
lxymallUrl = "https://erpmallapi.oytour.com"; lxymallUrl = "https://erpmallapi.oytour.com";
crmUrl = "http://crm.oytour.com" crmUrl = "http://crm.oytour.com"
...@@ -1718,7 +1718,7 @@ export default { ...@@ -1718,7 +1718,7 @@ export default {
Vue.prototype.RoundItUp = function (Money) { Vue.prototype.RoundItUp = function (Money) {
let FractionalPart = String(Money).split('.') let FractionalPart = String(Money).split('.')
if(FractionalPart&&FractionalPart[1]&&FractionalPart[1].length>2){ if(FractionalPart&&FractionalPart[1]&&FractionalPart[1].length>2){
return Money = (parseFloat(Money.toFixed(3))+0.001).toFixed(2) return Money = (parseFloat(Money)).toFixed(2) //(parseFloat(Money.toFixed(3))+0.001).toFixed(2)
}else{ }else{
return Money = Math.round(Money * 100) / 100 return Money = Math.round(Money * 100) / 100
} }
......
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