From fe1a1af5020deba20a39fb0c4a74ab06c830cf7b Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Sun, 27 Apr 2025 14:16:44 +0800
Subject: [PATCH] =?UTF-8?q?2025-04-27=20=E7=82=B9=E6=A3=80=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E5=92=8C=E8=AE=A1=E5=88=92=E5=A2=9E=E5=8A=A0=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E4=BA=BA=EF=BC=8C=E5=8F=96=E6=B6=88=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/eam/com_eam_object_add_update.vue |  2 +-
 .../modules/eam/eamWorkOrderForCheck.vue      |  7 ++---
 src/views/modules/part/copy_bom_modal.vue     | 26 ++++++++++---------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/views/modules/eam/com_eam_object_add_update.vue b/src/views/modules/eam/com_eam_object_add_update.vue
index 5babc28..c38c8d9 100644
--- a/src/views/modules/eam/com_eam_object_add_update.vue
+++ b/src/views/modules/eam/com_eam_object_add_update.vue
@@ -134,7 +134,7 @@ import {
 } from '@/api/eam/com_eam_object_add_update.js'
 import {getSiteAndBuByUserName} from "@/api/eam/eam.js"
 /* 引入组件 */
-import Chooselist from '@/views/modules/common/Chooselist_eam';/* 列表组件 */
+import Chooselist from '@/views/modules/common/Chooselist_eam';
 var functionId = 'C10000001';
 
 export default {
diff --git a/src/views/modules/eam/eamWorkOrderForCheck.vue b/src/views/modules/eam/eamWorkOrderForCheck.vue
index e79bd74..d8fe274 100644
--- a/src/views/modules/eam/eamWorkOrderForCheck.vue
+++ b/src/views/modules/eam/eamWorkOrderForCheck.vue
@@ -993,7 +993,8 @@
           functionType: '',
           cancelAll: '',
           planID: '',
-          status: ''
+          status: '',
+          userId: ''
         },
         descImages: [],
         imageModalFlag: false,
@@ -1491,7 +1492,8 @@
           functionType: row.functionType,
           planID: row.planID,
           status: row.status,
-          cancelAll: ''
+          cancelAll: '',
+          userId: this.$store.state.user.name
         }
         this.cancelModelFlag = true
       },
@@ -1513,7 +1515,6 @@
             type: 'warning'
           }).then(() => {
             this.cancelOrder3()
-          }).catch(() => {
           })
         } else {
           this.cancelOrder3()
diff --git a/src/views/modules/part/copy_bom_modal.vue b/src/views/modules/part/copy_bom_modal.vue
index efe81d4..0825459 100644
--- a/src/views/modules/part/copy_bom_modal.vue
+++ b/src/views/modules/part/copy_bom_modal.vue
@@ -443,15 +443,16 @@
     <!-- BOM切换版本 -->
     <el-dialog v-if="this.activeTable === 'temp_bom'" title="BOM版本切换" :visible.sync="versionVisible1" append-to-body :close-on-click-modal="false" v-drag width="900px">
       <el-table :data="versionList1" ref="versionTable" :row-style="levelRowStyle" @row-click="levelRowClick" style="width: 100%" border :height="240">
-        <el-table-column label="物料编码" prop="partNo" header-align="center" align="center" show-overflow-tooltip min-width="140"/>
-        <el-table-column label="物料描述" prop="partDesc" header-align="center" align="center" show-overflow-tooltip min-width="200"/>
-        <el-table-column label="版本" prop="engChgLevel" header-align="center" align="center" show-overflow-tooltip min-width="60"/>
+        <el-table-column label="物料编码" prop="partNo" header-align="center" align="left" show-overflow-tooltip min-width="140"/>
+        <el-table-column label="物料描述" prop="partDesc" header-align="center" align="left" show-overflow-tooltip min-width="200"/>
+        <el-table-column label="版本" prop="engChgLevel" header-align="center" align="right" show-overflow-tooltip min-width="60"/>
         <el-table-column label="类型" prop="bomType" header-align="center" align="center" show-overflow-tooltip min-width="100"/>
+        <el-table-column label="备注" prop="noteText" header-align="center" align="left" show-overflow-tooltip min-width="100"/>
       </el-table>
       <el-table :data="alternativeList1" :row-style="alternativeRowStyle1" ref="versionTable" style="width: 100%;margin-top: 20px" border :height="240">
-        <el-table-column label="物料编码" prop="partNo" header-align="center" align="center" show-overflow-tooltip min-width="140"/>
-        <el-table-column label="物料描述" prop="partDesc" header-align="center" align="center" show-overflow-tooltip min-width="200"/>
-        <el-table-column label="版本" prop="engChgLevel" header-align="center" align="center" show-overflow-tooltip min-width="60"/>
+        <el-table-column label="物料编码" prop="partNo" header-align="center" align="left" show-overflow-tooltip min-width="140"/>
+        <el-table-column label="物料描述" prop="partDesc" header-align="center" align="left" show-overflow-tooltip min-width="200"/>
+        <el-table-column label="版本" prop="engChgLevel" header-align="center" align="right" show-overflow-tooltip min-width="60"/>
         <el-table-column label="替代编码" prop="alternativeNo" header-align="center" align="center" show-overflow-tooltip min-width="60"/>
         <el-table-column label="类型" prop="bomType" header-align="center" align="center" show-overflow-tooltip min-width="100"/>
         <el-table-column label="操作" header-align="center" align="center" min-width="100">
@@ -465,15 +466,16 @@
     <!-- Routing切换版本 -->
     <el-dialog v-else-if="this.activeTable === 'temp_routing'" title="Routing版本切换" :visible.sync="versionVisible2" append-to-body :close-on-click-modal="false" v-drag width="900px">
       <el-table :data="versionList2" ref="routingVersionTable" :row-style="versionRowStyle" @row-click="versionRowClick" style="width: 100%" border :height="240">
-        <el-table-column label="物料编码" prop="partNo" header-align="center" align="center" show-overflow-tooltip min-width="140"/>
-        <el-table-column label="物料描述" prop="partDesc" header-align="center" align="center" show-overflow-tooltip min-width="200"/>
-        <el-table-column label="版本" prop="routingRevision" header-align="center" align="center" show-overflow-tooltip min-width="60"/>
+        <el-table-column label="物料编码" prop="partNo" header-align="center" align="left" show-overflow-tooltip min-width="140"/>
+        <el-table-column label="物料描述" prop="partDesc" header-align="center" align="left" show-overflow-tooltip min-width="200"/>
+        <el-table-column label="版本" prop="routingRevision" header-align="center" align="right" show-overflow-tooltip min-width="60"/>
         <el-table-column label="类型" prop="routingType" header-align="center" align="center" show-overflow-tooltip min-width="100"/>
+        <el-table-column label="备注" prop="noteText" header-align="center" align="left" show-overflow-tooltip min-width="100"/>
       </el-table>
       <el-table :data="alternativeList2"  :row-style="alternativeRowStyle2" ref="routingAlternativeTable" style="width: 100%;margin-top: 20px" border :height="240">
-        <el-table-column label="物料编码" prop="partNo" header-align="center" align="center" show-overflow-tooltip min-width="140"/>
-        <el-table-column label="物料描述" prop="partDesc" header-align="center" align="center" show-overflow-tooltip min-width="200"/>
-        <el-table-column label="版本" prop="routingRevision" header-align="center" align="center" show-overflow-tooltip min-width="60"/>
+        <el-table-column label="物料编码" prop="partNo" header-align="center" align="left" show-overflow-tooltip min-width="140"/>
+        <el-table-column label="物料描述" prop="partDesc" header-align="center" align="left" show-overflow-tooltip min-width="200"/>
+        <el-table-column label="版本" prop="routingRevision" header-align="center" align="right" show-overflow-tooltip min-width="60"/>
         <el-table-column label="替代编码" prop="alternativeNo" header-align="center" align="center" show-overflow-tooltip min-width="60"/>
         <el-table-column label="类型" prop="routingType" header-align="center" align="center" show-overflow-tooltip min-width="100"/>
         <el-table-column label="操作" min-width="80" header-align="center" align="center">