新增分房表上传下载

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -490,6 +490,9 @@
                     <a style="cursor:pointer;"
                       :href="domainManager().ViittoFileUrl+item.WordPath">{{$t('Operation.Op_downLoadword')}}</a>
                   </p>
+                  <p class="travelnowrap" v-if="item.FenFangUrl!=''">
+                      <a style="cursor:pointer;color:blue;" title="点击下载已上传的分房表文件" v-if="item.FenFangUrl && item.FenFangUrl!=''" :href="item.FenFangUrl">分房表下载</a>
+                  </p>
                   <p class="travelnowrap" v-if="item.ClearOrderHour>0">
                     <span>同行清位时间</span>
                     <span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
@@ -507,7 +510,6 @@
                         <span class="price" style="cursor:pointer;text-decoration:underline;">酒店预订状况</span> <span
                           style="color: #e95252">op{{item.OpSureHouse==2 ? '已确认' : '未确认'}}分房</span>
                       </div>
-
                     </el-popover>
                   </p>
                   <p class="travelnowrap" v-if="item.LineID==14 && item.IsOpenHotel==1">
@@ -805,8 +807,11 @@
                       </el-dropdown-item>
                       <el-dropdown-item @click.native='ckSellPoint(item)'>{{$t('Operation.Op_bentuanMaidian')}}
                       </el-dropdown-item>
-                      <el-dropdown-item @click.native='ShowUploadWord(item)'>{{$t('Operation.Op_wordTrip')}}
+                      <el-dropdown-item @click.native='ShowUploadWord(item,1)'>{{$t('Operation.Op_wordTrip')}}
+                      </el-dropdown-item>
+                      <el-dropdown-item @click.native='ShowUploadWord(item,2)'>上传分房表
                       </el-dropdown-item>
+                      
                       <el-dropdown-item>
                         <div v-if="item.ScoreNum >= 0" @click='goInvetig("investigationList", item.TCID, 0)'>查看旅客调查
                         </div>
@@ -816,6 +821,7 @@
                       </el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
+                  
                 </div>
               </div>
             </div>
@@ -906,7 +912,8 @@
     </div>
     <div class="combottomDiv OPremarkDiv" v-if="queryCommonData.UploadWORDTip"
       v-loading="queryCommonData.uploadLoading">
-      <div class="combottomTitle">{{$t('Operation.Op_scTrip')}}
+      <div class="combottomTitle"><template v-if="queryCommonData.UploadItem.Type==1"> {{$t('Operation.Op_scTrip')}}</template>
+      <template v-else> 上传分房表</template>
         <button style="float:right;margin-right:100px;" class="hollowFixedBtn" type="primary"
           @click="queryCommonData.UploadWORDTip = false">{{$t('pub.cancelBtn')}}
         </button>
@@ -1803,9 +1810,10 @@
         }
       },
       //显示弹窗层
-      ShowUploadWord(item) {
+      ShowUploadWord(item,type) {
         this.queryCommonData.UploadWORDTip = true
-        this.queryCommonData.UploadItem = item
+        this.queryCommonData.UploadItem = item;
+        this.queryCommonData.UploadItem.Type=type;
       },
       //保存WORD路劲
       uploadFileBtn(file) {
@@ -1819,6 +1827,7 @@
             that.queryCommonData.uploadLoading = true
             let uploadMsg = {
               TCID: that.queryCommonData.UploadItem.TCID,
+              Type: that.queryCommonData.UploadItem.Type,
               wordPath: res.data.FilePath
             }
             that.apipost(

src/components/administrative/AirticketCommission.vue

@@ -11,7 +11,7 @@
     <div class="query-box">
       <ul>
         <li>
-          <input type="button" class="normalBtn" @click="CreateAirticketCommission()" value="生成提成报表" />
+          <input type="button" class="normalBtn" @click="CreateAirticketCommission()" value="生成提成报表" :disabled="isDisable" />
         </li>
       </ul>
     </div>
@@ -56,6 +56,7 @@
         dataList: [],
         total: 0,
         currentPage: 1,
+        isDisable:false,
       }
     },
     mounted() {
@@ -97,10 +98,12 @@
       //生成票务提成报表
       CreateAirticketCommission() {
         this.loading=true;
+        this.isDisable=true;
         this.apipost(
           "AirTicketRules_post_CreateAirticketCommissionService", {},
           res => {
             this.loading=false;
+            this.isDisable=false;
             if (res.data.resultCode == 1) {
               this.getList();
               this.Success('报表生成成功')

src/components/dmc/manager/dmcTotalTable.vue

@@ -280,11 +280,14 @@
                 </div>
               </td>
               <td>
-                <!--"goUrlT('TravelPassengerList2',item.TCID,'旅客名单')-->
-                <div class="fz16 fbold linkspan" @click="goRoomTip()">
+                <!--"goUrlT('TravelPassengerList2',item.TCID,'旅客名单') @click="goRoomTip()" -->
+                <div class="fz16 fbold linkspan" >
                   <span style="color: #4BCA81;" v-if="item.HouseResult==1">√</span>
                   <span class="colorE95252" v-else>{{item.HouseResult=='-1'?"x":"O"}}</span>
                 </div>
+                 <p  v-if="item.FenFangUrl!=''">
+                  <a style="cursor:pointer;color:blue;" title="点击下载已上传的分房表文件" v-if="item.FenFangUrl && item.FenFangUrl!=''" :href="item.FenFangUrl">分房表下载</a>
+                 </p>
               </td>
               <td>
                 <a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单"