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

src/components/LeaderManagement/leaderReimbursement.vue

@@ -546,15 +546,15 @@
           <!-- ({{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>
+            </br></span>
             
           </td>
         <td>{{item.TCNUMS}}</td>
         <td style="padding: 5px 20px;">
-          <div v-for="cur in CurrencyListMoney">
+          <div style="margin:10px 0" v-for="cur in CurrencyListMoney">
             <template v-for="leadr in cur.LeaderGetPriceArr">
-                <p style="padding-right: 20px;display:inline-block" v-if="leadr.LeaderGetPrice>0">已领款：
-                <span style="color: red;">{{moneyFormat(leadr.LeaderGetPrice)}}</span></p>
+                <p style="padding-left:20px;display:inline-block" v-if="leadr.LeaderGetPrice>0">已领款：
+                <span style="color: red;">{{moneyFormat(leadr.LeaderGetPrice)}}<span v-if="cur.CurrencyId>0"> ({{currencyTypeObj[leadr.CurrencyId]}}) </span></span></p>
                 <el-input class="w300" v-if="leadr.LeaderGetPrice < leadr.PlanPrice"
                 type="number" v-model="leadr.LeaderGetPriceT"></el-input>
             </template>  
@@ -571,10 +571,10 @@
               @click="goFncUrl('DebitNote', subItem.FinanceId)">借支单</span></p>
         </td>
         <td width="80" class="_zhidan">
-          <div v-for="(cur,index2) in CurrencyListMoney">
+          <div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney">
             <template v-for="leadr in cur.LeaderGetPriceArr">
               <input type="button" v-if="item.TeamType == 1 && index2==0" value="日当费" class="normalBtn" @click="goZhiDan(item, 2)" />
-              <input type="button" v-if="item.hideZDBtn" value="制单" class="normalBtn" @click="goZhiDan(item,0,leadr)" />
+              <input type="button"  v-if="item.hideZDBtn" value="制单" class="normalBtn" @click="goZhiDan(item,0,leadr)" />
             </template> 
             
           </div>
@@ -806,7 +806,6 @@ import { constants } from 'os';
         });
       },
       goZhiDan2: function (obj,type,leadr) {
-        console.log("leadr",leadr)
         if (leadr) {
           // let allMoney = this.TotalNav.reimburseTotalPrice.PlanPrice * 0.95
           let allMoney = leadr.PlanPrice;
@@ -1026,10 +1025,8 @@ import { constants } from 'os';
         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)
             let num = 0;
             nav.forEach(x => {
               x.CurrencyIdArr=[];
@@ -1103,7 +1100,7 @@ import { constants } from 'os';
             })
             
           })
-          console.log("CurrencyListMoney",this.CurrencyListMoney)
+          // console.log("CurrencyListMoney",this.CurrencyListMoney)
             this.nav = nav;
           } else {
             this.Error(res.data.message)