修改

src/views/TMS/components/domesticMine/wagonLoadAdd.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 国产矿导入3-->
-  <div class="addWagonLoad">
+  <div class="addWagonLoad" style="width:100%">
     <page-title>返回</page-title>
     <div class="cp">
       <el-upload
@@ -18,11 +18,12 @@
         当前导入数量：{{ tableData.length }}
       </div>
     </div>
-    <div class="importedTable" style="height:300px;overflow:scroll;">
+    <div class="importedTable" style="height:300px;overflow:scroll;width:100%">
       <el-table
         ref="importExcel"
         highlight-current-row
         :data="tableData"
+        fit
         :row-style="{height:'40px'}"
          @row-click="rowClick"
          style="width: 100%;font-size: 14px"
@@ -59,7 +60,7 @@
           align="center"
           prop="supplierName"
           label="发货单位"
-          width="150px"
+          width="300px"
         >
         </el-table-column>
         <el-table-column
@@ -106,7 +107,6 @@
         </el-table-column>
         <el-table-column
           align="center"
-          width="100px"
           prop="weight"
           label="标重"
         >
@@ -132,7 +132,6 @@
           <div class="preview-group">
             <el-form-item label="到站:">
               <el-autocomplete
-                class="inline-input"
                 v-model="toTheStation"
                 :fetch-suggestions="querySearchToTheStation"
                 placeholder="请输入到站名称"

src/views/TMS/components/importedMine/outBoundWagon.vue

@@ -33,7 +33,7 @@
       </mergeRowTable>
       </el-tab-pane>
       <el-tab-pane label="待计量" name="second">
-        <mergeRowTable v-bind.sync="option1" ref="excelDom">
+        <mergeRowTable v-bind.sync="option1" ref="excelDom" @func="calculate">
         <el-table-column fixed="right" label="操作" width="50">
           <template slot-scope="scope">
             <el-button

src/views/inward/components/inwardSettlement/detailOrder.vue

@@ -66,7 +66,7 @@
         <el-button type="primary" class="btn" @click="onclick">
           <i class="el-icon-search"></i>
         </el-button>
-        <el-button type="primary" @click="exportAllExcel"
+        <el-button type="primary" @click="exportData()"
           ><i class="el-icon-download"></i>Excel</el-button
         >
       </el-form>

src/views/statisticalReport/components/dowmShipDynamicTable.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 万州港作业报表 -->
-  <div class="dowmShipDynamicTable">
+  <div class="dowmShipDynamicTable" style="width:100%">
     <div style="height:100%;width:100%">
       <div class="search" style="display:flex;margin: 10px;">
         <el-input
@@ -21,14 +21,15 @@
         </el-button>
       </div>
       <!-- 下游港口船舶动态表 -->
-      <div class="loadData" style="height:500px;margin-left:5px">
+      <div class="loadData" style="height:500px;margin-left:5px;width:100%">
         <!-- <div style="font-size:16px;color:red">港口装车数据:共{{count}}车</div> -->
-        <div class="loadTable" style="height:500px;overflow:scroll;">
+        <div class="loadTable" style="height:500px;overflow:scroll;width:100%">
         <el-table
           ref="loadTable"
           highlight-current-row
           empty-text="请查询数据"
           border
+          fit
           show-summary
           :summary-method="getSummaries"
           :span-method="objectSpanMethod"
@@ -45,7 +46,7 @@
           align="center"
             prop="productName"
             label="品种/数量/放货日期"
-            width="380px">
+            >
           </el-table-column>
           <el-table-column
           align="center"
@@ -57,7 +58,7 @@
           align="center"
             prop="capacityNumber"
             label="船名"
-            width="100px">
+            width="150px">
           </el-table-column>
            <el-table-column
           align="center"

src/views/statisticalReport/components/wanzhouReport/loadWagonWorkReport.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 万州港装船作业报表 -->
-  <div class="ShipWorkReport">
+  <div class="ShipWorkReport" style="width:100%;">
     <div style="height:100%;width:100%">
       <div class="search" style="display:flex;margin: 10px;">
         <el-input
@@ -30,13 +30,16 @@
       </div>
 
       <!-- 装车出库详情 -->
-      <div ref="loadWagonData" style="height:500px;float:left;margin-left:5px">
+      <div ref="loadWagonData" style="width:100%;height:500px;float:left;margin-left:5px">
         <div style="font-size:16px;color:red">港口装车数据:共{{count}}车</div>
-        <div class="loadTable" style="height:500px;overflow:scroll;">
+        <div class="loadTable" style="height:500px;width:100%;overflow:scroll;">
              <el-table
           ref="loadTable"
           highlight-current-row
           border
+          fit
+          show-summary
+          :summary-method="getSummaries"
           :data="loadTable"
           :span-method="objectSpanMethod"
           :row-style="{height:'40px'}"
@@ -44,20 +47,17 @@
           <el-table-column
           align="center"
             prop="materialName"
-            label="物资名"
-            width="300px">
+            label="物资名">
           </el-table-column>
           <el-table-column
           align="center"
             prop="resultForeignShipName"
-            label="船号"
-            width="150px">
+            label="船号">
           </el-table-column>
            <el-table-column
           align="center"
             prop="num"
-            label="装车量"
-            width="150px">
+            label="装车量">
           </el-table-column>
         </el-table>
         </div >
@@ -71,6 +71,7 @@ import PageTitle from "@/components/Page/Title";
 import { sjTime } from "@/utils/sharedJsFile";
 import {getCookie} from "@/utils/util.js";
 import FileSaver from "file-saver";
+import BigNumber from "bignumber.js";
 export default {
   components: { PageTitle },
   data() {
@@ -178,6 +179,35 @@ export default {
         }
         return table_write;
     },
+     getSummaries(param) {
+        console.log("param",param);
+        const { columns, data } = param;
+        const sums = [];
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计';
+            return;
+          }
+          if (index === 1 ) {
+            sums[index] = '';
+            return;
+          }
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return new BigNumber(prev).plus(curr).toNumber();
+              } else {
+                return prev;
+              }
+            }, 0);
+          } else {
+            sums[index] = '';
+          }
+        });
+        return sums;
+    },
   },
 };
 </script>

src/views/statisticalReport/components/wanzhouReport/unloadShipWorkReport.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 万州港卸船作业报表 -->
-  <div class="ShipWorkReport">
+  <div class="ShipWorkReport" style="width:100%;">
     <div style="height:100%;width:100%">
       <div class="search" style="display:flex;margin: 10px;">
         <el-input
@@ -29,27 +29,26 @@
         </el-button>
       </div>
       <!-- 装车出库详情 -->
-      <div ref="unloadData" style="height:500px;float:left;margin-left:5px">
+      <div ref="unloadData" style="height:500px;width:100%;float:left;margin-left:5px">
         <div style="font-size:16px;color:red">港口卸船数据</div>
-        <div class="loadTable" style="height:500px;overflow:scroll;">
+        <div class="loadTable" style="height:500px;width:100%;overflow:scroll;">
              <el-table
           ref="loadTable"
           highlight-current-row
           border
+          fit
           :data="unLoadTable"
           :row-style="{height:'40px'}"
           style="width: 100%;font-size: 18px">
           <el-table-column
           align="center"
             prop="status"
-            label="状态"
-            width="240px">
+            label="状态">
           </el-table-column>
           <el-table-column
           align="center"
             prop="num"
-            label="数量"
-            width="100px">
+            label="数量">
           </el-table-column>
         </el-table>
         </div >

src/views/statisticalReport/components/wanzhouReport/wagonWorkReport.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 车皮作业报表 -->
-  <div class="ShipWorkReport">
+  <div class="ShipWorkReport" style="width:100%;">
     <div style="height:100%;width:100%">
       <div class="search" style="display:flex;margin: 10px;">
         <!-- <el-input
@@ -30,26 +30,25 @@
       </div>
 
       <!-- 装车出库详情 -->
-      <div ref="loadWagonData" style="height:500px;float:left;margin-left:5px">
-        <div class="loadTable" style="height:500px;overflow:scroll;">
+      <div ref="loadWagonData" style="height:500px;float:left;margin-left:5px;width:100%">
+        <div class="loadTable" style="height:500px;overflow:scroll;width:100%">
              <el-table
           ref="loadTable"
           highlight-current-row
           border
+          fit
           :data="loadTable"
           :row-style="{height:'40px'}"
           style="width: 100%;font-size: 18px">
           <el-table-column
           align="center"
             prop="dateType"
-            label="数据类型"
-            width="300px">
+            label="数据类型">
           </el-table-column>
            <el-table-column
           align="center"
             prop="num"
-            label="装车量"
-            width="150px">
+            label="装车量">
           </el-table-column>
         </el-table>
         </div >