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

src/components/FinancialModule/addFinancialDocuments.vue

@@ -2409,7 +2409,7 @@ import SpecialList from '../SalesModule/SpecialList.vue';
             if (!isNaN(rate)) {
               let num = (numberC * price) * rate;
               num = Math.round(num * 100) / 100;
-              this.msg.detailList[i - 1].bTotalPrice = num;
+              this.msg.detailList[i - 1].bTotalPrice = num.toFixed(2);
               this.msg.detailList[i - 1].bTotalPriceTo = this.$commonUtils.addCommas(num)
             }
           }
@@ -2434,7 +2434,7 @@ import SpecialList from '../SalesModule/SpecialList.vue';
             if (!isNaN(rate)) {
               let num = (numberC * price) * rate;
               num = Math.round(num * 100) / 100;
-              this.detailList.bTotalPrice = num;
+              this.detailList.bTotalPrice = num.toFixed(2);
               this.detailList.bTotalPriceTo = this.$commonUtils.addCommas(num)
             }
           }
@@ -2697,7 +2697,7 @@ import SpecialList from '../SalesModule/SpecialList.vue';
                   if (!isNaN(rate)) {
                     let num = (numberC * price) * rate;
                     num = Math.round(num * 100) / 100;
-                    item.bTotalPrice = num;
+                    item.bTotalPrice = num.toFixed(2);
                     item.bTotalPriceTo = this.$commonUtils.addCommas(num)
                   }
                 }
@@ -2821,7 +2821,7 @@ import SpecialList from '../SalesModule/SpecialList.vue';
               x.rate = x.Rate;
               let num = (x.Number * x.UnitPrice) * x.Rate;
               num = Math.round(num * 100) / 100;
-              x.bTotalPrice = num;
+              x.bTotalPrice = num.toFixed(2);
               x.Money = Math.round(x.Money * 100) / 100;
 
               x.yTotalPriceTo = this.$commonUtils.addCommas(Math.round(x.yTotalPrice * 100) / 100);

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -2114,7 +2114,7 @@
             if (!isNaN(rate)) {
               let num = (numberC * price) * rate;
               num = Math.round(num * 100) / 100;
-              this.msg.detailList[i - 1].bTotalPrice = num;
+              this.msg.detailList[i - 1].bTotalPrice = num.toFixed(2);
               this.msg.detailList[i - 1].bTotalPriceTo = this.$commonUtils.addCommas(num);
             };
           }
@@ -2161,7 +2161,7 @@
             if (!isNaN(rate)) {
               let num = (numberC * price) * rate;
               num = Math.round(num * 100) / 100;
-              this.detailList.bTotalPrice = num;
+              this.detailList.bTotalPrice = num.toFixed(2);
               this.detailList.bTotalPriceTo = this.$commonUtils.addCommas(num);
             };
           }
@@ -2279,7 +2279,7 @@
               x.yTotalPrice = x.Number * x.UnitPrice;
               let num = (x.Number * x.UnitPrice) * x.Rate;
               num = Math.round(num * 100) / 100;
-              x.bTotalPrice = num;
+              x.bTotalPrice = num.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);

src/components/FinancialModule/components/BillModule.vue

@@ -182,9 +182,9 @@ export default {
             // x.Money = Math.round(x.Money * 100) / 100
             let FractionalPart = String(x.Money).split('.')
             if(FractionalPart.length>1&&FractionalPart[1].length>3&&FractionalPart[1].slice(3,4)>5){
-              x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(4))
+              x.Money = (x.Money).toFixed(2)//this.RoundItUp(parseFloat(x.Money).toFixed(4))
             }else{
-              x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(3))
+              x.Money = (x.Money).toFixed(2)//this.RoundItUp(parseFloat(x.Money).toFixed(3))
             }
             x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
             this.currentMoney += parseFloat(x.OriginalMoney);
@@ -202,9 +202,9 @@ export default {
               x.Money = x.Rate*x.OriginalMoney
               let FractionalPart = String(x.Money).split('.')
               if(FractionalPart.length>1&&FractionalPart[1].length>3&&FractionalPart[1].slice(3,4)>5){
-                x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(4))
+                x.Money = (x.Money).toFixed(2)//this.RoundItUp(parseFloat(x.Money).toFixed(4))
               }else{
-                x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(3))
+                x.Money = (x.Money).toFixed(2)//this.RoundItUp(parseFloat(x.Money).toFixed(3))
               }
 
               x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
@@ -220,36 +220,38 @@ export default {
            this.loading = true;
            this.apipost('Financial_post_GetDetail',{ID:id}, res => {
                if(res.data.resultCode == 1) {
-                   let data = res.data.data;
-                   let arrList = function(arr){
-                     arr.forEach(x=>{
-                       x.show = false
-                     })
-                   }
-                   arrList(data.DetailList)
-                   data.DetailList.forEach(x=>{
-                       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 = 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(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
-                   this.Financial_post_GetCostTypeList(data.TemplateId, data.type);
-                   if (id > 0) {
-                     let TCID = data.TCIDList.length > 0 ? data.TCIDList[0] : 0
-                     this.financeinfo_post_GetList(TCID);
-                   }
-                   this.calculation()
+                  let data = res.data.data;
+                  let arrList = function(arr){
+                    arr.forEach(x=>{
+                      x.show = false
+                    })
+                  }
+                  arrList(data.DetailList)
+                  data.DetailList.forEach(x=>{
+                      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 = 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(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
+                  this.Financial_post_GetCostTypeList(data.TemplateId, data.type);
+                  if (id > 0) {
+                    let TCID = data.TCIDList.length > 0 ? data.TCIDList[0] : 0
+                    this.financeinfo_post_GetList(TCID);
+                  }
+                  setTimeout(()=>{
+                    this.calculation()
+                  },300)
                }
            }, err => {})
        },

src/components/FinancialModule/components/ReceivablesModule.vue

@@ -148,9 +148,9 @@ export default {
 
             let FractionalPart = String(x.Money).split('.')
             if(FractionalPart.length>1&&FractionalPart[1].length>3&&FractionalPart[1].slice(3,4)>5){
-              x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(4))
+              x.Money = (x.Money).toFixed(2)//this.RoundItUp(parseFloat(x.Money).toFixed(4))
             }else{
-              x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(3))
+              x.Money = (x.Money).toFixed(2)//this.RoundItUp(parseFloat(x.Money).toFixed(3))
             }
 
             x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
@@ -170,9 +170,9 @@ export default {
 
               let FractionalPart = String(x.Money).split('.')
               if(FractionalPart.length>1&&FractionalPart[1].length>3&&FractionalPart[1].slice(3,4)>5){
-                x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(4))
+                x.Money = (x.Money).toFixed(2)//this.RoundItUp(parseFloat(x.Money).toFixed(4))
               }else{
-                x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(3))
+                x.Money = (x.Money).toFixed(2)//this.RoundItUp(parseFloat(x.Money).toFixed(3))
               }
 
               x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
@@ -210,7 +210,9 @@ export default {
                     this.benMoney2 = 0
                     this.loading=false
                     this.$set(this.$data,"GetDetail",data);
-                    this.calculation()
+                    setTimeout(()=>{
+                      this.calculation()
+                    },300)
                 }
             }, err => {})
         },

src/components/TravelContractConfirm.vue

@@ -702,7 +702,7 @@
                 <p>
                   7、旅游者委托旅行社代办旅游签证的，旅行社需收取一定数额的出境押金用于旅游者违反旅游行程时间滞留境外或逾期回国时，旅游者应当向旅行社承担由此造成损失，包括旅行社信誉或被停签的损失，一旦发生滞留境外或逾期回国、不配合旅行社销签的，旅行社将该押金用于赔偿损失，不予退还。该押金应于旅行社交付旅游者签证前<span>1</span>日内全额交纳。如未按时交纳该押金，旅行社有权停止交付旅游者签证并办理注销，费用不退还；如旅游者按期回国并销签后凭记载有入境记录的护照和登机牌向旅行社领回该押金。如未收取押金旅游者发生滞留、晚归或不配合销签的，旅行社有权向旅游者追偿由此造成的损失。
                 </p>
-                <p>8、旅游者同意选择下列第<span>A</span>种方式交付办理签证的材料及领取签证。</p>
+                <p>8、旅游者同意选择下列第<span>{{CtObj.C_SignType}}</span>种方式交付办理签证的材料及领取签证。</p>
                 <p>&nbsp;&nbsp;&nbsp;A、旅游者亲自现场领取。</p>
                 <p>&nbsp;&nbsp;&nbsp;B、旅游者委托第三人现场领取，第三人应持旅游者本人签字的授权委托书原件。</p>
                 <p>

src/components/TravelContractView.vue

@@ -491,7 +491,7 @@
                 <p>
                   7、旅游者委托旅行社代办旅游签证的，旅行社需收取一定数额的出境押金用于旅游者违反旅游行程时间滞留境外或逾期回国时，旅游者应当向旅行社承担由此造成损失，包括旅行社信誉或被停签的损失，一旦发生滞留境外或逾期回国、不配合旅行社销签的，旅行社将该押金用于赔偿损失，不予退还。该押金应于旅行社交付旅游者签证前<span>1</span>日内全额交纳。如未按时交纳该押金，旅行社有权停止交付旅游者签证并办理注销，费用不退还；如旅游者按期回国并销签后凭记载有入境记录的护照和登机牌向旅行社领回该押金。如未收取押金旅游者发生滞留、晚归或不配合销签的，旅行社有权向旅游者追偿由此造成的损失。
                 </p>
-                <p>8、旅游者同意选择下列第<span>A</span>种方式交付办理签证的材料及领取签证。</p>
+                <p>8、旅游者同意选择下列第<span>{{CtObj.C_SignType}}</span>种方式交付办理签证的材料及领取签证。</p>
                 <p>&nbsp;&nbsp;&nbsp;A、旅游者亲自现场领取。</p>
                 <p>&nbsp;&nbsp;&nbsp;B、旅游者委托第三人现场领取，第三人应持旅游者本人签字的授权委托书原件。</p>
                 <p>