页面修改

src/components/LeaderManagement/leaderReimbursement.vue

@@ -112,6 +112,13 @@
         </td>
         <td>
           {{item.AirportPickUpStr}}
+          <template v-if="item.AirportPickUp==15 && item.MergeList && item.MergeList.length>0"
+            v-for="(subItem,subIndex) in item.MergeList">
+            <br v-show="subIndex==0" />
+            <span :key="subIndex" style="color:blue;">
+              {{subItem.MTCNUM}}({{subItem.MTCID}})
+            </span>
+          </template>
         </td>
         <td>
           {{item.CostPrice >= 0 && item.CostPrice !== null ? moneyFormat(item.CostPrice) : ''}}
@@ -124,7 +131,7 @@
           <span v-else-if="item.PayType === 6">合团公司支付</span>
           <span v-else-if="item.PayType === 8">酒店接送</span>
           <span v-else></span>
-          <br/>
+          <br />
           <span v-show="item.PayType==6">付款团号：{{item.PayTypeTCNUM}}</span>
         </td>
         <td>
@@ -228,7 +235,8 @@
               </template>
             </td>
             <td v-if="childIndex==0" :rowspan="6" style="text-align:left; ">
-              <a target="_blank" v-if="subItem.ContractUrl!==''" :href="subItem.ContractUrl" style="text-decoration: underline; cursor: pointer;color:red">查看手配书</a>
+              <a target="_blank" v-if="subItem.ContractUrl!==''" :href="subItem.ContractUrl"
+                style="text-decoration: underline; cursor: pointer;color:red">查看手配书</a>
             </td>
             <td v-if="childIndex==0" :rowspan="6" style="text-align:left;color:red; ">
               {{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}}
@@ -367,12 +375,12 @@
               <span v-else-if="subItem.DMCPayType === 9">月结</span>
               <span v-else-if="subItem.DMCPayType === 11">刷卡</span>
               <span v-else-if="subItem.DMCPayType === 10">领队导游垫付</span>
-              <br/>
+              <br />
               <span v-show="subItem.DMCPayType==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
             </td>
             <td v-if="childIndex==0" :rowspan="6">
               <span>{{subItem.SupplierName}}
-                <br/>
+                <br />
                 <template v-if="subItem.SupplierPayType !== 0">
                   <span v-if="subItem.SupplierPayType == 1">
                     现付
@@ -698,10 +706,9 @@
             <template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
               <input type="button" v-if="item.TeamType == 1 && index2==0" value="日当费" class="normalBtn"
                 @click="goZhiDan(item, 2)" />
-              <template  v-if="item.hideZDBtn && ContractUrlCount == 0" >
+              <template v-if="item.hideZDBtn && ContractUrlCount == 0">
                 <el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
-                  <input type="button" value="制单" class="normalBtn"
-                    @click="goZhiDan(item,0,leadr,cur)" />
+                  <input type="button" value="制单" class="normalBtn" @click="goZhiDan(item,0,leadr,cur)" />
                 </el-tooltip>
               </template>
               <template v-else-if="ContractUrlCount !== 0 && index2==0">
@@ -801,9 +808,11 @@
 </template>
 
 <script>
-import commonHotelInfo from "../commonPage/commonHotelInfo.vue";
-import { constants } from "os";
-export default {
+  import commonHotelInfo from "../commonPage/commonHotelInfo.vue";
+  import {
+    constants
+  } from "os";
+  export default {
     data() {
       return {
         isUpdate: "false",
@@ -864,15 +873,15 @@ export default {
         if (crId == 1) {
           //人民币
           calcPrice =
-          parseInt(price / 1000) > 0
-            ? parseInt(price / 1000) * 1000
-            : parseInt(price);
+            parseInt(price / 1000) > 0 ?
+            parseInt(price / 1000) * 1000 :
+            parseInt(price);
         } else {
           // 其他
           calcPrice =
-          parseInt(price / 10000) > 0
-            ? parseInt(price / 10000) * 10000
-            : parseInt(price);
+            parseInt(price / 10000) > 0 ?
+            parseInt(price / 10000) * 10000 :
+            parseInt(price);
         }
         this.$router.push({
           name: url,
@@ -939,8 +948,7 @@ export default {
       financeinfo_post_GetList() {
         // 币种类型
         this.apipost(
-        "financeinfo_post_GetList",
-        {
+          "financeinfo_post_GetList", {
             Name: ""
           },
           res => {
@@ -949,8 +957,7 @@ export default {
               data.forEach(item => {
                 this.currencyTypeObj[item.ID] = item.Name;
               });
-          } else {
-          }
+            } else {}
           },
           err => {}
         );
@@ -979,8 +986,7 @@ export default {
       },
       getzhuijiaList() {
         this.apipost(
-        "Financial_post_GetTravelFinanceReplenishList",
-        {
+          "Financial_post_GetTravelFinanceReplenishList", {
             TravelReplenish: this.$route.query.id
           },
           res => {
@@ -991,10 +997,9 @@ export default {
           err => {}
         );
       },
-    getHangingAccountByTCIDList: function() {
+      getHangingAccountByTCIDList: function () {
         this.apipost(
-        "Financial_post_GetHangingAccountByTCIDList",
-        {
+          "Financial_post_GetHangingAccountByTCIDList", {
             TCIDs: this.$route.query.id
           },
           res => {
@@ -1005,7 +1010,7 @@ export default {
           err => {}
         );
       },
-    goFncUrl: function(path, id) {
+      goFncUrl: function (path, id) {
         this.$router.push({
           name: path,
           query: {
@@ -1014,7 +1019,7 @@ export default {
           }
         });
       },
-    goHotelDetail: function(id, num, TCNUM, path) {
+      goHotelDetail: function (id, num, TCNUM, path) {
         this.$router.push({
           name: path,
           query: {
@@ -1025,7 +1030,7 @@ export default {
           }
         });
       },
-    goZhiDan2: function(obj, type, leadr, cur) {
+      goZhiDan2: function (obj, type, leadr, cur) {
         let TCIDARR = [obj.TCIDS];
         let orderObj = {
           OrderID: 0,
@@ -1060,7 +1065,7 @@ export default {
           }
         });
       },
-    goZhiDan: function(obj, num, leadr, cur) {
+      goZhiDan: function (obj, num, leadr, cur) {
         if (!num) {
           let totailMoney = Number(leadr.LeaderGetPriceT) + Number(cur.yiLing);
           if (totailMoney > leadr.PlanPrice)
@@ -1071,8 +1076,7 @@ export default {
         if (this.list.hotelNoSureInfo !== "") {
           this.$confirm(
               `${this.list.hotelNoSureInfo},是否去制单？`,
-          this.$t("tips.tips"),
-          {
+              this.$t("tips.tips"), {
                 confirmButtonText: this.$t("pub.sureBtn"),
                 cancelButtonText: this.$t("pub.cancelBtn"),
                 type: "warning"
@@ -1262,8 +1266,7 @@ export default {
       getNav() {
         let _this = this;
         this.apipost(
-        "dmcstatistics_post_GetHotelStaticsByTCIDs",
-        {
+          "dmcstatistics_post_GetHotelStaticsByTCIDs", {
             TCIDs: this.$route.query.id
           },
           res => {
@@ -1349,8 +1352,7 @@ export default {
       },
       getTotalNav() {
         this.apipost(
-        "dmcstatistics_post_GetNewPlanTotalPrice_V2",
-        {
+          "dmcstatistics_post_GetNewPlanTotalPrice_V2", {
             TCIDs: this.$route.query.id
           },
           res => {
@@ -1405,67 +1407,68 @@ export default {
       this.getzhuijiaList();
       this.financeinfo_post_GetList();
     }
-};
+  };
+
 </script>
 
 <style>
-.leaderReimbursementTableNav {
+  .leaderReimbursementTableNav {
     background: #d6cece;
     width: 100%;
     margin: 20px 0;
-}
+  }
 
-.leaderReimbursementTableNav tr th {
+  .leaderReimbursementTableNav tr th {
     background: #e6e6e6;
     height: 40px;
     font-size: 12px;
     color: #333;
-}
+  }
 
-.leaderReimbursementTableNav tr {
+  .leaderReimbursementTableNav tr {
     background: #fff;
     text-align: center;
     height: 40px;
     font-size: 12px;
-}
+  }
 
-.leaderReimbursementTableNav tr td {
+  .leaderReimbursementTableNav tr td {
     background: #fff;
     text-align: center;
     height: 20px;
     font-size: 12px;
-}
+  }
 
-.leaderReimbursementTableNav ._go_detail p {
+  .leaderReimbursementTableNav ._go_detail p {
     cursor: pointer;
     line-height: 25px;
-}
+  }
 
-.leaderReimbursementTable {
+  .leaderReimbursementTable {
     width: 100%;
     margin: 20px 0;
     border-collapse: collapse;
-}
+  }
 
-.leaderReimbursementTable tr th {
+  .leaderReimbursementTable tr th {
     background: #e6e6e6;
     height: 40px;
     font-size: 13px;
     color: #333;
     border: 1px solid #ccc;
     text-align: center;
-}
+  }
 
-.leaderReimbursementTable tr td {
+  .leaderReimbursementTable tr td {
     border: 1px solid #ccc;
     line-height: 25px;
     height: 25px;
     font-size: 12px;
     background: #fff;
     text-align: center;
-}
+  }
 
-.leader2Btn {
+  .leader2Btn {
     color: #fff;
     padding: 0 15px;
     height: 30px;
@@ -1473,191 +1476,192 @@ export default {
     border: 1px solid #e95252;
     cursor: pointer;
     border-radius: 15px;
-}
+  }
 
-.Receipt_box {
+  .Receipt_box {
     padding: 15px;
     color: #c94052;
     width: 614px;
     background-color: rgba(242, 242, 242, 1);
     border: 1px solid rgba(228, 228, 228, 1);
-}
+  }
 
-.Receipt_box.color_blur {
+  .Receipt_box.color_blur {
     color: #106baf;
-}
+  }
 
-.Receipt_box.color_blur .rb_stit span {
+  .Receipt_box.color_blur .rb_stit span {
     display: inline-block;
     border-bottom: 2px solid #106baf;
     padding: 0 20px;
-}
+  }
 
-.rb_tit {
+  .rb_tit {
     font-size: 18px;
     text-align: center;
-}
+  }
 
-.rb_stit {
+  .rb_stit {
     font-size: 14px;
     text-align: center;
-}
+  }
 
-.rb_stit span {
+  .rb_stit span {
     display: inline-block;
     border-bottom: 2px solid #c94052;
     padding: 0 20px;
-}
+  }
 
-.rb_top_row {
+  .rb_top_row {
     display: flex;
     justify-content: space-between;
     font-size: 12px;
-}
+  }
 
-.rb_top_row span._r_name {
+  .rb_top_row span._r_name {
     color: #333333;
-}
+  }
 
-.rb_top_row span._r_bold {
+  .rb_top_row span._r_bold {
     font-weight: bold;
-}
+  }
 
-.rb_top_row ._r_time span {
+  .rb_top_row ._r_time span {
     color: #333333;
-}
+  }
 
-._r_mb5 {
+  ._r_mb5 {
     margin-bottom: 5px;
-}
+  }
 
-.Receipt_table {
+  .Receipt_table {
     width: 100%;
     font-size: 14px;
     text-align: center;
-}
+  }
 
-.Receipt_table .th {
+  .Receipt_table .th {
     font-weight: 200 !important;
-}
+  }
 
-._r_mt10 {
+  ._r_mt10 {
     margin-top: 10px;
-}
+  }
 
-._bg__ {
+  ._bg__ {
     display: inline-block;
     padding: 2px 8px;
     color: white;
     border-radius: 4px;
-}
+  }
 
-._bg_red {
+  ._bg_red {
     background-color: #e95252;
-}
+  }
 
-._bg_green {
+  ._bg_green {
     background-color: #2bb87c;
-}
+  }
 
-.text_d {
+  .text_d {
     text-decoration: underline;
     cursor: pointer;
-}
+  }
 
-.PingFangSC {
+  .PingFangSC {
     font-weight: bold;
-}
+  }
 
-.Bill_par {
+  .Bill_par {
     position: relative;
-}
+  }
 
-tr._item_list {
+  tr._item_list {
     border-bottom: 1px solid #e5e5e5;
     height: 78px;
-}
+  }
 
-tr._item_list td {
+  tr._item_list td {
     border-bottom: 1px solid #e5e5e5;
     padding: 10px;
-}
+  }
 
-/* tr._t_head th{border-top: 1px solid #e5e5e5;} */
-tr._item_list td:first-child {
+  /* tr._t_head th{border-top: 1px solid #e5e5e5;} */
+  tr._item_list td:first-child {
     border-left: 1px solid #e5e5e5;
-}
+  }
 
-tr._item_list td:last-child {
+  tr._item_list td:last-child {
     border-right: 1px solid #e5e5e5;
-}
+  }
 
-._head_img {
+  ._head_img {
     width: 28px;
     height: 28px;
     border-radius: 50%;
     vertical-align: middle;
-}
+  }
 
-._btn_group {
+  ._btn_group {
     font-size: 14px;
-}
+  }
 
-.icon-daiqueren {
+  .icon-daiqueren {
     color: #4bca81;
-}
+  }
 
-.icon-yiqueren {
+  .icon-yiqueren {
     color: #4bca81;
-}
+  }
 
-.icon-yiquxiao {
+  .icon-yiquxiao {
     color: #959595;
-}
+  }
 
-.icon-shenhebohui {
+  .icon-shenhebohui {
     color: #e95252;
-}
+  }
 
-.icon-icon-zancun {
+  .icon-icon-zancun {
     color: #ff9c01;
-}
+  }
 
-.singeRowTable tr:hover {
+  .singeRowTable tr:hover {
     background-color: white;
-}
+  }
 
-._TradeWayList {
+  ._TradeWayList {
     padding: 5px 10px;
     background-color: #eeeeee;
     border-radius: 4px;
     margin: 10px 0;
     width: 230px;
-}
+  }
 
-._bold {
+  ._bold {
     font-weight: bold;
-}
+  }
 
-._bank_name,
-._bank_type {
+  ._bank_name,
+  ._bank_type {
     display: inline-block;
     background-color: #333333;
     color: white;
     padding: 2px 4px;
     border-radius: 4px;
     margin-left: 10px;
-}
+  }
 
-._bank_name {
+  ._bank_name {
     margin-left: 10px;
-}
+  }
 
-._bank_type {
+  ._bank_type {
     background-color: #2aaef2;
-}
+  }
 
-._bank_type2 {
+  ._bank_type2 {
     background-color: #ff9c01;
-}
+  }
+
 </style>