1 酒店制单控制

src/components/FinancialModule/addFinancialDocuments.vue

@@ -2197,18 +2197,18 @@ import SpecialList from '../SalesModule/SpecialList.vue';
           confirmMsg.push(this.$t('objFill.chongqizdssfblts'));
         }
 
-        if (this.msg.HelpBranchId > -1) {
-          let that = this
-          let brandName = this.$t('objFill.querenypu');
-          this.companyList.forEach(item => {
-            if (item.Id == this.msg.HelpBranchId) {
-              brandName += item.BName;
-            }
-          });
-          brandName += (this.$route.query.Type == 1 ? this.$t('objFill.daishou') : this.$t('objFill.daifu')) + this.$t(
-            'objFill.cibikuanxianbmbh');
-          confirmMsg.push(brandName);
-        }
+        // if (this.msg.HelpBranchId > -1) {
+        //   let that = this
+        //   let brandName = this.$t('objFill.querenypu');
+        //   this.companyList.forEach(item => {
+        //     if (item.Id == this.msg.HelpBranchId) {
+        //       brandName += item.BName;
+        //     }
+        //   });
+        //   brandName += (this.$route.query.Type == 1 ? this.$t('objFill.daishou') : this.$t('objFill.daifu')) + this.$t(
+        //     'objFill.cibikuanxianbmbh');
+        //   confirmMsg.push(brandName);
+        // }
         if (confirmMsg && confirmMsg.length > 0) {
           let title = z ? this.$t('fnc.zancun') : this.$t('fnc.tijiao')
           const h = this.$createElement
@@ -2256,16 +2256,6 @@ import SpecialList from '../SalesModule/SpecialList.vue';
                 }
               })
             }).catch(() => {
-              if (this.orderObj && (this.orderObj.EduCommissionEmp || this.orderObj.queryObj)) {
-                location.reload()
-                this.$router.push({
-                  name: 'leaderReimbursement',
-                  query: {
-                    ...this.orderObj.queryObj,
-                    'blank': 'y',
-                  }
-                });
-              } else {
                 this.$router.push({
                   name: 'FinancialDocuments',
                   query: {
@@ -2273,7 +2263,6 @@ import SpecialList from '../SalesModule/SpecialList.vue';
                     'InPay': this.$route.query.InPay
                   }
                 });
-              }
             });
           } else {
             this.resultCode = res.data.resultCode;
@@ -2740,7 +2729,10 @@ import SpecialList from '../SalesModule/SpecialList.vue';
         this.apipost('Financial_post_Get', {
           ID: id,
           TempId: tempId,
-          TCIDList: (this.orderObj && this.orderObj.TCIDList) ? this.orderObj.TCIDList : []
+          TCIDList: (this.orderObj && this.orderObj.TCIDList) ? this.orderObj.TCIDList : [],
+          DMCOrderId: this.orderObj && this.orderObj.EduCommissionEmp ? this.orderObj.EduCommissionEmp :"",
+          OrderSource: this.orderObj && this.orderObj.OrderSource ? this.orderObj.OrderSource :0,
+          BranchId: this.$route.query.companyID
         }, res => {
           if (res.data.resultCode == 1) {
             let data = res.data.data;

src/components/Hotel/roomStatic.vue

@@ -291,8 +291,8 @@
               @click="goUrl('roomSure',subItem,dayItem.DayStr,'订房管理')"
               style="cursor:pointer;text-decoration:underline;"
               :class="subItem.InventoryType==4 ? 'stock1' : 'stock2'">{{$t('hotel.hotel_roomUsed')}}:
-              {{subItem.UseInventory}}</a>
-            <span v-else>{{$t('hotel.hotel_roomUsed')}}: {{subItem.UseInventory}}</span>
+              {{subItem.UseInventory}} {{(subItem.UseAmount>0?'['+$t('objFill.shanke')+']':'')}}</a>
+            <span v-else>{{$t('hotel.hotel_roomUsed')}}: {{subItem.UseInventory}} {{(subItem.UseAmount>0?'['+$t('objFill.shanke')+']':'')}}</span>
             )
           </p>
         </div>

src/components/dmc/manager/dmcTotalTable.vue

@@ -1405,6 +1405,7 @@
           query: {
             "id": obj.TCIDS,
             'TCNUM': obj.TCNUMS,
+            'OutBranchId': obj.OutBranchId,
             'flightTotal': obj.TotalSeat,
             'GuestNum': obj.OrderGuestNum,
             'NewCombinationNum': outItem.NewCombinationNum,

src/components/dmc/manager/teamRevenueExpenditure.vue

@@ -38,11 +38,12 @@
     </table>
     <p class="teamRevenueExpenditureTitle">
       {{$t('hotel.hotel')}}
-      <span class="fr" style="margin-top: -8px;">
+      <span class="fr" style="margin-top: -8px;" v-if="IsJapanLine==false">
         <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(1,2)" /><input type="button" class="normalBtn"
           :value="$t('objFill.xingzengshouk')" @click="goUrl(1,1)" />
         <input type="button" class="normalBtn" :value="$t('objFill.precharge')" @click="isOffset(1,2)" />
       </span>
+      <span class="fr" style="margin-top: -8px;" v-else> *酒店请至地接总表订房管理制单</span>
     </p>
     <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
       <tr>
@@ -395,7 +396,8 @@
         IsPrerealContrast: false,
         PrerealContrastMsg:'',
         PrerealContrastOfferId:0,
-        roomZeroNum: 0
+        roomZeroNum: 0,
+        IsJapanLine: false
       }
     },
     methods: {
@@ -728,6 +730,7 @@
       this.getTuanMsg()
       let userInfo = this.getLocalStorage();
       if(userInfo.RB_Group_id==2 && this.LineId==14){
+        this.IsJapanLine=true;//日本线 酒店制单特殊处理
         this.getTravelPrerealContrast(); 
       }
     }