工时管理的合计和页面样式修改

applications/dee-mes/src/views/assemblyPlanManagement/TimeToSee/components/productionTable.vue

@@ -4,7 +4,6 @@
     <dee-table
       v-if="sumRowShow"
       ref="table"
-      :loading="loading"
       :index-row="indexRow"
       :columns="tableColums"
       :data="tableData"
@@ -76,8 +75,8 @@ export default {
       tableOptions: {
         stripe: true,
         border: true,
-        height: '400',
-        showSummary: true,
+        height: '64vh',
+        showSummary: false,
         summaryMethod: this.getSummaries
       },
       // 表格选中行
@@ -91,6 +90,11 @@ export default {
   },
   mounted() {
   },
+  updated() {
+    this.$nextTick(() => {
+      this.$refs['table'].$refs['deeTable'].doLayout()
+    })
+  },
   methods: {
     // 合计
     getSummaries(param) {
@@ -225,6 +229,7 @@ export default {
         this.loading = false
         this.$nextTick(() => {
           this.sumRowShow = true
+          this.tableOptions.showSummary = true
         })
       })
     },

applications/dee-mes/src/views/assemblyPlanManagement/TimeToSee/components/temporaryTable.vue

@@ -4,7 +4,6 @@
     <dee-table
       v-if="sumRowShow"
       ref="table"
-      :loading="loading"
       :index-row="indexRow"
       :columns="tableColums"
       :data="tableData"
@@ -87,7 +86,7 @@ export default {
       tableOptions: {
         stripe: true,
         border: true,
-        height: '400',
+        height: '64vh',
         showSummary: true,
         summaryMethod: this.getSummaries
       },
@@ -112,6 +111,11 @@ export default {
   mounted() {
     // this.init()
   },
+  updated() {
+    this.$nextTick(() => {
+      this.$refs['table'].$refs['deeTable'].doLayout()
+    })
+  },
   methods: {
     getSummaries(param) {
       this.showSummary = true

applications/dee-mes/src/views/assemblyPlanManagement/TimeToSee/index.vue

@@ -2,7 +2,7 @@
   <section class="time-to-see">
     <Search :active-name="activeName" @init="searchData" />
     <dee-tools :tools="tools" mode="normal" :collapse="false" />
-    <el-tabs v-model="activeName" type="card" @tab-click="tabClick">
+    <el-tabs v-model="activeName" type="card" class="time-tab" @tab-click="tabClick">
       <el-tab-pane label="生产工时" name="product">
         <ProductionTable ref="productTable" />
       </el-tab-pane>
@@ -75,5 +75,8 @@ export default {
     top: 10px;
     z-index: 99999;
   }
+  .time-tab{
+    height: calc(100vh - 100px);
+  }
 }
 </style>

applications/dee-mes/src/views/taskExecution/components/TimeToSee/components/productionTable.vue

@@ -4,7 +4,6 @@
     <dee-table
       v-if="sumRowShow"
       ref="table"
-      :loading="loading"
       :index-row="indexRow"
       :columns="tableColums"
       :data="tableData"
@@ -91,6 +90,11 @@ export default {
   },
   mounted() {
   },
+  updated() {
+    this.$nextTick(() => {
+      this.$refs['table'].$refs['deeTable'].doLayout()
+    })
+  },
   methods: {
     // 合计
     getSummaries(param) {

applications/dee-mes/src/views/taskExecution/components/TimeToSee/components/temporaryTable.vue

@@ -4,7 +4,6 @@
     <dee-table
       v-if="sumRowShow"
       ref="table"
-      :loading="loading"
       :index-row="indexRow"
       :columns="tableColums"
       :data="tableData"
@@ -112,6 +111,11 @@ export default {
   mounted() {
     // this.init()
   },
+  updated() {
+    this.$nextTick(() => {
+      this.$refs['table'].$refs['deeTable'].doLayout()
+    })
+  },
   methods: {
     getSummaries(param) {
       this.showSummary = true