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

src/components/SalesModule/addPassenger.vue

@@ -141,7 +141,11 @@
       <div class="contForm">
         <el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="100px">
           <li>
-            <el-form-item label="身份证号码" prop="IdCard">
+            <el-form-item label="身份证号码" prop="IdCard" v-if="LineId === 14 || LineId === 2">
+              <el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" placeholder="请填写" @blur.prevent="authentication()">
+              </el-input>
+            </el-form-item>
+            <el-form-item label="身份证号码" v-else>
               <el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" placeholder="请填写" @blur.prevent="authentication()">
               </el-input>
             </el-form-item>
@@ -661,6 +665,11 @@
         },
         EconomicCapabilityS: [],
         rules: {
+          IdCard: [{
+            required: true,
+            message: "请填身份证号码",
+            trigger: "blur"
+          }],
           SurName: [{
             required: true,
             message: "请填写中文姓",
@@ -770,6 +779,7 @@
         btnState: true,
         roomlist:[],
         isOneDay: 0,
+        LineId: 0,
       };
     },
     methods: {
@@ -1512,6 +1522,9 @@
         }
       },
       savePassenger(type) {
+        if ((this.LineId === 14 || LineId === 2) && (this.addMsg.IdCard === '' || this.addMsg.IdCard.length < 18)) {
+          this.$message.error('请填写身份证号码！'); 
+        }
         this.addMsg.EconomicCapabilityList = [];
         this.EconomicCapabilityS.forEach(x => {
           if (x.isShow == true) {
@@ -1981,6 +1994,7 @@
       this.GetGuestMustVisaAir();
       this.getAccessToken();
       this.isOneDay = this.$route.query.isOneDay;
+      this.LineId = this.$route.query.LineId;
       this.addMsg.TCID = this.$route.query.TCID;
       this.addMsg.OrderId = this.$route.query.orderId;
       let userInfo = this.getLocalStorage();

src/components/SalesModule/groupTourOrder.vue

@@ -2082,7 +2082,8 @@
           QStartDate: '',
           QEndDate: '',
           PayStatus: '-1',
-          IsAirTicket: '2'
+          IsAirTicket: '2',
+          IsOneDay: 0,
         },
         checkedObj: {},
         //返回数据
@@ -2365,7 +2366,7 @@
       },
       // 获取统计数据
       getCount: function () {
-        this.apipost('sellorder_get_GetTravelOrderListStatistics', this.msg, res => {
+        this.apipost('sellorder_get_GetTravelOrderListStatistics_V2', this.msg, res => {
           if (res.data.resultCode == 1) {
             this.countData = res.data.data
           } else {

src/components/SalesModule/groupTourOrderByTuanOne.vue

@@ -3078,8 +3078,8 @@
               this.addMsg.IsIntermodal = x.IsIntermodal?x.IsIntermodal.toString():2;
               this.addMsg.IsReturnIntermodal = x.IsReturnIntermodal.toString();
               this.addMsg.ChirdNum = x.ChirdNum.toString();
-              this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString();
-              this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
+              this.addMsg.ChirdNeedBedNum = 0;
+              this.addMsg.ChirdNoNeedBedNum = 0;
               this.addMsg.BabyNum = x.BabyNum.toString();
               this.addMsg.RefuseVisaNum=x.RefuseVisaNum.toString();
               this.addMsg.OrderForm = x.OrderForm
@@ -3216,8 +3216,8 @@
               this.addMsg.IsIntermodal = x.IsIntermodal.toString();
               this.addMsg.IsReturnIntermodal = x.IsReturnIntermodal.toString();
               this.addMsg.ChirdNum = x.ChirdNum.toString();
-              this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString();
-              this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
+              this.addMsg.ChirdNeedBedNum = 0;
+              this.addMsg.ChirdNoNeedBedNum = 0;
               this.addMsg.BabyNum = x.BabyNum.toString();
               this.IsChildrenTour = x.IsChildrenTour;
               this.IsBirdDiscount = x.IsBirdDiscount;
@@ -3451,7 +3451,7 @@
               (Number(this.addMsg.Unit_Price) -
                 this.addObj.DiscountPrice +
                 this.addObj.BabyChargePrice);
-            let yinger = Number(this.addMsg.BabyNum) * this.addObj.BabyPrice;
+            let yinger = Number(this.addMsg.BabyNum) * Number(this.addMsg.Unit_Price);
             let laoren =
               Number(this.addMsg.OldPeopleNum) *
               (Number(this.addMsg.Unit_Price) -
@@ -3516,7 +3516,7 @@
             let ertong =
               Number(this.addMsg.ChirdNum) *
               (Number(this.addMsg.Unit_Price) + this.addObj.BabyChargePrice);
-            let yinger = Number(this.addMsg.BabyNum) * this.addObj.BabyPrice;
+            let yinger = Number(this.addMsg.BabyNum) * Number(this.addMsg.Unit_Price);
             let laoren =
               Number(this.addMsg.OldPeopleNum) *
               (Number(this.addMsg.Unit_Price) + this.addObj.OldManChargePrice);
@@ -3830,7 +3830,7 @@
         this.addMsg.IsChildrenTour = this.IsChildrenTour;
         this.addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount;
         this.apipost(
-          "sellorder_post_SetOrderInfo_02",
+          "sellorder_post_SetOneDayOrderInfo",
           this.addMsg,
           res => {
             if (res.data.resultCode == 1) {

src/components/SalesModule/groupTourOrderOne.vue

@@ -2072,7 +2072,8 @@
           QStartDate: '',
           QEndDate: '',
           PayStatus: '-1',
-          IsAirTicket: '2'
+          IsAirTicket: '2',
+          IsOneDay: 1,
         },
         checkedObj: {},
         //返回数据
@@ -2355,7 +2356,7 @@
       },
       // 获取统计数据
       getCount: function () {
-        this.apipost('sellorder_get_GetTravelOrderListStatistics', this.msg, res => {
+        this.apipost('sellorder_get_GetTravelOrderListStatistics_V2', this.msg, res => {
           if (res.data.resultCode == 1) {
             this.countData = res.data.data
           } else {
@@ -2727,8 +2728,8 @@
               this.addMsg.IsIntermodal = x.IsIntermodal.toString()
               this.addMsg.IsReturnIntermodal = x.IsReturnIntermodal.toString()
               this.addMsg.ChirdNum = x.ChirdNum.toString()
-              this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString()
-              this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString()
+              this.addMsg.ChirdNeedBedNum = 0
+              this.addMsg.ChirdNoNeedBedNum = 0
               this.addMsg.BabyNum = x.BabyNum.toString();
               this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString();
               this.addMsg.OrderForm = x.OrderForm
@@ -3060,7 +3061,7 @@
             (Number(this.addMsg.Unit_Price) -
               this.addObj.DiscountPrice +
               this.addObj.BabyChargePrice)
-          let yinger = Number(this.addMsg.BabyNum) * this.addObj.BabyPrice
+          let yinger = Number(this.addMsg.BabyNum) * Number(this.addMsg.Unit_Price)
           let laoren =
             Number(this.addMsg.OldPeopleNum) *
             (Number(this.addMsg.Unit_Price) -
@@ -3123,7 +3124,7 @@
           let ertong =
             Number(this.addMsg.ChirdNum) *
             (Number(this.addMsg.Unit_Price) + this.addObj.BabyChargePrice)
-          let yinger = Number(this.addMsg.BabyNum) * this.addObj.BabyPrice
+          let yinger = Number(this.addMsg.BabyNum) * Number(this.addMsg.Unit_Price)
           let laoren =
             Number(this.addMsg.OldPeopleNum) *
             (Number(this.addMsg.Unit_Price) + this.addObj.OldManChargePrice)

src/components/SalesModule/passengerSaleList.vue

@@ -89,6 +89,7 @@
         isOrder: 0,
         tableList: [],
         isOneDay: 0,
+        LineId: 0,
       };
     },
     methods: {
@@ -101,6 +102,7 @@
             this.guestNum = res.data.data.GuestNum;
             this.tableList = res.data.data.list;
             this.isOneDay = res.data.data.IsOneDay;
+            this.LineId = res.data.data.LineId;
           } else {
             this.$message.error(res.data.message)
           }
@@ -132,7 +134,8 @@
             "TCID": this.msg.tcid,
             "orderId": this.msg.id,
             'guestId': guestId,
-            'isOneDay': this.isOneDay
+            'isOneDay': this.isOneDay,
+            'LineId': this.LineId,
           }
         });
       },

src/components/SalesModule/productQueryOne.vue

@@ -1263,10 +1263,10 @@
           }
           if (text === '婴儿人数') {
             if (this.remarkMsg.ye === '') {
-              this.remarkMsg.ye = '婴儿人数:' + this.addMsg[key] + ';' + '婴儿价格:' + this.addObj.BabyPrice + '/人;';
+              this.remarkMsg.ye = '婴儿人数:' + this.addMsg[key] + ';' + '婴儿价格:' + Number(this.addMsg.Unit_Price) + '/人;';
             } else {
               this.remarkMsg.ye = '';
-              this.remarkMsg.ye = '婴儿人数:' + this.addMsg[key] + ';' + '婴儿价格:' + this.addObj.BabyPrice + '/人;';
+              this.remarkMsg.ye = '婴儿人数:' + this.addMsg[key] + ';' + '婴儿价格:' + Number(this.addMsg.Unit_Price) + '/人;';
             }
           }
           if (text === '单地接数量') {
@@ -1650,7 +1650,7 @@
           let ertong = Number(this.addMsg.ChirdNum) * (Number(this.addMsg.Unit_Price) - this.addObj.DiscountPrice +
               this.addObj.BabyChargePrice)
 
-          let yinger = Number(this.addMsg.BabyNum) * this.addObj.BabyPrice
+          let yinger = Number(this.addMsg.BabyNum) * Number(this.addMsg.Unit_Price)
           let laoren = Number(this.addMsg.OldPeopleNum) * (Number(this.addMsg.Unit_Price) - this.addObj.DiscountPrice +
               this.addObj.OldManChargePrice)
           let zafeiqianzhen = this.addObj.OtherPrice * (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
@@ -1675,7 +1675,7 @@
         } else {
           let chengren = Number(this.addMsg.ManNum) * (Number(this.addMsg.Unit_Price))
           let ertong = Number(this.addMsg.ChirdNum) * (Number(this.addMsg.Unit_Price) + this.addObj.BabyChargePrice)
-          let yinger = Number(this.addMsg.BabyNum) * this.addObj.BabyPrice
+          let yinger = Number(this.addMsg.BabyNum) * Number(this.addMsg.Unit_Price)
           let laoren = Number(this.addMsg.OldPeopleNum) * (Number(this.addMsg.Unit_Price) + this.addObj.OldManChargePrice)
           let zafeiqianzhen = this.addObj.OtherPrice * (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
               Number(this.addMsg.OldPeopleNum)) + this.addObj.VisaPrice * (Number(this.addMsg.AirticketNum) + Number(

src/components/Supplier/roomQuery2.vue

@@ -66,32 +66,32 @@
             </td>
             <td>
               <el-tooltip class="item" effect="dark" content="酒店信息" placement="top-start">
-                <el-popover placement="bottom" width="800" trigger="click" popper-class="rq_HotelDetails">
-                  <table class="rq_HotelTable" v-loading="HotelUseLoading">
+                <el-popover placement="bottom" width="1250" trigger="click" popper-class="rq_HotelDetails">
+                  <table class="rq_HotelTable" v-loading="hotelLoading">
                     <tr>
-                      <th width="200">
+                      <th width="150">
                         时间
                       </th>
-                      <th width="200">
+                      <th width="150">
                         酒店
                       </th>
-                      <th width="200">
+                      <th width="150">
                         更换名称
                       </th>
-                      <th width="500">
+                      <th width="450">
                         价格
                       </th>
-                      <th width="120">
+                      <th width="100">
                         税入/税别
                       </th>
+                      <th width="100">提醒</th>
+                      <th width="150">备注</th>
                     </tr>
                     <template v-for="(subItem,subIndex) in HotelList">
                       <tbody>
                         <template v-for="(childItem,childIndex) in subItem.HotelOrderList">
                           <tr>
-                            <td v-if="childIndex==0"
-                              :rowspan="subItem.HotelOrderList.length>1?subItem.HotelOrderList.length*3:subItem.HotelOrderList.length+2"
-                              style="text-align:center;">
+                            <td style="text-align:center;" :rowspan="2">
                               第{{subIndex+1}}天 <br />
                               {{subItem.UseTimeStr}}
                             </td>
@@ -119,30 +119,24 @@
                               <template v-if="childItem.TaxType==1">税入</template>
                               <template v-if="childItem.TaxType==2">税别</template>
                             </td>
-                          </tr>
-                          <tr>
-                            <td colspan="4">
-                              <span style="display:inline-block;width:60px;vertical-align:top;">提示信息：</span>
-                              <span style="display:inline-block;width:87%;">{{childItem.Remarks}}</span></td>
-                          </tr>
-                           <tr>
-                            <td>
-                              提醒等级
-                            </td>
                             <td>
-                              <el-select class='w135 sel' v-model='childItem.SupplierToDmcHotelStatus'
+                              <!-- <el-select  v-model='childItem.SupplierToDmcHotelStatus'
                                 :placeholder="$t('pub.pleaseSel')">
                                 <el-option label='请选择' :value='0'></el-option>
                                 <el-option label='一般提醒' :value='1'></el-option>
                                 <el-option label='重要提醒' :value='2'></el-option>
-                              </el-select>
+                              </el-select> -->
                             </td>
                             <td>
-                              对地接备注
+                              <!-- <el-input type='textarea' class='w135' v-model='childItem.SupplierToDmcRemarks'>
+                              </el-input> -->
                             </td>
-                            <td>
-                              <el-input type='textarea' class='w135' v-model='childItem.SupplierToDmcRemarks'>
-                              </el-input>
+                          </tr>
+                          <tr>
+                            <td colspan="6">
+                              <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(subItem.UseTimeStr)<=5,'rq_importNote':childItem.SupplierHotelStatus==2&&DateMinus(subItem.UseTimeStr)<=5}">{{childItem.Remarks}}</span>
                             </td>
                           </tr>
                         </template>
@@ -150,9 +144,10 @@
                     </template>
                     <tfoot>
                       <tr>
-                         <td colspan="5">
-                            <input type="button" value="保存" @click="saveSupplierjourneyorder(HotelList)" class="normalBtn SaveR_Btn" />
-                         </td>
+                        <td colspan="7">
+                          <input type="button" value="保存" @click="saveSupplierjourneyorder(HotelList)"
+                            class="normalBtn SaveR_Btn" />
+                        </td>
                       </tr>
                     </tfoot>
                   </table>
@@ -168,7 +163,8 @@
                         对地接备注：
                       </td>
                       <td>
-                        <el-input class='w320 SupplierRemarks' v-model='RemarkObj.SupplierToDmcRemarks' type='textarea'></el-input>
+                        <el-input class='w320 SupplierRemarks' v-model='RemarkObj.SupplierToDmcRemarks' type='textarea'>
+                        </el-input>
                       </td>
                     </tr>
                     <tr>
@@ -185,7 +181,7 @@
           <tr>
             <td colspan="8" style="text-align:left;padding-left:5px;">
               <div class="rQ_HtList" v-if="item.IsBookTeam==2&&item.Numbers>=0">
-                  <span v-for="subItem in item.Numbers"></span>
+                <span v-for="subItem in item.Numbers"></span>
               </div>
               <div>注意事项： {{item.SupplierRemarks}}</div>
             </td>
@@ -207,7 +203,7 @@
       return {
         loading: false,
         hotelLoading: false,
-        HotelUseLoading:false,
+        HotelUseLoading: false,
         total: 0,
         msg: {
           pageIndex: 1,
@@ -251,9 +247,9 @@
           TCID: 0
         },
         //是否为今天
-        isToday:false,
-        todayDate:'',
-        showNum:0
+        isToday: false,
+        todayDate: '',
+        showNum: 0,
       }
     },
     methods: {
@@ -270,7 +266,7 @@
         // }, err => {})
       },
       //保存信息
-      saveSupplierjourneyorder(HotelList){
+      saveSupplierjourneyorder(HotelList) {
         this.HotelUseLoading = true;
         this.ApiPost2('dmcstatistics_post_SetSupplierjourneyorderService', HotelList, res => {
           this.HotelUseLoading = false;
@@ -281,7 +277,6 @@
             this.Error(res.data.message)
           }
         }, err => {})
-
       },
       getList() {
         this.loading = true;
@@ -289,22 +284,24 @@
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.dataList = res.data.data;
-            this.dataList.forEach(x=>{
-                if(x.HotelBookTimeStr){
-                  x.Numbers = 5- this.DateMinus(x.HotelBookTimeStr);
+            if (this.dataList && this.dataList.length > 0) {
+              this.dataList.forEach(x => {
+                if (x.HotelBookTimeStr) {
+                  x.Numbers = 5 - this.DateMinus(x.HotelBookTimeStr);
                 }
-            })
+              })
+            }
           } else {
             this.Error(res.data.message)
           }
         }, err => {})
       },
-      DateMinus(sDate){ 
-      　　var sdate = new Date(sDate.replace(/-/g, "/")); 
-      　　var now = new Date(); 
-      　　var days = now.getTime()-sdate.getTime(); 
-      　　var day = Math.abs(parseInt(days / (1000 * 60 * 60 * 24))); 
-      　　return day; 
+      DateMinus(sDate) {
+        var sdate = new Date(sDate.replace(/-/g, "/"));
+        var now = new Date();
+        var days = now.getTime() - sdate.getTime();
+        var day = Math.abs(parseInt(days / (1000 * 60 * 60 * 24)));
+        return day;
       },
       //获取酒店列表
       getHotelList(TCID, NewCombinationNum) {
@@ -314,10 +311,11 @@
           TCID: TCID,
           NewCombinationNum: NewCombinationNum
         };
-        this.ApiPost2('dmcstatistics_post_GetSupplierHotelListService_V2', qMsg, res => {
+        this.ApiPost2('dmcstatistics_post_GetSupplierHotelListService', qMsg, res => {
           this.hotelLoading = false;
           if (res.data.resultCode == 1) {
             this.HotelList = res.data.data;
+            console.log(this.HotelList, 'hotellist')
           } else {
             this.Error(res.data.message);
           }
@@ -354,22 +352,22 @@
           });
       },
       timeAdd0(str) {
-        if(str.length<=1){
-            str='0'+str;
+        if (str.length <= 1) {
+          str = '0' + str;
         }
         return str
       },
       //提取年月日
-      getDateYear(date){
+      getDateYear(date) {
         return date.split(' ')[0];
       }
     },
     mounted() {
       this.UserInfo = this.getLocalStorageSupplier();
       //获取当前日期
-      var nowMonth=(new Date().getMonth() + 1).toString()
-      var nowDay=new Date().getDate().toString();
-      this.todayDate = new Date().getFullYear()+'-'+ this.timeAdd0(nowMonth) +'-' + this.timeAdd0(nowDay);
+      var nowMonth = (new Date().getMonth() + 1).toString()
+      var nowDay = new Date().getDate().toString();
+      this.todayDate = new Date().getFullYear() + '-' + this.timeAdd0(nowMonth) + '-' + this.timeAdd0(nowDay);
 
       this.getList();
     },
@@ -500,26 +498,31 @@
     position: relative;
     top: 3px;
   }
-  .SupplierRemarks .el-textarea__inner{
-    height:75px;
+
+  .SupplierRemarks .el-textarea__inner {
+    height: 75px;
   }
-  .SP_RemarkTitle{
+
+  .SP_RemarkTitle {
     vertical-align: top;
-    padding-top:5px;
+    padding-top: 5px;
   }
-  .SaveR_Btn{
-    margin:10px 0 0 45%;
+
+  .SaveR_Btn {
+    margin: 10px 0 0 45%;
   }
-  .Add_triangle{
-      width: 0;
-      height: 0;
-      position: absolute;
-      left:0;
-      top:0;
-      border-style: solid;
-      border-width: 45px 45px 0 0;
-      border-color: #7abd53 transparent transparent 
+
+  .Add_triangle {
+    width: 0;
+    height: 0;
+    position: absolute;
+    left: 0;
+    top: 0;
+    border-style: solid;
+    border-width: 45px 45px 0 0;
+    border-color: #7abd53 transparent transparent
   }
+
   .Add_triangle::after {
     content: '新增';
     position: absolute;
@@ -528,17 +531,19 @@
     white-space: nowrap;
     color: #FFFFFF;
     font-size: 12px;
-}
-.minus_triangle{
+  }
+
+  .minus_triangle {
     width: 0;
     height: 0;
     position: absolute;
-    left:0;
-    top:0;
+    left: 0;
+    top: 0;
     border-style: solid;
     border-width: 45px 45px 0 0;
-    border-color: red transparent transparent 
-}
+    border-color: red transparent transparent
+  }
+
   .minus_triangle::after {
     content: '取消';
     position: absolute;
@@ -547,21 +552,27 @@
     white-space: nowrap;
     color: #FFFFFF;
     font-size: 12px;
-}
-
-.rQ_HtList{
-  margin-top:5px 0 3px 0;
-}
-.rQ_HtList span{
-  display:inline-block;
-  width:15px;
-  height:15px;
-  margin-right:5px;
-  background-color: red;
-  border:1px solid #d1d1d1;
-}
-/* .rq_tBody tr:first-child td{
-  border-top-color: red;
-  border-left-color:red
-} */
+  }
+
+  .rQ_HtList {
+    margin-top: 5px 0 3px 0;
+  }
+
+  .rQ_HtList span {
+    display: inline-block;
+    width: 15px;
+    height: 15px;
+    margin-right: 5px;
+    background-color: red;
+    border: 1px solid #d1d1d1;
+  }
+
+  .rq_importNote {
+    color: red;
+  }
+
+  .rq_disImNote {
+    color: #ea6d6d;
+  }
+
 </style>