财务单据四舍五入，财务单据新增禁止修改汇率， 修改出纳付款汇率读取字段PayRate

src/components/FinancialModule/BasicDocuments.vue

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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)
                     }
@@ -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

@@ -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/index.vue

@@ -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

@@ -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)