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

src/components/LeaderManagement/leaderReimbursement.vue

@@ -19,7 +19,7 @@
         <td>
           <div class="padding10">{{item.Titles}}</div>
         </td>
-        <td>{{item.TCNUMS}}</td>
+        <td>{{item.TCNUMS + '(' + item.TCIDS}})</td>
         <td>{{NewCombinationNum}}</td>
         <td>{{item.FlightDate}}</td>
         <td>{{item.DayNum}}天</td>

src/components/SalesModule/addPassenger.vue

@@ -131,7 +131,9 @@
     top: 0;
     cursor: pointer;
   }
-
+  .colorRed input{
+    color: red !important;
+  }
 </style>
 <template>
   <div class="addPassenger">
@@ -219,7 +221,7 @@
           </li>
           <li>
             <el-form-item label="护照过期日" prop="PassportExpiry">
-              <el-date-picker v-model='addMsg.PassportExpiry' class="w230" value-format="yyyy-MM-dd" type="date"
+              <el-date-picker v-model='addMsg.PassportExpiry' class="w230"  :class=" guoqi ? 'colorRed' : ''" @change="timeOver" value-format="yyyy-MM-dd" type="date"
                               placeholder="选择日期"></el-date-picker>
             </el-form-item>
           </li>
@@ -776,9 +778,23 @@
         roomlist:[],
         isOneDay: 0,
         LineId: 0,
+        EndDateStr: '',
+        guoqi: false,
       };
     },
     methods: {
+      CompareDate(d1, d2){
+        return ((new Date(d1.replace(/-/g,"\/"))) < (new Date(d2.replace(/-/g,"\/"))));
+      },
+      timeOver: function(){
+        this.guoqi = this.CompareDate(this.addMsg.PassportExpiry, this.EndDateStr)
+        // console.log(this.CompareDate(this.addMsg.PassportExpiry, this.EndDateStr))
+        // console.log(this.addMsg.PassportExpiry, this.EndDateStr)
+        if (this.guoqi) {
+          this.$message.error("客人护照过期时间小于团队出发日期后六个月")
+          return
+        }
+      },
       getAccessToken() {
         let url =
           this.BD_GET_ACCESS_TOKEN +
@@ -1518,6 +1534,7 @@
         }
       },
       savePassenger(type) {
+        this.timeOver()
         if ((this.LineId === 14 || this.LineId === 2) && this.addMsg.IdCard === '') {
           return this.$message.error('请填写身份证号码！'); 
         }
@@ -1996,6 +2013,7 @@
       this.LineId = this.$route.query.LineId;
       this.addMsg.TCID = this.$route.query.TCID;
       this.addMsg.OrderId = this.$route.query.orderId;
+      this.EndDateStr = this.$route.query.EndDateStr;
       let userInfo = this.getLocalStorage();
       var BranchName = userInfo.BranchName;
       if (BranchName.search("武汉") != -1) {

src/components/SalesModule/passengerSaleList.vue

@@ -90,6 +90,7 @@
         tableList: [],
         isOneDay: 0,
         LineId: 0,
+        EndDateStr: ""
       };
     },
     methods: {
@@ -103,6 +104,7 @@
             this.tableList = res.data.data.list;
             this.isOneDay = res.data.data.IsOneDay;
             this.LineId = res.data.data.LineId;
+            this.EndDateStr = res.data.data.EndDateStr
           } else {
             this.$message.error(res.data.message)
           }
@@ -136,6 +138,7 @@
             'guestId': guestId,
             'isOneDay': this.isOneDay,
             'LineId': this.LineId,
+            "EndDateStr": this.EndDateStr
           }
         });
       },

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -60,6 +60,7 @@
           <th width="80">返佣总计</th>
           <th width="80">汇率</th>
           <th width="80">凭证</th>
+          <th width="100">备注</th>
           <th width="80">财务单据</th>
           <th width="80">操作</th>
         </tr>
@@ -137,6 +138,9 @@
                   <p v-for="(img, imgIndex) in subItem.dmcImageList" title="点击下载" @click="downLoadPZ(img)"
                     v-if="img !== ''" style="cursor: pointer;color:blue;">{{ '凭证' + (imgIndex + 1)}}</p>
                 </td>
+                <td width="80" :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'>
+                    {{subItem.Remarks}}
+                </td>
                 <td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0' style="">
                   <!-- style="display:none;" -->
                   <div >
@@ -234,7 +238,6 @@
     },
     methods: {
       goCreateHandBill: function () {
-        console.log(this.CreateHandBillID)
         let obj = {}
         for(let i = 0; i < this.CreateHandBillList.length; i++) {
           if (this.CreateHandBillList[i].id == this.CreateHandBillID) {

src/components/ShoppingStore/ShoppingReimbursementDetails.vue

@@ -32,7 +32,7 @@
           <th width="120">备注</th>
         </tr>
         <tr v-if="list.length==0">
-          <td colspan="13">暂无数据</td>
+          <td colspan="15">暂无数据</td>
         </tr>
         <tbody v-for="(item,outindex) in list" :class="{roomReservationsSplitTrCss:outindex%2!=0}">
           <tr v-for="(subItem,subIndex) in item.ShopDetailsList">

src/components/ShoppingStore/ShoppingStore.vue

@@ -722,6 +722,7 @@
               <th width="80">导游提成</th>
               <th width="80">汇率</th>
               <th width="80">币种</th>
+              <th width="80">备注</th>
               <th width="80">操作</th>
             </tr>
             <tr v-for="(item,index) in importData" :key="item.subCode" :class="{'IsConflict':item.IsConflict==1}">
@@ -757,6 +758,7 @@
               <td>{{item.GuideExtract}}</td>
               <td>{{item.Rate}}</td>
               <td :class="{'redType':item.CurrencyExist==-1}"><span>{{item.Currency}}</span></td>
+              <td>{{item.Remarks}}</td>
               <td><span class="delInfo" @click="delInfo(index)">删除</span></td>
             </tr>
           </thead>

src/components/administrative/CommissionManagement.vue

@@ -7,13 +7,13 @@
 </style>
 <template>
   <div class="flexOne">
-    <div class="query-box">
+    <!-- <div class="query-box">
       <ul>
         <li>
             <input type="button" class="normalBtn" @click="generateTable" value="生成提成报表"/>
         </li>
       </ul>
-    </div>
+    </div> -->
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
       <tr>
         <th>期数</th>

src/router/config.js

@@ -3549,6 +3549,14 @@ export default {
                             meta: {
                                 title: '商城订单管理'
                             }
+                        },
+                        {
+                            path: "/airTicketRules",
+                            name: "airTicketRules",
+                            component: resolve => require(['@/components/Ticketing/airTicketRules'], resolve),
+                            meta: {
+                                title: '票务规则配置'
+                            }
                         }
                     ]
                 },