修改

src/views/statisticalReport/components/Ship_dynamic_table.vue

@@ -186,9 +186,6 @@ export default {
         let table_book = XLSX.utils.table_to_book(tables);
         console.log("table_book:",table_book);
         console.log("sheet:",table_book.Sheets.Sheet1);
-        table_book.Sheets.Sheet1=this.appendOne(table_book.Sheets.Sheet1,this.downStockString);
-        table_book.Sheets.Sheet1=this.appendOne(table_book.Sheets.Sheet1,this.stockString);
-        table_book.Sheets.Sheet1=this.appendOne(table_book.Sheets.Sheet1,this.runStockString);
         //这里遍历单元格给单元格对象设置属性,s为控制样式的属性
         Object.keys(table_book.Sheets.Sheet1).forEach((key) => {
           if (key.indexOf('!') < 0) {

src/views/statisticalReport/components/tableItem.vue

@@ -28,7 +28,7 @@
           <span class="empty-desc">暂无数据</span>
         </div>
       </template>
-      <div slot="append">
+      <div slot="append" style="width: 100%">
         <div class="appendSlot" style="margin-top:20px">
           <span
             v-for="item in downStockStringArr"
@@ -56,6 +56,22 @@
           >
         </div>
         <el-divider></el-divider>
+        <!-- 库存表 -->
+        <table v-show="false">
+          <tr>
+            <td colspan="22">{{downStockString}}</td>
+          </tr>
+          <tr>
+            <td colspan="22">{{stockString}}</td>
+          </tr>
+          <tr>
+            <td colspan="22">{{runStockString}}</td>
+          </tr>
+          <tr>
+            <td colspan="22"></td>
+          </tr>
+        </table>
+        <!-- 万州港装车数据 -->
         <div class="appendSlot">
              <el-table
           ref="loadTable"
@@ -66,6 +82,7 @@
           :span-method="objectSpanMethod1"
           :row-style="{height:'40px'}"
           style="font-size: 18px">
+          <el-table-column label="万州港发货信息">
           <el-table-column
           align="center"
             prop="materialName"
@@ -90,6 +107,130 @@
             width="200px"
             label="时间">
           </el-table-column>
+          </el-table-column>
+          <el-table-column>
+          </el-table-column>
+          <el-table-column label="进口矿水联运情况简报">
+             <el-table-column>
+            </el-table-column>
+            <el-table-column>
+            </el-table-column>
+            <el-table-column>
+            </el-table-column>
+            <el-table-column>
+            </el-table-column>
+          </el-table-column>
+        </el-table>
+        </div >
+        <el-divider></el-divider>
+        <!-- 等闸线 -->
+        <div class="appendSlot">
+             <el-table
+          highlight-current-row
+          border
+          :data="controlLinesTable"
+          :row-style="{height:'40px'}"
+          style="font-size: 12px">
+          <!-- 4 -->
+          <el-table-column
+          align="center"
+            prop="lineDate4"
+            width="100px"
+            label="日期">
+          </el-table-column>
+          <el-table-column
+          align="center"
+            prop="up4"
+            width="80px"
+            label="上行等闸数">
+          </el-table-column>
+           <el-table-column
+          align="center"
+            prop="down4"
+            width="80px"
+            label="下行等闸数">
+          </el-table-column>
+           <el-table-column
+          align="center"
+            prop="count4"
+            width="80px"
+            label="总计">
+          </el-table-column>
+          <!-- 3 -->
+          <el-table-column
+          align="center"
+            prop="lineDate3"
+            width="100px"
+            label="日期">
+          </el-table-column>
+          <el-table-column
+          align="center"
+            prop="up3"
+            width="80px"
+            label="上行等闸数">
+          </el-table-column>
+           <el-table-column
+          align="center"
+            prop="down3"
+            width="80px"
+            label="下行等闸数">
+          </el-table-column>
+           <el-table-column
+          align="center"
+            prop="count3"
+            width="80px"
+            label="总计">
+          </el-table-column>
+          <!-- 2 -->
+          <el-table-column
+          align="center"
+            prop="lineDate2"
+            width="100px"
+            label="日期">
+          </el-table-column>
+          <el-table-column
+          align="center"
+            prop="up2"
+            width="80px"
+            label="上行等闸数">
+          </el-table-column>
+           <el-table-column
+          align="center"
+            prop="down2"
+            width="80px"
+            label="下行等闸数">
+          </el-table-column>
+           <el-table-column
+          align="center"
+            prop="count2"
+            width="80px"
+            label="总计">
+          </el-table-column>
+          <!-- 1 -->
+          <el-table-column
+          align="center"
+            prop="lineDate1"
+            width="100px"
+            label="日期">
+          </el-table-column>
+          <el-table-column
+          align="center"
+            prop="up1"
+            width="80px"
+            label="上行等闸数">
+          </el-table-column>
+           <el-table-column
+          align="center"
+            prop="down1"
+            width="80px"
+            label="下行等闸数">
+          </el-table-column>
+           <el-table-column
+          align="center"
+            prop="count1"
+            width="80px"
+            label="总计">
+          </el-table-column>
         </el-table>
         </div >
       </div>
@@ -144,7 +285,8 @@ export default {
       downStockStringArr: [],
       runStockStringArr:[],
       spanArr:[],
-      loadTable:[]
+      loadTable:[],
+      controlLinesTable:[]
     };
   },
   mounted() {
@@ -152,6 +294,7 @@ export default {
     this.getDownStockString();
     this.getRunStockList();
     this.searchLoadData();
+    this.getControlLines();
   },
   methods: {
     getStockString() {
@@ -227,6 +370,10 @@ export default {
               }
             });
             console.log("arr:", this.stockStringArr);
+            this.stockString='';
+            this.stockStringArr.forEach((item)=>{
+              this.stockString+=item.value;
+            });
           }
         });
     },
@@ -277,7 +424,7 @@ export default {
             console.log("arr:", this.downStockStringArr);
             this.downStockString='';
             this.downStockStringArr.forEach((item)=>{
-              downStockString+=item.value;
+              this.downStockString+=item.value;
             });
           }
         });
@@ -329,7 +476,7 @@ export default {
             console.log("arr:", this.runStockStringArr);
             this.runStockString='';
             this.runStockStringArr.forEach((item)=>{
-              runStockString+=item.value;
+              this.runStockString+=item.value;
             });
           }
         });
@@ -485,6 +632,23 @@ export default {
             };
         }
     },
+    //查询控制线数据
+    getControlLines(){
+      let map={
+        year:new Date().getFullYear(),
+        month:new Date().getMonth()+1
+      };
+      this.axios.post('/api/v1/tms/getControlLinesTable',map).then((res)=>{
+        if(res.data.code == "200"){
+          this.controlLinesTable=res.data.data;
+        }else {
+          this.$message({
+              type: "error", 
+              message: res.data.data,
+          });
+        }
+      })
+    },
   }
 };
 </script>