liyg 2 年之前
父節點
當前提交
a37b5553f7

+ 1 - 1
build/utils.js

@@ -16,7 +16,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 // let devModules = ['index', 'statisticalReport', 'appoint', 'queue']
-let devModules = ['all']
+let devModules = ['index','statisticalReport']
 //let devModules=['index']
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

+ 6 - 0
src/views/statisticalReport/components/Ship_dynamic_table.vue

@@ -222,6 +222,12 @@ export default {
             }
           }
        })
+       //表头字体重新设置
+      table_book.Sheets.Sheet1['A1'].s.font={
+                name:"宋体",
+                sz:16,
+                bold:true
+      }
       //画一个简报
        this.drawExcel(table_book.Sheets.Sheet1);
        //处理合并行样式

+ 15 - 2
src/views/statisticalReport/components/tableItem.vue

@@ -2,7 +2,8 @@
   <div>
     <table v-show="false">
       <tr>
-        <td colspan="22">达州钢铁每日船舶动态明细表</td>
+        <td colspan="18">达州钢铁每日船舶动态明细表</td>
+        <td colspan="4">{{deadline}}</td> 
       </tr>
     </table>
 
@@ -331,7 +332,8 @@ export default {
       runStockStringArr: [],
       spanArr: [],
       loadTable: [],
-      controlLinesTable: []
+      controlLinesTable: [],
+      deadline:null
     }
   },
   mounted() {
@@ -340,8 +342,19 @@ export default {
     this.getRunStockList()
     this.searchLoadData()
     this.getControlLines()
+    this.initialDate()
   },
   methods: {
+    initialDate(){
+      let now=new Date();
+      this.deadline=now.getFullYear()+'年'+(now.getMonth()+1)+'月'+now.getDate()+'日';
+      if(now.getHours()>=8&&now.getHours()<18){
+        this.deadline+='(数据截止于8:00)';
+      }else{
+        this.deadline+='(数据截止于18:00)';
+      }
+      console.log("deadline:",this.deadline);
+    },
     getStockString() {
       let that = this
       this.axios