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

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/router/config.js

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