修改

src/views/WMS/components/port_deposit/unloadPortStock.vue

@@ -15,6 +15,13 @@
       </el-button>
     </div>
     <mergeRowTable v-bind.sync="option">
+      <el-table-column fixed="right" label="操作" width="60">
+          <template slot-scope="scope">
+              <el-button @click="detailclick3(scope.row)" type="text" size="small">
+                手动清场
+              </el-button>
+          </template>
+    </el-table-column>
     </mergeRowTable>
   </div>
 </template>
@@ -41,11 +48,34 @@ export default {
       console.log(item);
     },
     onclick() {
-      console.log(1);
+      this.option.requestUrl="/api/v1/wmsh/getUnloadPortStockList?apiId=497&i="+new Date();
     },
     btnclick(pathId) {
       this.$router.push("/path/addHomeworkPath/" + pathId);
     },
+     detailclick3(row){
+      console.log("row",row);
+       this.$confirm('确认清场?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+         this.axios.post("/api/v1/wmsh/clearWmshGridMaterial", row).then(res => {
+          console.log("res", res);
+          if(res.data.succeed){
+            this.$message.success("清场成功！");
+            this.onclick();
+          }else{
+            this.$message.error("清场失败！");
+          }
+        });
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '取消操作'
+          });          
+        });
+    },
   },
 };
 </script>

src/views/statisticalReport/components/Ship_dynamic_table.vue

@@ -56,7 +56,7 @@ export default {
         },
         {
           prop: "tonnage1",
-          label: "二层船吨位"
+          label: "二程船吨位"
         },
         {
           label: "未到闸船舶",
@@ -197,6 +197,10 @@ export default {
         Object.keys(table_book.Sheets.Sheet1).forEach((key) => {
           if (key.indexOf('!') < 0) {
             table_book.Sheets.Sheet1[key].s = {
+              font:{
+                name:"宋体",
+                sz:10
+              },
               alignment: {//对齐方式
                 horizontal: 'center',//水平居中
                 vertical: 'center',//竖直居中
@@ -211,6 +215,7 @@ export default {
             }
           }
        })
+       this.addRangeBorder(table_book.Sheets.Sheet1['!merges'],table_book.Sheets.Sheet1);
        console.log("sheet:",table_book.Sheets.Sheet1);
         //导出
         let table_write = XLSXStyle.write(table_book, {
@@ -227,6 +232,31 @@ export default {
         }
         return table_write;
     },
+    addRangeBorder (range, ws) {
+      let cols = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
+      range.forEach(item => {
+        console.log(item)
+        let style = {
+          s: {
+            border: {
+              top: { style: 'thin' },
+              left: { style: 'thin' },
+              bottom: { style: 'thin' },
+              right: { style: 'thin' }
+            }
+          }
+        }
+        // 处理合并行
+        for (let i = item.s.c; i <= item.e.c; i++) {
+          ws[`${cols[i]}${Number(item.e.r) + 1}`] = ws[`${cols[i]}${Number(item.e.r) + 1}`] || style
+          // 处理合并列
+          for (let k = item.s.r + 2; k <= item.e.r + 1; k++) {
+            ws[cols[i] + k] = ws[cols[k] + item.e.r] || style
+          }
+        }
+      })
+      return ws;
+    },
     appendOne(Sheet,row){
       //从后面新增1行，并行合并
         let seArr=Sheet['!fullref'].split(":");

src/views/statisticalReport/components/tableItem.vue

@@ -402,6 +402,11 @@ export default {
                 })
               })
             })
+            //处理打印字符串
+            this.stockString='万港库存：'+this.stockMap.stockTonnage+"吨：";
+            this.stockStringArr.forEach((item)=>{
+              this.stockString+=item.value;
+            });
           }
         })
     },
@@ -456,6 +461,11 @@ export default {
               })
             })
           })
+          //处理打印字符串
+          this.downStockString='下游港口库存：'+this.downStockMap.downStockTonnage+"吨：";
+          this.downStockStringArr.forEach((item)=>{
+            this.downStockString+=item.value;
+          });
         }
       })
     },
@@ -508,6 +518,11 @@ export default {
               })
             })
           })
+          //处理打印字符串
+          this.runStockString='在途货物：'+this.runStockMap.runStockTonnage+"吨：";
+          this.runStockStringArr.forEach((item)=>{
+            this.runStockString+=item.value;
+          });
         }
       })
     },