From 8d11af168e564a8e0779794f2f56a2248efd4911 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 29 Apr 2025 13:08:25 +0800
Subject: [PATCH] 20250429

---
 .../board/VulcanizationDispatchOrder.vue      | 64 ++++---------------
 src/views/modules/board/partInventory.vue     | 21 +-----
 2 files changed, 17 insertions(+), 68 deletions(-)

diff --git a/src/views/modules/board/VulcanizationDispatchOrder.vue b/src/views/modules/board/VulcanizationDispatchOrder.vue
index 9b59e96..4a7c74f 100644
--- a/src/views/modules/board/VulcanizationDispatchOrder.vue
+++ b/src/views/modules/board/VulcanizationDispatchOrder.vue
@@ -12,16 +12,15 @@ export default {
         firstReportDate2Flag:'Y',
       },
       columnList: [
-        {tableId: "vulcanizationTable", tableName: this.$route.meta.title, columnProp: "site", columnLabel: "工厂", columnHidden: false, columnImage: false, columnSortable: false, columnWidth: 40, format: null, functionId: this.$route.meta.menuId, sortLv: 0, status: true, fixed: '', serialNumber: null, columnType: null, align: 'left'},
         {
           tableId: "vulcanizationTable",
           tableName: this.$route.meta.title,
-          columnProp: "seqNo",
-          columnLabel: "派工单",
+          columnProp: "site",
+          columnLabel: "工厂",
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
-          columnWidth: 60,
+          columnWidth: 38,
           format: null,
           functionId: this.$route.meta.menuId,
           sortLv: 0,
@@ -34,12 +33,12 @@ export default {
         {
           tableId: "vulcanizationTable",
           tableName: this.$route.meta.title,
-          columnProp: "orderNo",
-          columnLabel: "生产订单",
+          columnProp: "seqNo",
+          columnLabel: "派工单",
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
-          columnWidth: 100,
+          columnWidth: 55,
           format: null,
           functionId: this.$route.meta.menuId,
           sortLv: 0,
@@ -48,15 +47,16 @@ export default {
           serialNumber: null,
           columnType: null,
           align: 'left'
-        }, {
+        },
+        {
           tableId: "vulcanizationTable",
           tableName: this.$route.meta.title,
-          columnProp: "partNo",
-          columnLabel: "物料编码",
+          columnProp: "orderNo",
+          columnLabel: "生产订单",
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
-          columnWidth: 60,
+          columnWidth: 100,
           format: null,
           functionId: this.$route.meta.menuId,
           sortLv: 0,
@@ -84,42 +84,6 @@ export default {
           columnType: null,
           align: 'left'
         },
-        {
-          tableId: "vulcanizationTable",
-          tableName: this.$route.meta.title,
-          columnProp: "qtyReported",
-          columnLabel: "派工数量",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          columnWidth: 60,
-          format: null,
-          functionId: this.$route.meta.menuId,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          serialNumber: null,
-          columnType: null,
-          align: 'right'
-        },
-        {
-          tableId: "vulcanizationTable",
-          tableName: this.$route.meta.title,
-          columnProp: "qtyRequired",
-          columnLabel: "需求数量",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          columnWidth: 60,
-          format: null,
-          functionId: this.$route.meta.menuId,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          serialNumber: null,
-          columnType: null,
-          align: 'right'
-        },
         {
           tableId: "vulcanizationTable",
           tableName: this.$route.meta.title,
@@ -146,7 +110,7 @@ export default {
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
-          columnWidth: 120,
+          columnWidth: 130,
           format: null,
           functionId: this.$route.meta.menuId,
           sortLv: 0,
@@ -164,7 +128,7 @@ export default {
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
-          columnWidth: 75,
+          columnWidth: 70,
           format: null,
           functionId: this.$route.meta.menuId,
           sortLv: 0,
@@ -182,7 +146,7 @@ export default {
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
-          columnWidth: 120,
+          columnWidth: 80,
           format: null,
           functionId: this.$route.meta.menuId,
           sortLv: 0,
diff --git a/src/views/modules/board/partInventory.vue b/src/views/modules/board/partInventory.vue
index ae6a908..58bc360 100644
--- a/src/views/modules/board/partInventory.vue
+++ b/src/views/modules/board/partInventory.vue
@@ -375,16 +375,6 @@ export default {
       this.queryParams.no = val;
       this.handleQueryPartInventory();
     },
-    getFullNum(num) {
-      if (isNaN(num)) {
-        return num;
-      }
-      let str = '' + num;
-      if (!/e/i.test(str)) {
-        return num;
-      }
-      return num.toFixed(18).replace(/\.?0+$/, "");
-    }
   },
   created() {
 
@@ -562,14 +552,9 @@ export default {
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <template v-if="item.columnProp === 'batchNo'">
-            <span> {{ getFullNum(scope.row[item.columnProp]) }}</span>
-          </template>
-          <template v-else>
-            <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                               style="width: 100px; height: 80px"/></span>
-          </template>
+          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                             style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
     </el-table>