Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/components/DilCommonUI/packages/table/src/table.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="st-base-table">
+  <div class="st-base-table"  v-show="isShow">
     <!-- 表格主体 -->
     <el-table
       ref="mainTable"

src/views/ADMINISTRATORS/components/saleLog.vue

@@ -12,8 +12,6 @@
         </el-form>
         <dil-table v-bind.sync="optionSaleLog"></dil-table>
     </div>
-    <dilTable v-bind.sync="option">
-    </dilTable>
   </div>
 </template>
 

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -3527,6 +3527,7 @@ export default {
       if (this.arrivalTime) {
         formData.append('arrivalTime', sjTime(this.arrivalTime))
       }
+      formData.append('userName',getCookie('loginName'));
       let options = {
         // 设置axios的参数
         url: '/api/v1/otms/addtmstruckArrivalResult',