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

index.html

@@ -25,7 +25,6 @@
                 return _load
             },
             set: function set(v) {
-                //console.log(v.toString()),
                 eval("_load = " + v.toString().replace("maps.google.cn", "www.google.cn"))
             }
         });

src/components/Hotel/singleProduct/components/ListCar.vue

@@ -198,7 +198,6 @@
         crmOrderObj: {
             handler: function (val, oldVal) {
                 this.crmOrderObj = val
-                console.log(this.crmOrderObj)
                 if(this.crmOrderObj){
                     this.parameters.LureEmpId = val.LureEmpId//引流id
                     this.parameters.CRMGuestId = val.CRMGuestId //客人ID

src/components/SalesModule/productQueryOne.vue

@@ -628,7 +628,7 @@
                 </td>
                 </tr>
                 <tr v-if="addMsg.GuestList.length==0">
-                  <td colspan="5">暂无房客信息</td>
+                  <td colspan="6">暂无房客信息</td>
                 </tr>
               </tbody>
             </table>
@@ -1802,7 +1802,6 @@
           this.apipost('sellorder_post_GetLessPrice', {"TCID":this.addObj.TCID,"MaxPeopleNum" :maxPeopleNum  }, res => {
             this.LessMoney = res.data.data.lessMoney;
             if (parseFloat(this.LessMoney)>0){
-              this.Unit_PriceList=[];
               for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
                 var obj = {
                   ID: '',
@@ -1822,7 +1821,6 @@
                 this.Unit_PriceList.push(obj);
               } 
             } else {
-              this.Unit_PriceList=[];
               var obj = {
                 ID: '',
                 LessMoney: ''

src/components/SalesModule/productQueryOne2.vue

@@ -1899,7 +1899,7 @@
       }
       if (this.msg.StartTime === "") {
         let nowDay =this.FormartDate(new Date());
-        // this.msg.StartTime = nowDay;
+        this.msg.StartTime = nowDay;
       }
       let userInfo = this.getLocalStorage()
       this.CurrentUserInfo = userInfo

src/components/SalesVisa/VisaProductAddOrder.vue

@@ -712,8 +712,6 @@
         }, err => {})
       },
       saveVisa() { // 保存
-        console.log(this.addMsg,'===')
-        // return
         this.$refs['addMsg'].validate((valid) => {
           if (valid) {
             this.apipost('dmc_get_visa_SetVisaOrder', this.addMsg, res => {

src/components/TravelManager/TravelGroupControl/QuotationDetails.vue

@@ -180,7 +180,7 @@
           </tr>
           <tr>
             <td>3</td>
-            <td>领队小费</td>
+            <td>领队小费（每人）</td>
             <td>
                 {{QuoItem.OfferCostPrice.LeaderTripMoney}}
             </td>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -610,6 +610,10 @@
                         v-if="item.PriceOfferUrl" target="_blank">下载报价单</a>
                     </span>
                   </p>
+              
+                  <p class="travelnowrap" v-if="item.Config_OfferId&&item.Config_OfferId>0">
+                    <span style="cursor:pointer;text-decoration:underline;color:blue;" @click="showDialog(item.ID, item.Config_OfferId)">报价详情</span>
+                  </p>
                   <p class="travelnowrap flex" v-if="item.OfferShouPeiFee>0">
                     <span>手配费</span>
                     <span class="go_date">
@@ -682,9 +686,7 @@
                   <p class="travelnowrap" v-if="item.LineID==14 && item.IsOpenHotel==1">
                     <span style="color:red;font-weight:bold;">※ {{$t('op.DJyiguanbi')}}.</span>
                   </p>
-                  <p class="travelnowrap" v-if="item.Config_OfferId">
-                    <span style="cursor: pointer;" @click="showDialog(item.ID, item.OfferId)">报价详情</span>
-                  </p>
+      
                 </div>
               </div>
               <div class="el-col" style="width:190px;">
@@ -924,12 +926,6 @@
                       </el-popover>
                     </template>
                   </div>
-                  <div class="TC_SeatList">
-                    <template v-if="item.Config_OfferId>0">
-                      <a style="cursor:pointer;color:rgb(71,191,140);text-decoration: underline;"
-                        @click="gotoOffer(item)">查看报价单</a>
-                    </template>
-                  </div>
                 </div>
               </div>
               <div class="el-col" style="width:200px;">
@@ -1229,8 +1225,8 @@
       </el-form>
     </div>
     <el-dialog :visible.sync="dialog.show" width="1400px" title="报价详情">
-                    <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
-                    </el-dialog>
+      <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -1246,7 +1242,8 @@
       return {
         dialog: {
           show: false,
-          ConfigId: '',OfferId: ''
+          ConfigId: '',
+          OfferId: ''
         },
         isCommissionDetails: false, //团控提成详情权限
         QSendCommissionStateList: [{
@@ -1386,7 +1383,7 @@
           HotelUseTime: "", //酒店使用时间
           QBusNumber: "",
           PriceTeamType: "", //团队类型
-          Title:"",//团名
+          Title: "", //团名
         },
         TeamListArr: [], //团队类型
         //报价单查询条件
@@ -1505,10 +1502,11 @@
       },
     },
     methods: {
-      showDialog(ConfigId,OfferId) {
+      showDialog(ConfigId, OfferId) {
         this.dialog = {
           show: true,
-          ConfigId,OfferId
+          ConfigId,
+          OfferId
         }
         this.$nextTick(() => {
           this.$refs.dialog.getPostData()

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -122,7 +122,7 @@
         <table class="CostPriceTable CostNewTable">
           <thead>
             <tr>
-              <td colspan="14" class="CP_ComTitle2 CostcomCenter">报价信息</td>
+              <td colspan="14" class="CP_ComTitle2 CostcomCenter">成本预算信息</td>
             </tr>
             <tr>
               <td width="170" class="CP_ComTitle2 CostcomCenter">币种</td>
@@ -261,6 +261,12 @@
                 <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                   {{getDayXiaoJi(6,1)}}
                 </td>
+                <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+                  {{getDayXiaoJi(8,1)}}
+                </td>
+                <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+                  {{getDayXiaoJi(9,1)}}
+                </td>
               </tr>
             </template>
             <template v-for="(childItem,childIndex) in CostNumberList">
@@ -296,6 +302,12 @@
                 <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                   {{getDayXiaoJi(6,2)}}
                 </td>
+                <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+                  {{getDayXiaoJi(8,2)}}
+                </td>
+                <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+                  {{getDayXiaoJi(9,2)}}
+                </td>
               </tr>
             </template>
           </template>
@@ -492,7 +504,7 @@
               {{OtherPrice.InlandTrainTicketMoney}}
             </td>
             <td class="CP_ComTitle2 CostcomCenter">3</td>
-            <td class="CP_ComTitle2">领队小费</td>
+            <td class="CP_ComTitle2">领队小费(每人)</td>
             <td colspan="2">
               {{getCurrencyName(OtherPrice.LeaderTripMoneyCurrencyId)}}
             </td>
@@ -510,7 +522,7 @@
               {{OtherPrice.InternationalAirTicket}}
             </td>
             <td class="CP_ComTitle2 CostcomCenter">4</td>
-            <td class="CP_ComTitle2">司机、导游小费</td>
+            <td class="CP_ComTitle2">司机小费(每人)</td>
             <td colspan="2">
               {{getCurrencyName(OtherPrice.DriverGuideMoneyCurrencyId)}}
             </td>
@@ -521,7 +533,7 @@
           <tr>
             <td colspan="7"></td>
             <td class="CP_ComTitle2 CostcomCenter">5</td>
-            <td class="CP_ComTitle2">导游小费</td>
+            <td class="CP_ComTitle2">导游小费(每人)</td>
             <td colspan="2">
               {{getCurrencyName(OtherPrice.GuideMoneyCurrencyId)}}
             </td>

src/components/TravelManager/TravelQuotationCenter/CostPrice.vue

@@ -236,7 +236,7 @@
           </tr>
           <tr>
             <td>3</td>
-            <td>领队小费</td>
+            <td>领队小费（每人）</td>
             <td>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OfferCostPriceObj.LeaderTripMoney"