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

src/components/Hotel/HotelWorkList.vue

@@ -469,7 +469,8 @@
         this.apipost(
           "hotel_post_GetHasStockHotelList", {
             Country: this.qCountryId,
-            IsMoreThanZero: 1
+            IsMoreThanZero: 1,
+            IsAllHotel:1,
           },
           res => {
             if (res.data.resultCode == 1) {

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -713,9 +713,10 @@
                         </el-popover>
                       </el-tooltip>
                     </template>
-                    <!-- <template v-if="item.TeamPriceList && item.TeamPriceList.length > 0">
+                    <template v-if="item.TeamPriceList && item.TeamPriceList.length > 1">
+                      <font style="display:none;">
                         <el-tooltip class="item" effect="dark" content="合并列表(和平国旅合并团队使用)">
-                        <el-popover width="350" trigger="click" popper-class="TC_HotelPop">
+                          <el-popover width="350" trigger="hover" popper-class="TC_HotelPop">
                             <table width="100%" border="0" cellspacing="0" cellpadding="0">
                               <tr>
                                 <td style="width: 100px">
@@ -738,7 +739,8 @@
                             </el-button>
                           </el-popover>
                         </el-tooltip>
-                    </template> -->
+                      </font>
+                    </template>
                   </p>
                   <p class="travelnowrap flex" v-if="item.OfferShouPeiFee > 0">
                     <span>{{ $t("objFill.handpartscharge") }}</span>
@@ -1611,7 +1613,20 @@
               </div>
               <div class="clearfix TCL-redType" v-if="item.DMCNum">
                 <div class="TCL_remarkTitle">{{ $t("op.DJBZTH") }}：</div>
-                <div class="TCL_Content">{{ item.DMCNum }}</div>
+                <div class="TCL_Content">{{ item.DMCNum }}
+                  <template v-if="item.DMType>0">
+                    <template v-if="item.DMType==1">
+                      <font style="color:blue;">
+                        {{item.DMByName}}:{{item.DMTime}} 作业中.
+                      </font>
+                    </template>
+                    <template v-if="item.DMType==2">
+                      <font style="color:#67C23A">
+                        {{item.DMByName}}:{{item.DMTime}} 作业完成
+                      </font>
+                    </template>
+                  </template>
+                </div>
               </div>
               <div class="clearfix TCL-redType" v-if="
                   (item.DmcRemarkLast && item.DmcRemarkLast.DMCRemark != '') ||

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -1072,10 +1072,6 @@
                 <div class="TCL_remarkTitle">{{$t('objFill.bohuiyy')}}：</div>
                 <div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div>
               </div>
-              <!-- <div class="clearfix TCL-redType" v-if="item.ProductRecommend">
-                <div class="TCL_remarkTitle">{{$t('Operation.Op_bentuanMaidian')}}：</div>
-                <div class="TCL_Content">{{item.ProductRecommend}}</div>
-              </div> -->
               <div class="clearfix TCL-redType" v-if="item.OPRemark">
                 <div class="TCL_remarkTitle">{{$t('Operation.Op_duiwaiRemark')}}：</div>
                 <div class="TCL_Content">{{item.OPRemark}}</div>
@@ -1084,9 +1080,22 @@
                 <div class="TCL_remarkTitle">{{$t('Operation.Op_duineiRemark')}}：</div>
                 <div class="TCL_Content">{{item.OPInnerRemark}}</div>
               </div>
-              <div class="clearfix TCL-redType" v-if="item.DMCNum">
+              <div class="clearfix TCL-redType">
                 <div class="TCL_remarkTitle">{{$t('op.DJBZTH')}}：</div>
-                <div class="TCL_Content">{{item.DMCNum}}</div>
+                <div class="TCL_Content">{{item.DMCNum}}
+                  <template v-if="item.DMType>0">
+                    <template v-if="item.DMType==1">
+                      <font style="color:blue;">
+                        {{item.DMByName}}:{{item.DMTime}} 作业中.
+                      </font>
+                    </template>
+                    <template v-if="item.DMType==2">
+                      <font style="color:#67C23A">
+                        {{item.DMByName}}:{{item.DMTime}} 作业完成
+                      </font>
+                    </template>
+                  </template>
+                </div>
               </div>
               <div class="clearfix TCL-redType"
                 v-if="(item.DmcRemarkLast&&item.DmcRemarkLast.DMCRemark!='') ||  item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' ">
@@ -1332,7 +1341,8 @@
           <el-col :span="4">
             <el-form-item :label="$t('objFill.tuanduilx')" prop="Remark">
               <el-select class="multiple_input" v-model="changePriceMsg.NewB2BPrice">
-                <el-option v-for='item in teamList' v-if="item.ID!=2" :key="item.ID" :label="item.Name" :value="item.ID">
+                <el-option v-for='item in teamList' v-if="item.ID!=2" :key="item.ID" :label="item.Name"
+                  :value="item.ID">
                 </el-option>
               </el-select>
             </el-form-item>

src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue

@@ -185,6 +185,9 @@
                   v-model='subItem.HotelId' :placeholder="$t('objFill.qingshurujdmc')" :loading="loading"
                   @change="getHotel(subItem,subItem.HotelId)" style="width:135px;">
                   <el-option v-for="(x) in subItem.HotelList" :key="x.ID" :label="x.Name" :value='x.ID'>
+                    <span style="float: left">{{ x.Name }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 13px">库存:{{ x.Inventory }}
+                      &nbsp;价格:{{x.CostPrice}}</span>
                   </el-option>
                 </el-select>
                 <el-form-item :label="$t('objFill.v101.hancan')">
@@ -714,7 +717,6 @@
     watch: {
       postConfig: {
         handler: function (val, oldVal) {
-
           this.getOfferItemObj(1);
         },
         deep: true
@@ -892,7 +894,8 @@
       getHotel(subItem, HotelId) {
         subItem.HotelList.forEach(x => {
           if (x.ID == HotelId) {
-            subItem.HotelName = x.Name
+            subItem.HotelName = x.Name;
+            subItem.HotelCostPrice = x.CostPrice;
           }
         })
         this.$forceUpdate()
@@ -951,10 +954,14 @@
       },
       //初始化酒店列表
       initHotel(query, subItem, day) {
+        var hMsg = {
+          Name: query,
+          IsAllHotel: 1,
+          sDate: this.GetDayStr(subItem.DayNum - 1)
+        };
+        console.log("hMsg", hMsg)
         this.apipost(
-          "hotel_post_GetList", {
-            Name: query
-          },
+          "hotel_post_GetHasStockHotelList", hMsg,
           res => {
             this.loading = false
             if (res.data.resultCode == 1) {

src/components/commonPage/commonHotelInfo.vue

@@ -43,7 +43,9 @@
         <tr>
           <th width="120">{{$t('pub.date')}}</th>
           <th width="150">{{$t('hotel.hotel')}}</th>
+
           <th width="150">{{$t('salesModule.ChangeHotel')}}</th>
+          <th width="80" v-if="showHotelObj.showPrice">库存</th>
           <th width="120">{{$t('salesModule.HotelStatus')}}</th>
           <th width="120">{{$t('salesModule.OPstatus')}}</th>
           <th width="120">{{$t('salesModule.DJstatus')}}</th>
@@ -54,8 +56,7 @@
           <th width="130" v-if="showHotelObj.showZhan">{{$t('salesModule.UseRoomTime')}}</th>
           <th width="100" v-if="showHotelObj.showZhan">{{$t('salesModule.SureTime')}}</th>
           <th width="100" v-if="showHotelObj.ShowSupplier">{{$t('hotel.hotel_Supplier')}}</th> 
-          <th width="80" v-if="showHotelObj.caiwu">{{$t('pub.yes')}}{{$t('pub.no')}}<br />{{$t('fnc.fukuan')}}</th>
-          <th width="180" v-if="showHotelObj.caiwu">{{$t('salesModule.DJNUM')}}{{$t('hotel.hotel_corrlelatition')}}</th>
+          <!-- <th width="80" v-if="showHotelObj.caiwu">{{$t('pub.yes')}}{{$t('pub.no')}}<br />{{$t('fnc.fukuan')}}</th>-->
           <th width="70" v-if="showHotelObj.showPrice">
             {{$t('fnc.rizhi')}}
           </th>
@@ -76,6 +77,11 @@
             <td style="text-align:left;padding-left:3px;color:red">
               {{hotelSubItem.HotelName!=hotelSubItem.NewHotelName?""+hotelSubItem.NewHotelName:""}}
             </td>
+            <td v-if="showHotelObj.showPrice">
+              总库存:{{hotelSubItem.Inventory}}
+               <br/>
+               剩余:{{hotelSubItem.RemainingInventory}}
+            </td>
             <td>
               <template v-if="hotelSubItem.OPState==1||hotelSubItem.DMCState==1">
                 <a style="color:green">{{$t('salesModule.BZRZ')}}</a>
@@ -128,20 +134,9 @@
             <td v-if="showHotelObj.ShowSupplier">
               {{hotelSubItem.SupplierName}}
             </td>
-            <td v-if="showHotelObj.caiwu">
+            <!-- <td v-if="showHotelObj.caiwu">
               {{hotelSubItem.IsPay==1?$t('pub.yes'):$t('pub.no')}}
-            </td>
-            <td v-if="showHotelObj.caiwu">
-                <div>
-                  <div v-if="hotelSubItem.FrList&&hotelSubItem.FrList.length > 0" v-for="(item2, index2) in hotelSubItem.FrList" :key="index2">
-                    <span  style="cursor:pointer;text-decoration:underline;" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID,'')">
-                      {{ item2.FrID }}（{{item2.StatusStr}}）
-                    </span>
-                  </div>
-                  <span v-else
-                    style="cursor: default">{{ $t("system.content_noData") }}</span>
-                </div>
-            </td>
+            </td> -->
             <td v-if="showHotelObj.showPrice">
               <el-popover width="200" trigger="click" popper-class="Bus_HotelPop">
                 <commonHotelLog :ref="'comHotelLog'+index+hotelSubIndex+''"> </commonHotelLog>

src/components/confirmationOrderDownLoadNew.vue

@@ -116,44 +116,12 @@
             {{$t('objFill.v101.chuttzhisxz')}}</el-button>
           <el-button type="primary" @click="ToWord_2023()">
             {{$t('objFill.v101.chuttzhisxz')}}WROD</el-button>
-          <!-- <template v-if="lineId==119||lineId==168">
-            <el-dropdown style="padding-left:20px;">
-              <el-button type="primary">
-                {{$t('Operation.Op_teamNotice')}}<i class="el-icon-arrow-down el-icon--right"></i>
-              </el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item @click.native="ToWord_2023()">{{$t('Operation.Op_teamNotice')}} WORD</el-dropdown-item>
-                <el-dropdown-item @click.native="OuZhouPdf2024()">{{$t('objFill.v101.chuttzsozpdf')}}</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </template>
-          <template v-else>
-            <el-button type="primary" @click="ToWord_2023()">
-              {{$t('objFill.v101.chuttzhisxz')}}WROD</el-button>
-          </template> -->
         </template>
         <template v-else>
           <el-button type="primary" @click="toPDF_2023(1)">
             {{$t('Operation.Op_tripDownLoad')}}</el-button>
           <el-button type="primary" @click="ToWord_2023()" style="margin-left:20px;">
             {{$t('Operation.Op_tripDownLoad')}}WORD</el-button>
-          <!-- <template v-if="lineId==119||lineId==168">
-            <el-dropdown style="padding-left:20px;">
-              <el-button type="primary">
-                {{$t('Operation.Op_tripDownLoad')}} WORD<i class="el-icon-arrow-down el-icon--right"></i>
-              </el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item @click.native="ToWord_2023()">{{$t('Operation.Op_tripDownLoad')}}WORD
-                </el-dropdown-item>
-                <el-dropdown-item @click.native="OuZhouPdf2024()">
-                  {{$t('Operation.Op_tripDownLoad')}}{{$t('objFill.v101.ouzhoupdf')}}</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </template>
-          <template v-else>
-            <el-button type="primary" @click="ToWord_2023()" style="margin-left:20px;">
-              {{$t('Operation.Op_tripDownLoad')}}WORD</el-button>
-          </template> -->
         </template>
         <!-- 可以让销售修改基本信息-->
         <el-button v-if="orderId>0" type="primary" :value="$t('objFill.xiugaixinxi')" @click="editMsgShow=true"
@@ -658,32 +626,40 @@
         this.pdfLoading = true;
         this.loadingText = this.$t('objFill.zhengzscpdf');
         let msg = this.getPostMsg();
+        var that = this;
+        this.pdfLoading = true;
+        this.loadingText = "正在生成WORD行程...";
+        this.download_timer = setInterval(function () {
+          that.checkWord(msg, title)
+        }, 2000);
+      },
+      checkWord: function (pMsg, title) {
         let urlObj = this.domainManager();
         this.$http({
           headers: {
             'Content-Type': 'application/json'
           },
           method: 'post',
-          url: urlObj.DomainUrl + '/api/file/GetToWord_2023',
+          url: urlObj.DomainUrl + '/api/file/CheckWord2025',
           data: {
-            "msg": msg
+            "msg": pMsg
           }
         }).then(res => {
-          if (res.data.resultCode === 1) {
+          var tempData = res.data.data;
+          if (tempData.Result === 1) {
+            clearInterval(this.download_timer);
             this.loadingText = this.$t('objFill.zhengzxzpdf');
             let sign = title;
             const a = document.createElement('a');
             a.setAttribute('download', '');
             a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
-              '.doc&&fPath=' + res.data.data);
+              '.doc&&fPath=' + tempData.Path);
             a.click();
             this.loadingText = "";
-          } else {
-            this.Error(this.$t('objFill.wordhqsb'));
-          }
             this.pdfLoading = false
+          }
         }).catch(err => {
-
+          this.pdfLoading = false
         })
       },
       OuZhouPdf2024: function () {