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

src/components/LeaderManagement/leaderReimbursement.vue

@@ -543,7 +543,10 @@
       <tr v-for='(item, index) in nav'>
         <td :rowspan="nav.length" width="180" v-if="index===0">总金额：
           <!-- {{moneyFormat(TotalNav.reimburseTotalPrice.PlanPrice)}} -->
-          <span v-for="(cur,index) in CurrencyListMoney" :key="index+5000">{{cur.money}}&nbsp;&nbsp;</span>
+          <!-- ({{currencyTypeObj.}}) -->
+          <span v-for="(cur,index) in CurrencyListMoney" :key="index+5000">{{cur.money}}
+            <span v-if="cur.CurrencyId>0"> ({{currencyTypeObj[cur.CurrencyId]}}) </span>
+            &nbsp;&nbsp;</span>
             
           </td>
         <td>{{item.TCNUMS}}</td>
@@ -678,6 +681,7 @@
 
 <script>
   import commonHotelInfo from "../commonPage/commonHotelInfo.vue";
+import { constants } from 'os';
   export default {
     data() {
       return {
@@ -715,12 +719,25 @@
           colspanLength: 6 //跨行
         },
         CurrencyListMoney:[],
+        currencyTypeObj:[],
       }
     },
     components: {
       commonHotelInfo
     },
     methods: {
+      financeinfo_post_GetList(){  // 币种类型
+            this.apipost('financeinfo_post_GetList',{Name:''},res=>{
+                if(res.data.resultCode==1){
+                    let data=res.data.data;
+                    data.forEach(item=>{
+                      this.currencyTypeObj[item.ID]=item.Name;
+                    })
+                }else{
+
+                }
+            },err=>{})
+      },
       ZhuiJiaTuanKuan(){
         let TCIDARR = [this.$route.query.id]
         let orderObj = {
@@ -1009,9 +1026,10 @@
         this.apipost('dmcstatistics_post_GetHotelStaticsByTCIDs', {
           TCIDs: this.$route.query.id
         }, res => {
+          console.log("nav",res)
           if (res.data.resultCode == 1) {
             let nav = res.data.data.list;
-            // console.log("nav",nav)
+            console.log("nav",nav)
             let num = 0;
             nav.forEach(x => {
               x.CurrencyIdArr=[];
@@ -1053,43 +1071,8 @@
                 this.CurrencyListMoney.push(obj);
               })
               
-              // console.log("CurrencyListMoney",this.CurrencyListMoney)
+              
             }
-            //TotalNav
-            // nav.forEach((x,i) => {
-            //   x.LeaderGetPriceArr=[];
-            //   x.CurrencyIdArr.forEach(id=>{
-            //     let obj={
-            //       CurrencyId:0,
-            //       LeaderGetPrice:0
-            //     };
-            //     x.LeaderGetPriceList.forEach(price=>{
-            //       if(price.CurrencyId==id){
-            //         console.log("price",price)
-            //         obj.CurrencyId=price.CurrencyId;
-            //         obj.LeaderGetPrice+=price.OrderMakingPrice;
-            //       }
-            //     })
-            //     x.LeaderGetPriceArr.push(obj);
-                
-            //   })
-            //   console.log("x.LeaderGetPriceArr",x.LeaderGetPriceArr)
-            //   x.LeaderGetPriceArr.forEach(lead=>{
-            //     this.CurrencyListMoney.forEach(cur=>{
-            //       if(lead.CurrencyId==cur.CurrencyId){
-            //         if (i === 0) {
-            //           lead.LeaderGetPriceT = Math.floor(((cur.money * 0.95) - lead.LeaderGetPrice) *100) / 100;
-            //           lead.PlanPrice=cur.money * 0.95;
-            //         } else {
-            //           lead.LeaderGetPriceT = 0;
-            //           lead.PlanPrice=cur.money * 0.95;
-            //         }
-            //       }
-                
-            //   })
-            //   })
-            // })
-
           
           this.CurrencyListMoney.forEach((cur,i)=>{
             cur.LeaderGetPriceArr=[];
@@ -1120,7 +1103,7 @@
             })
             
           })
-          console.log("this.CurrencyListMoney",this.CurrencyListMoney)
+          console.log("CurrencyListMoney",this.CurrencyListMoney)
             this.nav = nav;
           } else {
             this.Error(res.data.message)
@@ -1166,6 +1149,7 @@
       this.getTotalNav();
       this.getHangingAccountByTCIDList()
       this.getzhuijiaList()
+      this.financeinfo_post_GetList();
     }
   }