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

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -448,7 +448,6 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
-      //this.msg.StartDate = '2019-06-26'
       this.getLineList();
       this.getList();
     },

src/components/ShoppingStore/ShoppingReimbursementDetails.vue

@@ -10,7 +10,7 @@
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; ">
       <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" v-loading="loading">
         <tr>
-          <th colspan="8">导游操作</th>
+          <th colspan="6">导游操作</th>
           <th colspan="8">地接OP</th>
         </tr>
         <tr>
@@ -21,7 +21,7 @@
           <th width="80">进店人数</th>
           <th width="100">总金额</th>
           <th width="100">佣金领取状况</th>
-          <th width="120">凭证上传</th>
+          <th width="120" style="display:none;">凭证上传</th>
           <th width="100">领队佣金<br />应付</th>
           <th width="100">导游佣金<br />应付</th>
           <th width="100">公司佣金<br />应收</th>
@@ -69,7 +69,7 @@
                 <el-option label="公司领取" :value='2'></el-option>
               </el-select>
             </td>
-            <td class="more_td" @click="upIndex = outindex" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
+            <td class="more_td" @click="upIndex = outindex" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length" style="display:none;">
               <p v-for="(img, imgIndex) in item.ShopDetailsList[0].imgList" @click="downLoadPZ(img)" v-if="img !== ''"
                 style="cursor: pointer;padding: 5px;" title="点击下载">{{ '凭证' + (imgIndex + 1)}} <span
                   style="text-align: right;color: red;" @click.stop="UploadType=1,deleteImg(outindex,imgIndex)">X</span>