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

src/views/appoint/components/saleContract/saleCokeInward.vue

@@ -14,7 +14,7 @@
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <!-- 已审批 -->
         <!-- <el-tab-pane name="four"> -->
-        <dilTable v-bind.sync="option4" ref="table">
+        <dilTable v-bind.sync="option4" ref="table" max-height="300">
           <el-table-column fixed="right" label="操作" width="120">
             <template slot-scope="scope">
               <el-button

src/views/appoint/components/saleContract/saleOrder.vue

@@ -36,7 +36,7 @@
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <!-- 已审批 -->
         <el-tab-pane label="已审批" name="four">
-          <dilTable v-bind.sync="option4" ref="table" :pageSize="200">
+          <dilTable v-bind.sync="option4" ref="table" :pageSize="200" max-height="300">
             <el-table-column fixed="right" label="操作" width="180">
               <template slot-scope="scope">
                 <el-button

src/views/appoint/components/saleContract/saleOrderArrange.vue

@@ -13,7 +13,7 @@
     </div>
     <template>
       <div>
-        <dilTable v-bind.sync="first" @selection-change="selectionChange" ref="table">
+        <dilTable v-bind.sync="first" @selection-change="selectionChange" ref="table" max-height="300">
           <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
               <el-button

src/views/appoint/components/saleContract/saleOrderCoproduct.vue

@@ -44,8 +44,9 @@
             @selection-change="selectionChange"
             ref="table"
             :pageSize="200"
+            max-height="300"
           >
-            <el-table-column fixed="right" label="操作" width="200">
+            <el-table-column fixed="right" label="操作" width="200" >
               <template slot-scope="scope">
                 <el-button
                   @click="coproductSendClick(scope.row.saleOrderId)"
@@ -70,7 +71,7 @@
           </mergeRowTable>
         </el-tab-pane>
         <el-tab-pane label="已关闭" name="first">
-          <mergeRowTable v-bind.sync="option" ref="table" :isPagination="false">
+          <mergeRowTable v-bind.sync="option" ref="table" :isPagination="false" max-height="300">
           </mergeRowTable>
         </el-tab-pane>
       </el-tabs>

src/views/appoint/components/saleContract/saleOrderCoproductCarrier.vue

@@ -13,7 +13,7 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <!-- 已审批 -->
       <el-tab-pane label="已审批" name="four">
-        <dilTable v-bind.sync="option4" ref="table">
+        <dilTable v-bind.sync="option4" ref="table" max-height="300">
           <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
               <el-button

src/views/appoint/components/saleContract/saleOrderSteel.vue

@@ -125,6 +125,7 @@
             @selection-change="selectionChange"
             :pageSize="200"
             @func="func"
+            :max-height="300"
           >
             <el-table-column
               fixed="right"
@@ -168,6 +169,7 @@
             ref="table"
             :pageSize="200"
             @func="func1"
+            :max-height="300"
           >
             <el-table-column
               fixed="right"
@@ -211,6 +213,7 @@
               label="操作"
               align="center"
               width="200"
+              :max-height="300"
             >
               <template slot-scope="scope">
                 <el-button
@@ -231,6 +234,7 @@
             @selection-change="selectionChange2"
             :pageSize="200"
             @func="func2"
+            :max-height="300"
           >
             <el-table-column
               fixed="right"

src/views/appoint/components/saleContract/saleOrderSteelCar.vue

@@ -50,7 +50,7 @@
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <!-- 未授权 -->
         <el-tab-pane label="未授权" name="four">
-          <mergeRowTable v-bind.sync="option4" ref="table">
+          <mergeRowTable v-bind.sync="option4" ref="table" max-height="300">
             <el-table-column fixed="right" label="操作" width="180">
               <template slot-scope="scope">
                 <el-button
@@ -72,7 +72,7 @@
 
         <!-- 未派车 -->
         <el-tab-pane label="未派车" name="five">
-          <mergeRowTable v-bind.sync="option0" ref="table0">
+          <mergeRowTable v-bind.sync="option0" ref="table0" max-height="300">
             <el-table-column fixed="right" label="操作" width="160">
               <template slot-scope="scope">
                 <el-button
@@ -87,7 +87,7 @@
         </el-tab-pane>
         <!-- 已派车 -->
         <el-tab-pane label="已派车" name="first">
-          <mergeRowTable v-bind.sync="option" ref="table3">
+          <mergeRowTable v-bind.sync="option" ref="table3" max-height="300">
             <el-table-column fixed="right" label="操作" width="160">
               <template slot-scope="scope">
                 <el-button

src/views/appoint/components/saleContract/saleOrderSteelCarrier.vue

@@ -11,7 +11,7 @@
       </el-button>
     </div>
     <div class="table">
-      <mergeRowTable v-bind.sync="option4" ref="table">
+      <mergeRowTable v-bind.sync="option4" ref="table" max-height="300">
         <el-table-column fixed="right" label="操作" width="100">
           <template slot-scope="scope">
             <el-button

src/views/inward/components/inwardFactory/countResult.vue

@@ -22,7 +22,7 @@
       </el-button>
     </div>
     <div class="tab">
-      <dilTable v-bind.sync="option" ref="excelDom">
+      <dilTable v-bind.sync="option" ref="excelDom" max-height="300">
         <el-table-column fixed="right" label="操作" width="180">
           <template slot-scope="scope">
             <div class="step">

src/views/inward/components/inwardFactory/enFactoryResult.vue

@@ -13,7 +13,7 @@
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
-    <dilTable v-bind.sync="option">      
+    <dilTable v-bind.sync="option" max-height="300">      
     </dilTable>
   </div>
 </template>

src/views/inward/components/inwardFactory/monthResult.vue

@@ -13,7 +13,7 @@
             </el-button>
         </div>
         <div class="tab">
-            <dilTable v-bind.sync="option"></dilTable>
+            <dilTable v-bind.sync="option" max-height="300"></dilTable>
         </div>
     </div>
 </template>

src/views/inward/components/inwardFactory/outFactory.vue

@@ -13,7 +13,7 @@
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
-    <dilTable v-bind.sync="option">      
+    <dilTable v-bind.sync="option" max-height="300">      
     </dilTable>
   </div>
 </template>

src/views/inward/components/inwardFactory/reverseResult.vue

@@ -22,7 +22,7 @@
       </el-button>
     </div>
     <div class="tab">
-      <dilTable v-bind.sync="option" ref="excelDom">
+      <dilTable v-bind.sync="option" ref="excelDom" max-height="300">
         <!-- <el-table-column fixed="right" label="操作" width="180">
           <template slot-scope="scope">
             <div class="step">

src/views/inward/components/inwardFactory/tareWeightResult.vue

@@ -30,7 +30,7 @@
         <i class="el-icon-search"></i>
       </el-button>
     </div>
-    <div class="table"><dilTable v-bind.sync="option"> </dilTable></div>
+    <div class="table"><dilTable v-bind.sync="option" max-height="300"> </dilTable></div>
   </div>
 </template>
 

src/views/inward/components/inwardFactory/timeTaskResult.vue

@@ -22,7 +22,7 @@
       </el-button>
     </div>
     <div class="tab">
-      <dilTable v-bind.sync="option" ref="excelDom">
+      <dilTable v-bind.sync="option" ref="excelDom" max-height="300">
         <el-table-column fixed="right" label="操作" width="180">
           <template slot-scope="scope">
             <div class="step">

src/views/inward/components/inwardFactory/truckLoad.vue

@@ -31,7 +31,7 @@
       </el-button>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="option"></dilTable>
+      <dilTable v-bind.sync="option" max-height="300"></dilTable>
     </div>
   </div>
 </template>

src/views/inward/components/inwardFactory/unload.vue

@@ -30,7 +30,7 @@
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
-    <div class="table"><dilTable v-bind.sync="option"></dilTable></div>
+    <div class="table"><dilTable v-bind.sync="option" max-height="300"></dilTable></div>
   </div>
 </template>
 

src/views/inward/components/inwardImport/oldAreaRailScale/enFactory.vue

@@ -14,7 +14,7 @@
             </el-button>
         </div>
         <div class="tab">
-            <dilTable v-bind.sync="option"></dilTable>
+            <dilTable v-bind.sync="option" max-height="300"></dilTable>
         </div>
     </div>
 </template>

src/views/inward/components/inwardImport/oldAreaRailScale/grossWeightResult.vue

@@ -13,7 +13,7 @@
             </el-button>
         </div>
         <div class="tab">
-            <dilTable v-bind.sync="option"></dilTable>
+            <dilTable v-bind.sync="option" max-height="300"></dilTable>
         </div>
     </div>
 </template>

src/views/inward/components/inwardImport/oldAreaRailScale/outFactory.vue

@@ -14,7 +14,7 @@
       </el-button>
         </div>
         <div class="tab">
-            <dilTable v-bind.sync="option"></dilTable>
+            <dilTable v-bind.sync="option" max-height="300"></dilTable>
         </div>
     </div>
 </template>

src/views/inward/components/inwardImport/oldAreaRailScale/qualityResult.vue

@@ -13,7 +13,7 @@
             </el-button>
         </div>
         <div class="tab">
-            <dilTable v-bind.sync="option"></dilTable>
+            <dilTable v-bind.sync="option" max-height="300"></dilTable>
         </div>
     </div>
 </template>

src/views/inward/components/inwardImport/oldAreaRailScale/receipt.vue

@@ -13,7 +13,7 @@
             </el-button>
         </div>
         <div class="tab">
-            <dilTable v-bind.sync="option"></dilTable>
+            <dilTable v-bind.sync="option" max-height="300"></dilTable>
         </div>
     </div>
 </template>

src/views/inward/components/inwardImport/oldAreaRailScale/tareWeightResult.vue

@@ -13,7 +13,7 @@
             </el-button>
         </div>
         <div class="tab">
-            <dilTable v-bind.sync="option"></dilTable>
+            <dilTable v-bind.sync="option" max-height="300"></dilTable>
         </div>
     </div>
 </template>

src/views/inward/components/inwardImport/oldAreaRailScale/trainLineUnload.vue

@@ -10,7 +10,7 @@
       </el-button>
     </div>
     <div class="tab">
-      <dilTable v-bind.sync="option"> </dilTable>
+      <dilTable v-bind.sync="option" max-height="300"> </dilTable>
     </div>
   </div>
 </template>

src/views/inward/components/inwardImport/oldAreaRailScale/truckLoad.vue

@@ -10,7 +10,7 @@
       </el-button>
     </div>
     <div class="tab">
-      <dilTable v-bind.sync="option"></dilTable>
+      <dilTable v-bind.sync="option" max-height="300"></dilTable>
     </div>
   </div>
 </template>

src/views/inward/components/inwardImport/oldAreaRailScale/unload.vue

@@ -13,7 +13,7 @@
             </el-button>
         </div>
         <div class="tab">
-            <dilTable v-bind.sync="option"></dilTable>
+            <dilTable v-bind.sync="option" max-height="300"></dilTable>
         </div>
     </div>
 </template>

src/views/inward/components/truckAppoint/purInwardRequirement.vue

@@ -47,7 +47,7 @@
     <div class="table">
       <el-tabs v-model="activeName">
         <el-tab-pane label="未下发" name="first">
-          <dilTable v-bind.sync="first" @selection-change="selectionChange">
+          <dilTable v-bind.sync="first" @selection-change="selectionChange" max-height="300">
             <el-table-column fixed="right" label="操作" width="100">
               <template slot-scope="scope">
                 <el-button
@@ -62,7 +62,7 @@
           </dilTable>
         </el-tab-pane>
         <el-tab-pane label="已下发" name="second">
-          <dilTable v-bind.sync="second" @func="func">
+          <dilTable v-bind.sync="second" @func="func" max-height="300">
             <el-table-column fixed="right" label="操作" width="100">
               <template slot-scope="scope">
                 <el-button

src/views/inward/components/truckAppoint/requirement.vue

@@ -40,6 +40,7 @@
               v-bind.sync="first"
               @selection-change="selectionChange"
               ref="table"
+              max-height="300"
             >
               <el-table-column fixed="right" label="操作" width="80">
                 <template slot-scope="scope">
@@ -60,6 +61,7 @@
               ref="table1"
               :isPagination="false"
               :pageSize="2000"
+              max-height="300"
             >
               <el-table-column fixed="right" label="操作" width="80">
                 <template slot-scope="scope">

src/views/inward/components/truckAppoint/requirementOther.vue

@@ -48,6 +48,7 @@
               v-bind.sync="first"
               @selection-change="selectionChange"
               ref="table1"
+              max-height="300"
             >
               <el-table-column fixed="right" label="操作" width="90">
                 <template slot-scope="scope">
@@ -63,7 +64,7 @@
             </mergeRowTable>
           </el-tab-pane>
           <el-tab-pane label="已下发" name="second">
-            <mergeRowTable v-bind.sync="second" ref="table">
+            <mergeRowTable v-bind.sync="second" ref="table" max-height="300">
               <el-table-column fixed="right" label="操作" width="80">
                 <template slot-scope="scope">
                   <el-button

src/views/inward/components/truckOrder/dispatchPlan.vue

@@ -49,7 +49,7 @@
       <div>
         <el-tabs v-model="activeName" @tab-click="handleClick">
           <el-tab-pane label="待接收" name="first">
-            <dilTable v-bind.sync="first" ref="table">
+            <dilTable v-bind.sync="first" ref="table" max-height="300">
               <el-table-column fixed="right" label="操作" width="120">
                 <template slot-scope="scope">
                   <el-button type="text" size="mini" @click="updatePlan(scope)">
@@ -67,7 +67,7 @@
             </dilTable>
           </el-tab-pane>
           <el-tab-pane label="已接收" name="second">
-            <dilTable v-bind.sync="second">
+            <dilTable v-bind.sync="second" max-height="300">
               <el-table-column fixed="right" label="操作" width="80">
                 <template slot-scope="scope">
                   <el-button
@@ -82,7 +82,7 @@
             </dilTable>
           </el-tab-pane>
           <el-tab-pane label="已完成" name="third">
-            <dilTable v-bind.sync="third"> </dilTable>
+            <dilTable v-bind.sync="third" max-height="300"> </dilTable>
           </el-tab-pane>
         </el-tabs>
       </div>

src/views/inward/components/truckOrder/plan.vue

@@ -12,7 +12,7 @@
       <div>
         <el-tabs v-model="activeName" @tab-click="handleClick">
           <el-tab-pane label="待分解" name="second">
-            <mergeRowTable v-bind.sync="second" ref="table1">
+            <mergeRowTable v-bind.sync="second" ref="table1" max-height="300">
               <el-table-column fixed="right" label="操作" width="100">
                 <template slot-scope="scope">
                   <el-button
@@ -27,7 +27,7 @@
             </mergeRowTable>
           </el-tab-pane>
           <el-tab-pane label="已分解" name="third">
-            <mergeRowTable v-bind.sync="third" ref="table2">
+            <mergeRowTable v-bind.sync="third" ref="table2" max-height="300">
               <el-table-column fixed="right" label="操作" width="180">
                 <template slot-scope="scope">
                   <el-button
@@ -56,7 +56,7 @@
             </mergeRowTable>
           </el-tab-pane>
           <el-tab-pane label="已完成" name="four">
-            <mergeRowTable v-bind.sync="four" ref="table3"> </mergeRowTable>
+            <mergeRowTable v-bind.sync="four" ref="table3" max-height="300"> </mergeRowTable>
           </el-tab-pane>
         </el-tabs>
       </div>

src/views/inward/components/truckOrder/purInwardTruckOrder.vue

@@ -25,6 +25,7 @@
       <dilTable
         v-bind.sync="truck"
         @radio-change="currentRadioChange1"
+        
       ></dilTable>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogTableVisible = false">取 消</el-button>
@@ -37,7 +38,7 @@
       <el-tabs v-model="activeName">
         <!-- 已下发 -->
         <el-tab-pane label="未接收" name="first">
-          <dilTable v-bind.sync="first">
+          <dilTable v-bind.sync="first" max-height="300">
             <el-table-column fixed="right" label="操作" width="100">
               <template slot-scope="scope">
                 <el-button @click="updateClick(scope)" type="text" size="small">
@@ -52,7 +53,7 @@
         </el-tab-pane>
         <!-- 已接收 -->
         <el-tab-pane label="已接收" name="Received">
-          <dilTable v-bind.sync="Received">
+          <dilTable v-bind.sync="Received" max-height="300">
             <el-table-column fixed="right" label="操作" width="100">
               <template slot-scope="scope">
                 <el-button @click="deleteClick(scope)" type="text" size="small">
@@ -64,11 +65,11 @@
         </el-tab-pane>
         <!-- 已完成 -->
         <el-tab-pane label="已完成" name="completed">
-          <dilTable v-bind.sync="completed"> </dilTable>
+          <dilTable v-bind.sync="completed" max-height="300"> </dilTable>
         </el-tab-pane>
         <!-- 已派单 -->
         <el-tab-pane label="已派单" name="dispatched">
-          <dilTable v-bind.sync="dispatched">
+          <dilTable v-bind.sync="dispatched" max-height="300">
             <el-table-column fixed="right" label="操作" width="100">
               <template slot-scope="scope">
                 <el-button

src/views/sale/components/dilNotice/carrierNotice.vue

@@ -17,7 +17,7 @@
 
 
     <div class="table">
-      <dilTable v-bind.sync="options">
+      <dilTable v-bind.sync="options" max-height="300">
         <el-table-column fixed="right" label="操作" width="200" header-align="center">
           <template slot-scope="scope">
             <el-button

src/views/sale/components/dilNotice/clientNotice.vue

@@ -17,7 +17,7 @@
 
 
     <div class="table">
-      <dilTable v-bind.sync="options">
+      <dilTable v-bind.sync="options" max-height="300">
         <el-table-column fixed="right" label="操作" width="150" header-align="center">
           <template slot-scope="scope">
             <el-button

src/views/sale/components/dilNotice/marketingNotice.vue

@@ -18,7 +18,7 @@
 
 
     <div class="table">
-      <dilTable v-bind.sync="options">
+      <dilTable v-bind.sync="options" max-height="300">
         <el-table-column fixed="right" label="操作" width="150" header-align="center">
           <template slot-scope="scope">
             <el-button

src/views/sale/components/transport_appointment/directionalDispatch.vue

@@ -20,7 +20,7 @@
       <div>
         <el-tabs v-model="activeName">
           <el-tab-pane label="未下发" name="first">
-            <dilTable v-bind.sync="first" ref="table" @selection-change="selectionChange">
+            <dilTable v-bind.sync="first" ref="table" @selection-change="selectionChange" max-height="300">
               <el-table-column fixed="right" label="操作" width="70">
             <template slot-scope="scope">
               <el-button
@@ -54,7 +54,7 @@
 
           </el-tab-pane>
           <el-tab-pane label="已下发" name="second">
-            <dilTable v-bind.sync="second" ref="table1">
+            <dilTable v-bind.sync="second" ref="table1" max-height="300">
               <el-table-column fixed="right" label="操作" width="100">
                 <template slot-scope="scope">
                   <el-button

src/views/sale/components/transport_appointment/openDistribution.vue

@@ -25,6 +25,7 @@
             v-bind.sync="first"
             ref="table"
             @selection-change="currentSelectChange"
+            max-height="300"
           >
             <el-table-column fixed="right" label="操作" width="120">
               <template slot-scope="scope">
@@ -67,6 +68,7 @@
             v-bind.sync="second"
             ref="table1"
             @selection-change="currentSelectChange1"
+            max-height="300"
           >
             <el-table-column fixed="right" label="操作" width="120">
               <template slot-scope="scope">

src/views/sale/components/transport_excute/enFactoryResult.vue

@@ -14,7 +14,7 @@
       </el-button>
     </div>
     <div class="tab">
-      <dilTable v-bind.sync="option" ref="table">
+      <dilTable v-bind.sync="option" ref="table" max-height="300">
         <el-table-column label="操作" fixed="right" width="80">
           <template slot-scope="scope">
             <el-button type="text" size="mini" @click="detailclick(scope.row)">

src/views/sale/components/transport_excute/grossWeightResult.vue

@@ -13,7 +13,7 @@
             </el-button>
         </div>
         <div class="tab">
-            <dilTable v-bind.sync="option"></dilTable>
+            <dilTable v-bind.sync="option" max-height="300"></dilTable>
         </div>
     </div>
 </template>

src/views/sale/components/transport_excute/loadTruckResult.vue

@@ -10,7 +10,7 @@
 
     </div>
     <div class="tab">
-      <dilTable v-bind.sync="option"></dilTable>
+      <dilTable v-bind.sync="option" max-height="300"></dilTable>
     </div>
   </div>
 </template>

src/views/sale/components/transport_excute/outFactory/outFactoryResult.vue

@@ -19,7 +19,7 @@
       </el-button>
     </div>
     <div class="tab">
-      <dilTable v-bind.sync="option" ref="table">
+      <dilTable v-bind.sync="option" ref="table" max-height="300">
         <el-table-column label="操作" fixed="right" width="80">
           <template slot-scope="scope">
             <el-button type="text" size="mini" @click="detailclick(scope.row)">

src/views/sale/components/transport_excute/outFactory/smsResult.vue

@@ -13,7 +13,7 @@
             </el-button>
         </div>
         <div class="tab">
-            <dilTable v-bind.sync="option"></dilTable>
+            <dilTable v-bind.sync="option" max-height="300"></dilTable>
         </div>
     </div>
 </template>

src/views/sale/components/transport_excute/qualityResult.vue

@@ -13,7 +13,7 @@
             </el-button>
         </div>
         <div class="tab">
-            <dilTable v-bind.sync="option"></dilTable>
+            <dilTable v-bind.sync="option" max-height="300"></dilTable>
         </div>
     </div>
 </template>

src/views/sale/components/transport_excute/returnResult.vue

@@ -13,7 +13,7 @@
             </el-button>
         </div>
         <div class="tab">
-            <dilTable v-bind.sync="option"></dilTable>
+            <dilTable v-bind.sync="option" max-height="300"></dilTable>
         </div>
     </div>
 </template>

src/views/sale/components/transport_excute/tareWeightResult.vue

@@ -28,7 +28,7 @@
             </el-button>
         </div>
         <div class="tab">
-            <dilTable v-bind.sync="option"></dilTable>
+            <dilTable v-bind.sync="option" max-height="300"></dilTable>
         </div>
     </div>
 </template>

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

@@ -183,7 +183,7 @@
         individual-panel
         @resetTable="reset"
         @selection-change="handleSelectionChange()"
-      >
+        >
         <el-table-column
           type="selection"
           width="50"