From 6bd98380b0cb5ca0bf458bb3921f9301d5e416de Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Sat, 23 May 2026 18:34:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../blbWorkOrder/components/glass.vue         | 23 +++++++++----------
 .../blbWorkOrder/components/others.vue        | 21 ++++++++---------
 .../productionMonitoring/index.vue            |  4 +++-
 .../sinTerWorkOrder/index.vue                 | 21 ++++++++---------
 4 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/src/views/productionManagement/blbWorkOrder/components/glass.vue b/src/views/productionManagement/blbWorkOrder/components/glass.vue
index 23f49884..431590f4 100644
--- a/src/views/productionManagement/blbWorkOrder/components/glass.vue
+++ b/src/views/productionManagement/blbWorkOrder/components/glass.vue
@@ -265,24 +265,23 @@ export default {
             overHidden: true,
             width: 150,
           },
-          {
+           {
             label: '加工班组',
-            prop: 'tsId',
-            search: true,
-            sortable: true,
-            overHidden: true,
-            width: 150,
-            hide: true,
-          },
-          {
-            label: '加工外协商',
-            prop: 'ocId',
+            prop: 'mainTsName',
             search: true,
             sortable: true,
             overHidden: true,
             width: 150,
-            hide: true,
           },
+          // {
+          //   label: '加工外协商',
+          //   prop: 'ocId',
+          //   search: true,
+          //   sortable: true,
+          //   overHidden: true,
+          //   width: 150,
+          //   hide: true,
+          // },
           {
             label: '生产订单号',
             prop: 'yoCode',
diff --git a/src/views/productionManagement/blbWorkOrder/components/others.vue b/src/views/productionManagement/blbWorkOrder/components/others.vue
index b7660e7b..2ec00ad1 100644
--- a/src/views/productionManagement/blbWorkOrder/components/others.vue
+++ b/src/views/productionManagement/blbWorkOrder/components/others.vue
@@ -267,22 +267,21 @@ export default {
           },
           {
             label: '加工班组',
-            prop: 'tsId',
+            prop: 'mainTsName',
             search: true,
             sortable: true,
             overHidden: true,
             width: 150,
-            hide: true,
-          },
-          {
-            label: '加工外协商',
-            prop: 'ocId',
-            search: true,
-            sortable: true,
-            overHidden: true,
-            width: 150,
-            hide: true,
           },
+          // {
+          //   label: '加工外协商',
+          //   prop: 'ocId',
+          //   search: true,
+          //   sortable: true,
+          //   overHidden: true,
+          //   width: 150,
+          //   hide: true,
+          // },
           {
             label: '生产订单号',
             prop: 'yoCode',
diff --git a/src/views/productionManagement/productionMonitoring/index.vue b/src/views/productionManagement/productionMonitoring/index.vue
index 5f4338ca..32aaea37 100644
--- a/src/views/productionManagement/productionMonitoring/index.vue
+++ b/src/views/productionManagement/productionMonitoring/index.vue
@@ -64,7 +64,9 @@
         </el-dropdown>
       </template>
 
-      
+      <template #mainTsName="scope"> 
+        {{ scope.row.oem==0?scope.row.mainTsName:scope.row.mainOcName }}
+      </template>
     </avue-crud>
     <!-- 打印标签 -->
     <el-dialog append-to-body v-model="printDialog" title="打印标签" width="20%">
diff --git a/src/views/productionManagement/sinTerWorkOrder/index.vue b/src/views/productionManagement/sinTerWorkOrder/index.vue
index 323716ee..1a223475 100644
--- a/src/views/productionManagement/sinTerWorkOrder/index.vue
+++ b/src/views/productionManagement/sinTerWorkOrder/index.vue
@@ -288,22 +288,21 @@ export default {
           },
           {
             label: '加工班组',
-            prop: 'tsId',
+            prop: 'mainTsName',
             search: true,
             sortable: true,
             overHidden: true,
             width: 150,
-            hide: true,
-          },
-          {
-            label: '加工外协商',
-            prop: 'ocId',
-            search: true,
-            sortable: true,
-            overHidden: true,
-            width: 150,
-            hide: true,
           },
+          // {
+          //   label: '加工外协商',
+          //   prop: 'ocId',
+          //   search: true,
+          //   sortable: true,
+          //   overHidden: true,
+          //   width: 150,
+          //   hide: true,
+          // },
           {
             label: '生产订单号',
             prop: 'yoCode',