页面修改

src/components/Hotel/GnHotelManagement.vue

@@ -259,16 +259,7 @@
             </el-select>
           </span>
         </li>
-        <li style="display:none;">
-          <span>
-            <em>{{$t('Operation.Op_price')}}</em>
-            <el-select v-model="msg.HotelPirceType" class="w210" :placeholder="$t('pub.unlimitedSel')">
-              <el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
-              <el-option v-for="item in HotelPirceTypeList" :key="item.ID" :label="item.Name" :value="item.ID">
-              </el-option>
-            </el-select>
-          </span>
-        </li>
+ 
         <li>
           <span><em>{{$t('visa.v_czuser')}}</em></span>
           <el-select class="w150" v-model="msg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">

src/components/Hotel/HotelManagement.vue

@@ -234,28 +234,37 @@
     display: flex;
     justify-content: center;
   }
-.hotelmanagement .comCursorUrl {
-  cursor: pointer;
-}
-.editInfo {
-  padding: 2px !important;
-}
-.list-item {
-  margin: 20px 0;
-}
-.file-title {
-  font-size: 16px;
-  font-weight: bold;
-}
-.submit-box {
-  display: flex;
-  justify-content: center;
-}
-.yellow {
-  color: orange !important;}
-.green {
-  color: green !important;
-}
+
+  .hotelmanagement .comCursorUrl {
+    cursor: pointer;
+  }
+
+  .editInfo {
+    padding: 2px !important;
+  }
+
+  .list-item {
+    margin: 20px 0;
+  }
+
+  .file-title {
+    font-size: 16px;
+    font-weight: bold;
+  }
+
+  .submit-box {
+    display: flex;
+    justify-content: center;
+  }
+
+  .yellow {
+    color: orange !important;
+  }
+
+  .green {
+    color: green !important;
+  }
+
 </style>
 <template>
   <div class="flexOne hotelmanagement">
@@ -324,6 +333,23 @@
               :key="item.EmployeeId"></el-option>
           </el-select>
         </li>
+        <li>
+          <span><em>报价信息</em></span>
+          <el-select class="w150" v-model="msg.IsUpFile" filterable :placeholder="$t('pub.pleaseSel')">
+            <el-option :label="$t('pub.unlimitedSel')" :value="0"> </el-option>
+            <el-option label="已上传" :value="1"> </el-option>
+            <el-option label="未上传" :value="2"> </el-option>
+          </el-select>
+        </li>
+        <li>
+          <span>
+            <em>上传时间</em>
+            <el-date-picker class="w150" type="date" v-model="msg.QFileStartDate" value-format="yyyy-MM-dd" placeholder>
+            </el-date-picker>
+            <el-date-picker class="w150" type="date" v-model="msg.QFileEndDate" value-format="yyyy-MM-dd" placeholder>
+            </el-date-picker>
+          </span>
+        </li>
         <li>
           <button class="hollowFixedBtn" type="button" @click="resetPageIndex(), selectResource()">
             {{ $t("pub.searchBtn") }}
@@ -363,13 +389,7 @@
             }}</span>
           </div>
         </div>
-        <el-tooltip
-          class="item"
-          effect="dark"
-          :content="item.Name"
-          placement="top-start"
-          popper-class="max-w250"
-        >
+        <el-tooltip class="item" effect="dark" :content="item.Name" placement="top-start" popper-class="max-w250">
           <div class="hotelTitle" :class="['','red','yellow','green','',][item.PriceDayStage]">{{ item.Name }}</div>
         </el-tooltip>
         <el-tooltip class="item" effect="dark" :content="item.HotelRealName" placement="top-start"
@@ -433,6 +453,9 @@
             class="hotelBtnMan">
             上传报价
           </button>
+          <template v-if="item.MaxFileDate&&item.MaxFileDate!=''">
+            <span style="color:red">最近一次上传时间:{{item.MaxFileDate}}</span>
+          </template>
         </div>
       </div>
     </div>
@@ -534,6 +557,9 @@
           ID: 0,
           UpdateBy: 0, //操作人
           ProductType: 1, //国际酒店
+          QFileStartDate: "", //报价上传开始日期
+          QFileEndDate: "", //报价上传结束日期
+          IsUpFile: 0, //是否上传报价(1-已上传，2-未上传)
         },
       };
     },
@@ -549,7 +575,6 @@
       },
       downloadFile(hotel) {
         this.hotel = hotel;
-        console.log('downloadFile', hotel)
         this.getFilelist();
         this.showFilelist = true;
       },

src/components/Hotel/roomReservationsDetailsNew.vue

@@ -1021,7 +1021,6 @@
                 })
               });
               this.list = list;
-              console.log('this.list', this.list)
               this.$forceUpdate();
             }
           } else {
@@ -1031,7 +1030,6 @@
         }, err => {})
       },
       calculationPrice(obj) {
-        console.log('chacalculationPrice>>>nge', obj)
         let totalPrice = 0;
         //获取当前选中的对象
         let currentObj = {};
@@ -1089,7 +1087,6 @@
         this.$forceUpdate();
       },
       changeTotalPrice(obj) {
-        console.log('changeTotalPrice', obj, obj.TotalPrice)
         obj.TotalPrice = Number(obj.OrderDetailsList[0].TotalPrice).toFixed(2);
       },
       saveList(type) {

src/components/TravelContractNew.vue

@@ -1505,7 +1505,6 @@
         this.apiJavaPost("/api/contract/getContractInfo", this.msg, res => {
           if (res.data.resultCode === 1) {
             var tempObj = res.data.data;
-            console.log("tempObj", tempObj);
             this.CtObj = tempObj;
             this.guestList = res.data.data.guestList;
             this.CtObj.tcid = this.$route.query.TCID;

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -119,11 +119,11 @@
           </table>
         </div>
         <br />
-<el-tag v-for="(item, index) in orderList" :key="index" style="margin-right: 10px;margin-bottom: 10px; cursor: pointer;" :type="index ===tabsActive ? '':'info'"
-  @click="selectTag(index)"
-  :disable-transitions="false">
-  {{`报价单${index + 1}${item.IsDefault ? '(默认)' : ''}`}}
-</el-tag>
+        <el-tag v-for="(item, index) in orderList" :key="index"
+          style="margin-right: 10px;margin-bottom: 10px; cursor: pointer;" :type="index ===tabsActive ? '':'info'"
+          @click="selectTag(index)" :disable-transitions="false">
+          {{`报价单${index + 1}${item.IsDefault ? '(默认)' : ''}`}}
+        </el-tag>
         <table class="CostPriceTable CostNewTable">
           <thead>
             <tr>
@@ -344,7 +344,7 @@
               </td>
               <td>
                 <template v-if="CostNumberList&&CostNumberList.length>0">
-                  {{CostNumberList[0].PeopleNumber}} 
+                  {{CostNumberList[0].PeopleNumber}}
                 </template>
               </td>
               <td>
@@ -864,7 +864,7 @@
 </template>
 <script>
   export default {
-    props: ["OfferArray","postConfig", "IsEdit"],
+    props: ["OfferArray", "postConfig", "IsEdit"],
     data() {
       return {
         tabsActive: 0,
@@ -873,23 +873,21 @@
         AduitMsg: {
 
         },
-OtherPrice: {},
-dayCostPrice: [],
-CostCurrencyList: [],
-CostNumberList: [],
-teamPrice: {}
+        OtherPrice: {},
+        dayCostPrice: [],
+        CostCurrencyList: [],
+        CostNumberList: [],
+        teamPrice: {}
       }
     },
     methods: {
       selectTag(index) {
-        console.log('selectTag', index)
         this.tabsActive = index
         this.changeTabs()
       },
       changeTabs() {
         this.currentData = this.orderList[this.tabsActive]
-        console.log('this.orderList[this.tabsActive]', this.orderList,this.tabsActive, this.currentData)
-        if(!this.currentData) {
+        if (!this.currentData) {
           return
         }
         this.OtherPrice = this.currentData.otherPrice
@@ -1149,8 +1147,8 @@ teamPrice: {}
       }
     },
     mounted() {
-        this.orderList = this.OfferArray
-        this.changeTabs()
+      this.orderList = this.OfferArray
+      this.changeTabs()
     },
     created() {},
     watch: {

src/components/TravelManager/TravelNewQuotation/DirectNewQuotation.vue

@@ -103,9 +103,11 @@
     right: -27px;
     top: -18px;
   }
-  .w875{
-    width:875px!important;
+
+  .w875 {
+    width: 875px !important;
   }
+
 </style>
 
 <template>
@@ -114,11 +116,10 @@
       <div class="switchDiv clearfix" style="width:98%;">
         <div class="DirectPriceCenter">
           <div class="singlePrice clearfix">
-            <CostNewPriceMun ref="CostNewPrice" :OfferArray="OfferArray" :postConfig="postConfig" :OtherPrice="otherPrice"
-              :dayCostPrice="dayCostPrice" :LineList="LineList" :CostCurrencyList="CostCurrencyList"
-              :CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"
-              :teamPrice="teamPrice"
-              ></CostNewPriceMun>
+            <CostNewPriceMun ref="CostNewPrice" :OfferArray="OfferArray" :postConfig="postConfig"
+              :OtherPrice="otherPrice" :dayCostPrice="dayCostPrice" :LineList="LineList"
+              :CostCurrencyList="CostCurrencyList" :CostNumberList="CostNumberList"
+              :CurrencyNumberListExt="CurrencyNumberListExt" :teamPrice="teamPrice"></CostNewPriceMun>
           </div>
         </div>
         <div class="DirectRightPrice" style="margin-left:20px; display:none;">
@@ -225,7 +226,7 @@
               </el-form-item>
             </div>
           </div>
-          <div class="clearfix"  v-show="IsShow">
+          <div class="clearfix" v-show="IsShow">
             <div class="Dleftname">备注</div>
             <div class="DrightList">
               <el-form-item>
@@ -243,7 +244,8 @@
   import CostNewPriceMun from "../TravelNewQuotation/CostNewPriceMun";
 
   export default {
-    props: ["OfferArray","postConfig", "dayCostPrice", "otherPrice", "teamPrice", "LineList", "CostCurrencyList", "CostNumberList",
+    props: ["OfferArray", "postConfig", "dayCostPrice", "otherPrice", "teamPrice", "LineList", "CostCurrencyList",
+      "CostNumberList",
       "CurrencyNumberListExt"
     ],
     data() {
@@ -254,10 +256,9 @@
       };
     },
     methods: {
-getData() {
-  console.log('this.$refs.CostNewPrice',this.$refs.CostNewPrice)
-  return this.$refs.CostNewPrice.getData()
-}
+      getData() {
+        return this.$refs.CostNewPrice.getData()
+      }
     },
     created() {
 

src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue

@@ -234,7 +234,6 @@
               this.postData.OutBranchName = tempData.OutBranchName
               this.postData.TeamTypeName = tempData.TeamTypeName
               if(tempData.OfferArray) {
-                console.log('getData', tempData.OfferArray)
                 tempData.OfferArray.forEach(item => {
                   this.OfferArray.push(item)
                 })

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -696,7 +696,6 @@
       GetAuth() {
         var actionCode = this.$AuthCode.EditQuotation;
         this.CheckUserAuth(actionCode, res => {
-          console.log('GetAuth', res)
           if (res.data.resultCode == 1 && res.data.data == 1) {
             this.EditBtn = true;
           }

src/components/leaderPay2.vue

@@ -2178,7 +2178,6 @@
         this.apipost('dmcstatistics_post_GetNewLeaderPayStatics_V1', this.msg, res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
-            console.log('dmcstatistics_post_GetNewLeaderPayStatics_V1', res.data.data)
             this.list = res.data.data;
             // 预计金额
             this.planPriceList = this.list.planPriceList;
@@ -2348,7 +2347,6 @@
               Hoteldest[i].row = row
             }
             this.HotelDataList = this.unique(Hoteldest, 'id');
-            console.log('dmcstatistics_post_GetNewLeaderPayStatics_V1 result', this.list)
           } else {
             this.$message.error(res.data.message);
           }
@@ -2391,7 +2389,6 @@
         return this.moneyFormat(totalPrice)
       },
       hotelTotalPrice(obj, data) {
-        console.log('hotelTotalPrice', obj, data)
         let totalPrice = 0
         obj.forEach(x => {
           if (x.PayStyle === 1) {

src/components/orderCommon/order-form.vue

@@ -1679,7 +1679,6 @@
               this.customerTypeList = res.data.data;
               } else {
               this.customerTypeList = res.data.data.filter(item => item.Id < 3);
-                console.log('this.customerTypeList', this.customerTypeList)
               }
             }
           },