页面修改

src/components/LeaderManagement/leaderReimbursement.vue

@@ -236,7 +236,7 @@
             </td>
             <td style="white-space:nowrap; ">
               <span v-if="childItem.HouseType != 5">
-                {{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
+                {{subItem.PayStyle === 1||subItem.PayStyle === 11 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
               </span>
               <span v-else>
                 {{subItem.PayStyle === 1 && subItem.DMCPayType == 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
@@ -354,7 +354,6 @@
           <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==1">
             {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
           </span>
-          <!-- {{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}} -->
         </td>
       </tr>
     </table>
@@ -403,7 +402,7 @@
               </p>
             </td>
             <td>
-              {{subItem.PayStyle === 1 ? moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
+              {{subItem.PayStyle === 1||subItem.PayStyle === 11 ? moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
             </td>
             <td>
               {{childItem.DiscountPrice}}%
@@ -436,7 +435,6 @@
           <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==2">
             {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
           </span>
-          <!-- {{moneyFormat(TotalNav.reimburseTotalPrice.IncomeTotalPrice)}} -->
         </td>
       </tr>
     </table>
@@ -512,7 +510,6 @@
           <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==3">
             {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
           </span>
-          <!-- {{moneyFormat(TotalNav.reimburseTotalPrice.OtherTotalPrice)}} -->
         </td>
       </tr>
     </table>
@@ -565,7 +562,7 @@
             <span v-if="cur.CurrencyId>0"> ({{currencyTypeObj[cur.CurrencyId]}}) </span>
             </br></span>
         </td>
-        <td style="padding: 5px 20px;" >
+        <td style="padding: 5px 20px;">
           <div style="margin:10px 0" v-for="cur in CurrencyListMoney">
             <template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
               <p style="padding-left:20px;display:inline-block">
@@ -582,11 +579,14 @@
         </td>
         <td>
           <p v-for="(subItem, subIndex) in item.FinanceIds"><span class="cursorpointer text-decoration"
-              @click="goFncUrl('FinancialDocumentsDetail', subItem.FinanceId)" :style="{'color': subItem.Status == 3 ? 'red' : ''}">
+              @click="goFncUrl('FinancialDocumentsDetail', subItem.FinanceId)"
+              :style="{'color': subItem.Status == 3 ? 'red' : ''}">
               {{subItem.FinanceId}}({{subItem.Status == 3 ? '驳回' : subItem.Status == 2 ? '通过' : '审核中'}})</span>&nbsp;&nbsp;
-              <span v-if="subItem.Status == 3" class="cursorpointer text-decoration" @click="goFncEditUrl('addFinancialDocuments', subItem.CurrencyId, subItem.FinanceId)" style="color: red;">重新发起</span>&nbsp;&nbsp;<span
-              class="cursorpointer text-decoration" @click="goFncUrl('Application', subItem.FinanceId)"
-              v-if="subItem.IsPublic === 4">申请书</span> &nbsp;&nbsp;<span class="cursorpointer text-decoration"
+            <span v-if="subItem.Status == 3" class="cursorpointer text-decoration"
+              @click="goFncEditUrl('addFinancialDocuments', subItem.CurrencyId, subItem.FinanceId)"
+              style="color: red;">重新发起</span>&nbsp;&nbsp;<span class="cursorpointer text-decoration"
+              @click="goFncUrl('Application', subItem.FinanceId)" v-if="subItem.IsPublic === 4">申请书</span>
+            &nbsp;&nbsp;<span class="cursorpointer text-decoration"
               @click="goFncUrl('DebitNote', subItem.FinanceId)">借支单</span></p>
         </td>
         <td width="80" class="_zhidan">
@@ -610,7 +610,8 @@
         </th>
         <th :colspan="1" width="200">
           <div v-for="item in nav" style="margin: 10px 0;">
-            <input  type="button" :value="`${item.TCNUMS} 制单`" class="leader2Btn" @click="ZhuiJiaTuanKuan(item.OutBranchId)">
+            <input type="button" :value="`${item.TCNUMS} 制单`" class="leader2Btn"
+              @click="ZhuiJiaTuanKuan(item.OutBranchId)">
           </div>
         </th>
       </tr>
@@ -626,7 +627,7 @@
       </tr>
       <tr class="_item_list" v-for="(item,index) in zhuijiaList">
         <td class="Bill_par">
-          <span @click="goFncUrl('FinancialDocumentsDetail', item.FrID)" class="text_d PingFangSC" >{{item.FrID}}</span>
+          <span @click="goFncUrl('FinancialDocumentsDetail', item.FrID)" class="text_d PingFangSC">{{item.FrID}}</span>
         </td>
         <td>{{item.BranchName}}</td>
         <td><span class="_bg__" :class="item.Type==1 || item.Type==5?'_bg_green':'_bg_red'">{{item.TypeName}}</span>
@@ -653,10 +654,9 @@
           </template>
         </td>
         <td>
-          <p>{{item.Type==1 ? $t('fnc.yingshou') : $t('fnc.yingfu') }}：<span class="">{{moneyFormat(item.OriginalMoneyTotal)}}</span>
+          <p>{{item.Type==1 ? $t('fnc.yingshou') : $t('fnc.yingfu') }}：<span
+              class="">{{moneyFormat(item.OriginalMoneyTotal)}}</span>
           </p>
-          <!-- <p>{{item.Type==1 ? $t('fnc.shishou') : $t('fnc.shifu') }}：<span
-              class="">{{moneyFormat(item.OriginalMoneyTotal)}}</span></p> -->
         </td>
         <td>
           <template v-if='item.Type===1'>
@@ -686,7 +686,6 @@
         </el-carousel-item>
       </el-carousel>
     </div>
-
   </div>
 </template>
 
@@ -740,9 +739,9 @@
     },
     methods: {
       // 20190815 新增领款单据重新生成自动带上计算后的金额
-      goFncEditUrl(url, crId, frId){
+      goFncEditUrl(url, crId, frId) {
         let obj = {}
-        this.CurrencyListMoney.map(x=>{
+        this.CurrencyListMoney.map(x => {
           if (x.CurrencyId == crId) {
             obj = x
           }
@@ -750,13 +749,13 @@
         let price = obj.money * 0.95
         let calcPrice = 0
         if (crId == 1) { //人民币
-          calcPrice = parseInt(price/1000) > 0 ? parseInt(price/1000) * 1000 : parseInt(price)
+          calcPrice = parseInt(price / 1000) > 0 ? parseInt(price / 1000) * 1000 : parseInt(price)
         } else { // 其他
-          calcPrice = parseInt(price/10000) > 0 ? parseInt(price/10000) * 10000 : parseInt(price)
+          calcPrice = parseInt(price / 10000) > 0 ? parseInt(price / 10000) * 10000 : parseInt(price)
         }
         this.$router.push({
           name: url,
-          query:{
+          query: {
             "FrID": frId,
             "blank": 'y',
             "edit": true,
@@ -838,7 +837,8 @@
           Obj: {},
           SourceID: 0,
           TCIDList: TCIDARR,
-          TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this.$routequery.id,
+          TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this
+            .$routequery.id,
           OtherType: 1
         }
         this.$router.push({
@@ -1025,7 +1025,7 @@
           if (obj.TaxType == 2) {
             coefficient = 1 + 0.08;
           }
-          if (obj.PayStyle === 1) {
+          if (obj.PayStyle === 1 || obj.PayStyle === 11) {
             if (index == 4 && obj.DMCPayType !== 1) {
               totalPrice += 0;
             } else {
@@ -1044,7 +1044,7 @@
         obj.forEach(x => {
           totalPrice += x.PeoplePrice * (x.PeopleNum - x.Discount) * (1 - x.DiscountPrice / 100)
         })
-        if (sObj.PayStyle !== 1) {
+        if (!(sObj.PayStyle == 1 || sObj.PayStyle == 11)) {
           totalPrice = 0
         }
         return this.moneyFormat(totalPrice)
@@ -1191,7 +1191,6 @@
         this.apipost('dmcstatistics_post_GetNewPlanTotalPrice_V2', {
           TCIDs: this.$route.query.id
         }, res => {
-          // console.log("111",res);
           if (res.data.resultCode == 1) {
             this.TotalNav = res.data.data;
             this.getNav();