酒店关联团

src/components/LeaderManagement/leaderReimbursement.vue

@@ -242,7 +242,7 @@
               </p>
             </td>
             <td style="white-space:nowrap; ">
-              {{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
+              {{subItem.PayStyle === 1 && subItem.DMCPayType !== 9 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
             </td>
             <td v-if="childIndex==0" :rowspan="6">
               <template v-if="subItem.RebateType==1">

src/components/TravelManager/TravelList/HotelOrderTotal.vue

@@ -562,8 +562,8 @@ export default {
       }
     },
     queren(type, OrderID){
-      let text = type == 1 ? '确认' : '取消'
-      this.$confirm('确定“'+ text +'”订单？', this.$t('tips.tips'), {
+      let text = type == 1 ? '确认后，订单不会自动取消' : '取消后，订单会自动取消'
+      this.$confirm(text, this.$t('tips.tips'), {
           confirmButtonText: this.$t('pub.sureBtn'),
           cancelButtonText: this.$t('pub.cancelBtn'),
           type: 'warning'
@@ -690,25 +690,26 @@ export default {
    },
    //点击收款
    getShouKuan(obj){
-        let orderObj = {
-          OrderID:obj.OrderID,
-          OrderSource:1,
-          Obj: {},
-          SourceID:null,
-          TCIDList: []
+     let TCIDARR = obj.TCID ? [obj.TCID] : [];
+      let orderObj = {
+        OrderID:obj.OrderID,
+        OrderSource:1,
+        Obj: {},
+        SourceID:null,
+        TCIDList: TCIDARR
+      }
+      this.$router.push({
+        name: 'ChoiceAddFinancialDocuments',
+        query:{
+          "Type":1,
+          "companyID":obj.RB_Branch_id,
+          "path": "",
+          'blank':'y',
+          'orderObj':JSON.stringify(orderObj),
+          'tradeWay':1,
+          'platformAccount':0
         }
-        this.$router.push({
-          name: 'ChoiceAddFinancialDocuments',
-          query:{
-            "Type":1,
-            "companyID":obj.RB_Branch_id,
-            "path": "",
-            'blank':'y',
-            'orderObj':JSON.stringify(orderObj),
-            'tradeWay':1,
-            'platformAccount':0
-          }
-        });
+      });
    }
   },
   mounted() {