From b435685279a52477a58dc58bcca6e5311815b54a Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Sun, 18 Feb 2024 13:46:09 +0800
Subject: [PATCH] 66

---
 src/views/modules/board/SORoutingBoard.vue | 128 ++++++++++-----------
 src/views/modules/board/scheduledBoard.vue |   2 +-
 src/views/modules/board/shopOrderBoard.vue | 128 ++++++++++-----------
 src/views/modules/knifemold/tool-info.vue  |   2 +-
 4 files changed, 130 insertions(+), 130 deletions(-)

diff --git a/src/views/modules/board/SORoutingBoard.vue b/src/views/modules/board/SORoutingBoard.vue
index 7ac16ee..f487c98 100644
--- a/src/views/modules/board/SORoutingBoard.vue
+++ b/src/views/modules/board/SORoutingBoard.vue
@@ -96,70 +96,70 @@
           label="上工序完成数量">
         </el-table-column>
       </el-table>
-      <el-table
-        cell-style="cc"
-        height="99"
-        :data="tableData2"
-        ref="wt_table"
-        border
-        style="width: 100%;">
-        <el-table-column
-          prop="seqNo"
-          header-align="center"
-          align="left"
-          width="60"
-          label="派工单号">
-        </el-table-column>
-        <el-table-column
-          prop="orderNo"
-          header-align="center"
-          align="left"
-          width="100"
-          label="生产订单">
-        </el-table-column>
-        <el-table-column
-          prop="partNo"
-          header-align="center"
-          align="left"
-          width="60"
-          label="物料编码">
-        </el-table-column>
-        <el-table-column
-          prop="productionLineDesc"
-          header-align="center"
-          align="center"
-          width="100"
-          label="产线">
-        </el-table-column>
-        <el-table-column
-          prop="feedbackDate"
-          header-align="center"
-          align="center"
-          width="80"
-          label="反馈时间">
-        </el-table-column>
-        <el-table-column
-          prop="status"
-          header-align="center"
-          align="left"
-          width="60"
-          label="状态">
-        </el-table-column>
-        <el-table-column
-          prop="abnormalDesc"
-          header-align="center"
-          align="left"
-          width="100"
-          label="异常原因">
-        </el-table-column>
-        <el-table-column
-          prop="abnormalRemark"
-          header-align="center"
-          align="left"
-          min-width="200"
-          label="异常描述">
-        </el-table-column>
-      </el-table>
+<!--      <el-table-->
+<!--        cell-style="cc"-->
+<!--        height="99"-->
+<!--        :data="tableData2"-->
+<!--        ref="wt_table"-->
+<!--        border-->
+<!--        style="width: 100%;">-->
+<!--        <el-table-column-->
+<!--          prop="seqNo"-->
+<!--          header-align="center"-->
+<!--          align="left"-->
+<!--          width="60"-->
+<!--          label="派工单号">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column-->
+<!--          prop="orderNo"-->
+<!--          header-align="center"-->
+<!--          align="left"-->
+<!--          width="100"-->
+<!--          label="生产订单">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column-->
+<!--          prop="partNo"-->
+<!--          header-align="center"-->
+<!--          align="left"-->
+<!--          width="60"-->
+<!--          label="物料编码">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column-->
+<!--          prop="productionLineDesc"-->
+<!--          header-align="center"-->
+<!--          align="center"-->
+<!--          width="100"-->
+<!--          label="产线">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column-->
+<!--          prop="feedbackDate"-->
+<!--          header-align="center"-->
+<!--          align="center"-->
+<!--          width="80"-->
+<!--          label="反馈时间">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column-->
+<!--          prop="status"-->
+<!--          header-align="center"-->
+<!--          align="left"-->
+<!--          width="60"-->
+<!--          label="状态">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column-->
+<!--          prop="abnormalDesc"-->
+<!--          header-align="center"-->
+<!--          align="left"-->
+<!--          width="100"-->
+<!--          label="异常原因">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column-->
+<!--          prop="abnormalRemark"-->
+<!--          header-align="center"-->
+<!--          align="left"-->
+<!--          min-width="200"-->
+<!--          label="异常描述">-->
+<!--        </el-table-column>-->
+<!--      </el-table>-->
     </div>
 
   </div>
diff --git a/src/views/modules/board/scheduledBoard.vue b/src/views/modules/board/scheduledBoard.vue
index bd478a2..38bf9a3 100644
--- a/src/views/modules/board/scheduledBoard.vue
+++ b/src/views/modules/board/scheduledBoard.vue
@@ -509,7 +509,7 @@
 
 <style >
     .container {
-      height: 109%;
+      /*height: 109%;*/
       position: fixed;
       top: 0;
       left: 0;
diff --git a/src/views/modules/board/shopOrderBoard.vue b/src/views/modules/board/shopOrderBoard.vue
index 2c867fa..0d96c92 100644
--- a/src/views/modules/board/shopOrderBoard.vue
+++ b/src/views/modules/board/shopOrderBoard.vue
@@ -83,70 +83,70 @@
           label="最近入库日期">
         </el-table-column>
       </el-table>
-      <el-table
-        cell-style="cc"
-        height="99"
-        :data="tableData2"
-        ref="wt_table"
-        border
-        style="width: 100%;">
-        <el-table-column
-          prop="seqNo"
-          header-align="center"
-          align="left"
-          width="60"
-          label="派工单号">
-        </el-table-column>
-        <el-table-column
-          prop="orderNo"
-          header-align="center"
-          align="left"
-          width="100"
-          label="生产订单">
-        </el-table-column>
-        <el-table-column
-          prop="partNo"
-          header-align="center"
-          align="center"
-          width="100"
-          label="物料编码">
-        </el-table-column>
-        <el-table-column
-          prop="productionLineDesc"
-          header-align="center"
-          align="center"
-          width="60"
-          label="产线">
-        </el-table-column>
-        <el-table-column
-          prop="feedbackDate"
-          header-align="center"
-          align="center"
-          width="80"
-          label="反馈时间">
-        </el-table-column>
-        <el-table-column
-          prop="status"
-          header-align="center"
-          align="center"
-          width="60"
-          label="状态">
-        </el-table-column>
-        <el-table-column
-          prop="abnormalDesc"
-          header-align="center"
-          align="left"
-          width="100"
-          label="异常原因">
-        </el-table-column>
-        <el-table-column
-          prop="abnormalRemark"
-          header-align="center"
-          align="left"
-          min-width="200"
-          label="异常描述">
-        </el-table-column>
-      </el-table>
+<!--      <el-table-->
+<!--        cell-style="cc"-->
+<!--        height="99"-->
+<!--        :data="tableData2"-->
+<!--        ref="wt_table"-->
+<!--        border-->
+<!--        style="width: 100%;">-->
+<!--        <el-table-column-->
+<!--          prop="seqNo"-->
+<!--          header-align="center"-->
+<!--          align="left"-->
+<!--          width="60"-->
+<!--          label="派工单号">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column-->
+<!--          prop="orderNo"-->
+<!--          header-align="center"-->
+<!--          align="left"-->
+<!--          width="100"-->
+<!--          label="生产订单">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column-->
+<!--          prop="partNo"-->
+<!--          header-align="center"-->
+<!--          align="center"-->
+<!--          width="100"-->
+<!--          label="物料编码">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column-->
+<!--          prop="productionLineDesc"-->
+<!--          header-align="center"-->
+<!--          align="center"-->
+<!--          width="60"-->
+<!--          label="产线">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column-->
+<!--          prop="feedbackDate"-->
+<!--          header-align="center"-->
+<!--          align="center"-->
+<!--          width="80"-->
+<!--          label="反馈时间">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column-->
+<!--          prop="status"-->
+<!--          header-align="center"-->
+<!--          align="center"-->
+<!--          width="60"-->
+<!--          label="状态">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column-->
+<!--          prop="abnormalDesc"-->
+<!--          header-align="center"-->
+<!--          align="left"-->
+<!--          width="100"-->
+<!--          label="异常原因">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column-->
+<!--          prop="abnormalRemark"-->
+<!--          header-align="center"-->
+<!--          align="left"-->
+<!--          min-width="200"-->
+<!--          label="异常描述">-->
+<!--        </el-table-column>-->
+<!--      </el-table>-->
     </div>
   </div>
 </template>
diff --git a/src/views/modules/knifemold/tool-info.vue b/src/views/modules/knifemold/tool-info.vue
index df7d717..2f74cb6 100644
--- a/src/views/modules/knifemold/tool-info.vue
+++ b/src/views/modules/knifemold/tool-info.vue
@@ -839,7 +839,7 @@ export default {
           columnProp: 'finishQty',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '使用寿命',
+          columnLabel: '使用数量',
           columnHidden: false,
           columnImage: false,
           columnSortable: true,