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

src/components/LeaderManagement/leaderReimbursement.vue

@@ -114,14 +114,16 @@
           {{item.AirportPickUpStr}}
           <template v-if="item.AirportPickUp==15 && item.MergeList && item.MergeList.length>0"
             v-for="(subItem,subIndex) in item.MergeList">
-            <div :key="subIndex" style="color:blue;white-space:nowrap;cursor:pointer;text-decoration:underline;" @click="GoToLeader(subItem)">
+            <div :key="subIndex" style="color:blue;white-space:nowrap;cursor:pointer;text-decoration:underline;"
+              @click="GoToLeader(subItem)">
               套车团号：{{subItem.MTCNUM}}({{subItem.MTCID}})
             </div>
           </template>
 
-        <template v-if="item.MergePlanList && item.MergePlanList.length>0"
+          <template v-if="item.MergePlanList && item.MergePlanList.length>0"
             v-for="(subItem,subIndex) in item.MergePlanList">
-            <div :key="subIndex" style="color:blue;white-space:nowrap;cursor:pointer;text-decoration:underline;" @click="GoToLeader(subItem)">
+            <div :key="subIndex" style="color:blue;white-space:nowrap;cursor:pointer;text-decoration:underline;"
+              @click="GoToLeader(subItem)">
               被套车团号：{{subItem.MTCNUM}}({{subItem.TCIDs}})
             </div>
           </template>
@@ -388,15 +390,15 @@
               <span>{{subItem.SupplierName}}
                 <br />
                 <template v-if="subItem.SupplierPayType !== 0">
-                  <span v-if="subItem.SupplierPayType == 1">
-                    现付
-                  </span>
-                  <span v-else-if="subItem.SupplierPayType == 2">
-                    签单
-                  </span>
-                  <span v-else-if="subItem.SupplierPayType == 4">
-                    预付
-                  </span>
+                  <span v-if="subItem.SupplierPayType == 1"> 现付 </span>
+                  <span v-else-if="subItem.SupplierPayType == 2">签单</span>
+                  <span v-else-if="subItem.SupplierPayType == 3">实物抵扣</span>
+                  <span v-else-if="subItem.SupplierPayType == 4"> 预付</span>
+                  <span v-else-if="subItem.SupplierPayType == 5">预付款抵扣</span>
+                  <span v-else-if="subItem.SupplierPayType == 6">公司合团支付</span>
+                  <span v-else-if="subItem.SupplierPayType == 9">月结</span>
+                  <span v-else-if="subItem.SupplierPayType == 11">刷卡</span>
+                  <span v-else-if="subItem.SupplierPayType == 10">领队导游垫付</span>
                 </template>
               </span>
               <div v-if="subItem.IsHaveShouPeiFee==0" style="color:red;">无手配费</div>

src/components/TravelContractConfirm.vue

@@ -81,8 +81,8 @@
     border-radius: 15px;
     margin-left: 10px;
 }
-.TCdiv_content .isShowSign{
-    z-index: 999;
+.TcConfirmMain .isShowSign{
+    z-index: 999!important;
 }
 .CisHideen{
     display: none;
@@ -341,7 +341,7 @@
 </style>
 
 <template>
-    <div>
+    <div class="TcConfirmMain">
 
         <template v-if="CtObj.CType==1">
              <div class="TCdiv_content" :class="dialogVisible?'CisHideen':''">