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

src/components/Supplier/roomQuery2.vue

@@ -203,9 +203,14 @@
                     </tr>
                     <tr>
                       <td colspan="6">
+                        <template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId">
+                          <div style="height:15px;"></div>
+                        </template>
+                        <template v-else>
                           <span style="display:inline-block;width:60px;vertical-align:top;">提示信息：</span>
                           <span style="display:inline-block;width:87%;"
                             :class="{'rq_disImNote':childItem.SupplierHotelStatus==1&&DateMinus(getDateStr(childItem.SupplierHotelStatusTime))<=5,'rq_importNote':childItem.SupplierHotelStatus==2&&DateMinus(getDateStr(childItem.SupplierHotelStatusTime))<=5}">{{childItem.Remarks}}</span>
+                        </template>
                       </td>
                     </tr>
                   </template>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2225,19 +2225,14 @@
             <td>{{item.PlatformTax}}</td>
             <td>{{item.ZaiTuMoney}}</td>
             <td><span :class="{color_red_order:item.DueInMoney!==item.PreferPrice}">{{item.DueInMoney}}</span></td>
-            <td class="fz12">
+            <td class="fz12" colspan="2">
               <span class="RL-redType">{{item.statsstr}}</span>
               <br />
               <span class="RL-redType" v-if="item.OrderCancelDate!=''">{{item.OrderCancelDate}}</span>
             </td>
-            <td>
-              <div @click="goOpenUrl('confirmationOrder',item.orderId)" style="cursor:pointer;">电子确认函</div>
-              <span v-if='item.ConfirmFileList.length>0' @click="downLoadFile(item.ConfirmFileList)"
-                style="color:blue;text-decoration:underline;font-size:12px;cursor:pointer;">确认函下载</span>
-            </td>
             <td class="RL-BTNlist" rowspan="2">
               <el-button-group>
-                <el-tooltip class="item" effect="dark" content="修改" placement="top-start">
+                <el-tooltip class="item" effect="dark" content="修改" placement="top-start" style="display:none;">
                   <el-button type="primary" style='background:#00C6FF; border-color:#00C6FF'
                     icon="iconfont icon-bianji-smal" @click='getDetail(item)'></el-button>
                 </el-tooltip>
@@ -2262,7 +2257,7 @@
                       icon="iconfont icon-rizhi1"></el-button>
                   </el-popover>
                 </el-tooltip>
-                <el-tooltip effect="dark" content="更多" placement="top-start" style="float:left">
+                <el-tooltip effect="dark" content="更多" placement="top-start" style="float:left;display:none;">
                   <el-popover width='100' trigger="hover">
                     <div class="groupTourOrder_more">
                       <div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>

src/components/commonPage/commonHotelInfo.vue

@@ -48,8 +48,7 @@
           {{hotelSubItem.PayTypeStr}}
         </td>
         <td v-if="showHotelObj.showZhan">
-                <template
-                    v-if="hotelSubItem.OPState==1||(hotelSubItem.OPState==2 && hotelSubItem.DMCState==0)">
+          <template v-if="hotelSubItem.OPState==1||(hotelSubItem.OPState==2 && hotelSubItem.DMCState==0)">
             {{hotelSubItem.CreateDateStr}}
           </template>
         </td>
@@ -58,9 +57,9 @@
     <tfoot v-if="showHotelObj.showBtnList">
       <tr>
         <td colspan="7" style="padding:10px 0">
-                    <input type="button" class="normalBtn" value="确定" style="display:none;"/>
-                    <input type="button" class="normalBtn" value="暂定" style="display:none;"/>
-                    <input type="button" class="normalBtn" value="下载"/>
+          <input type="button" class="normalBtn" value="确定" style="display:none;" />
+          <input type="button" class="normalBtn" value="暂定" style="display:none;" />
+          <input type="button" class="normalBtn" value="下载" style="display:none;" @click="DownLoadShouPeiShu()" />
         </td>
       </tr>
     </tfoot>
@@ -68,14 +67,24 @@
 </template>
 <script>
   export default {
-    props: ["HotelObj","showHotelObj"],
+    props: ["HotelObj", "showHotelObj","TCID","DMCNum","TCNUM"],
     data() {
       return {
-
+          loading:false,
       };
     },
     methods: {
-     
+      DownLoadShouPeiShu() {
+        this.loading = true;
+        let qMsg = {
+          TCID:this.TCID
+        };
+        let fileName = "手配书【"+this.DMCNum+"】" + this.$commonUtils.getCurrentDate() + ".xls";
+        this.GetLocalFile("hotel_SPS_DownLoad", qMsg, fileName,
+          res => {
+            this.loading = false;
+          });
+      }
     },
     mounted() {
 

src/components/dmc/manager/dmcTotalTable.vue

@@ -266,7 +266,7 @@
                 <p
                   v-if="item.LineId==14 && item.CommonReport.PriceHotelResult && item.CommonReport.PriceHotelResult.length>0">
                   <el-popover width="700" trigger="click" popper-class="TC_HotelPop">
-                    <commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"></commonHotelInfo>
+                    <commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj" :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUMS"></commonHotelInfo>
                     <span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店信息</span>
                   </el-popover>
                 </p>