From 38ee43c02246cd0f18c38fe94833d9aee15f13f7 Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Tue, 31 Mar 2026 13:10:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E8=AE=A2=E5=8D=95=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=AF=B9=E5=BA=94=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beforeAndAfterPlating/index.vue           |  6 +-
 .../blbWorkOrder/components/glass.vue         | 67 ++++++++++++-------
 .../blbWorkOrder/components/others.vue        | 67 ++++++++++++-------
 .../sinTerWorkOrder/index.vue                 | 44 ++++++------
 4 files changed, 113 insertions(+), 71 deletions(-)

diff --git a/src/views/productionManagement/beforeAndAfterPlating/index.vue b/src/views/productionManagement/beforeAndAfterPlating/index.vue
index e55eadd..8eb0717 100644
--- a/src/views/productionManagement/beforeAndAfterPlating/index.vue
+++ b/src/views/productionManagement/beforeAndAfterPlating/index.vue
@@ -95,7 +95,7 @@ export default {
         editBtn: false,
         addBtn: false,
         labelWidth: 120,
-        menu: false,
+        menu: true,
         menuWidth: 140,
         dialogWidth: 600,
         dialogClickModal: false,
@@ -143,13 +143,13 @@ export default {
         this.afterBoundDialog = true;
       }
     },
-    rowDel() {
+    rowDel(row) {
       this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        deleteById().then(res => {
+        deleteById(row.id).then(res => {
           this.$message({
             type: 'success',
             message: '删除成功!',
diff --git a/src/views/productionManagement/blbWorkOrder/components/glass.vue b/src/views/productionManagement/blbWorkOrder/components/glass.vue
index 6813fba..1dad2f5 100644
--- a/src/views/productionManagement/blbWorkOrder/components/glass.vue
+++ b/src/views/productionManagement/blbWorkOrder/components/glass.vue
@@ -220,7 +220,7 @@ export default {
         column: [
           {
             label: '当前工序',
-            prop: 'wpId',
+            prop: 'ppsName',
             fixed: 'left',
             search: false,
             sortable: true,
@@ -283,22 +283,22 @@ export default {
             overHidden: true,
             width: 150,
           },
-          {
-            label: '计划单号',
-            prop: 'poCode',
-            search: true,
-            sortable: true,
-            overHidden: true,
-            width: 150,
-          },
-          {
-            label: '返工单号',
-            prop: 'qcReworkCode',
-            search: false,
-            sortable: true,
-            overHidden: true,
-            width: 150,
-          },
+          // {
+          //   label: '计划单号',
+          //   prop: 'poCode',
+          //   search: true,
+          //   sortable: true,
+          //   overHidden: true,
+          //   width: 150,
+          // },
+          // {
+          //   label: '返工单号',
+          //   prop: 'qcReworkCode',
+          //   search: false,
+          //   sortable: true,
+          //   overHidden: true,
+          //   width: 150,
+          // },
           {
             label: '零件号',
             prop: 'partCode',
@@ -317,7 +317,7 @@ export default {
           },
           {
             label: '产品型号',
-            prop: 'productModel',
+            prop: 'productType',
             search: false,
             sortable: true,
             overHidden: true,
@@ -325,7 +325,7 @@ export default {
           },
           {
             label: '产品名称',
-            prop: 'false',
+            prop: 'partName',
             search: false,
             sortable: true,
             overHidden: true,
@@ -418,7 +418,7 @@ export default {
           },
           {
             label: '调度员',
-            prop: 'userName',
+            prop: 'dispatcherName',
             search: true,
             sortable: true,
             overHidden: true,
@@ -427,7 +427,7 @@ export default {
 
           {
             label: '计划下达时间',
-            prop: 'planTime',
+            prop: 'sendDownTime',
             sortable: true,
             filter: true,
             searchLabelWidth: 90,
@@ -445,7 +445,7 @@ export default {
           },
           {
             label: '计划完工时间',
-            prop: 'planTime1',
+            prop: 'planEndDate',
             search: false,
             sortable: true,
             overHidden: true,
@@ -633,4 +633,25 @@ export default {
 };
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+:deep(.el-dropdown-link) {
+  cursor: pointer;
+  color: var(--el-color-primary);
+  display: flex;
+  align-items: center;
+  font-size: 12px;  // 与 el-button type="text" 字体一致
+  
+  &:hover {
+    color: var(--el-color-primary-light-3);
+  }
+}
+
+:deep(.el-dropdown-menu__item) {
+  font-size: 12px;  // 下拉项字体与按钮一致
+  padding: 8px 16px;
+  
+  &:hover {
+    background-color: var(--el-fill-color-light);
+  }
+}
+</style>
diff --git a/src/views/productionManagement/blbWorkOrder/components/others.vue b/src/views/productionManagement/blbWorkOrder/components/others.vue
index 6a63ede..7a32d88 100644
--- a/src/views/productionManagement/blbWorkOrder/components/others.vue
+++ b/src/views/productionManagement/blbWorkOrder/components/others.vue
@@ -220,7 +220,7 @@ export default {
         column: [
           {
             label: '当前工序',
-            prop: 'wpId',
+            prop: 'ppsName',
             fixed: 'left',
             search: false,
             sortable: true,
@@ -283,22 +283,22 @@ export default {
             overHidden: true,
             width: 150,
           },
-          {
-            label: '计划单号',
-            prop: 'poCode',
-            search: true,
-            sortable: true,
-            overHidden: true,
-            width: 150,
-          },
-          {
-            label: '返工单号',
-            prop: 'qcReworkCode',
-            search: false,
-            sortable: true,
-            overHidden: true,
-            width: 150,
-          },
+          // {
+          //   label: '计划单号',
+          //   prop: 'poCode',
+          //   search: true,
+          //   sortable: true,
+          //   overHidden: true,
+          //   width: 150,
+          // },
+          // {
+          //   label: '返工单号',
+          //   prop: 'qcReworkCode',
+          //   search: false,
+          //   sortable: true,
+          //   overHidden: true,
+          //   width: 150,
+          // },
           {
             label: '零件号',
             prop: 'partCode',
@@ -317,7 +317,7 @@ export default {
           },
           {
             label: '产品型号',
-            prop: 'productModel',
+            prop: 'productType',
             search: false,
             sortable: true,
             overHidden: true,
@@ -325,7 +325,7 @@ export default {
           },
           {
             label: '产品名称',
-            prop: 'false',
+            prop: 'partName',
             search: false,
             sortable: true,
             overHidden: true,
@@ -418,7 +418,7 @@ export default {
           },
           {
             label: '调度员',
-            prop: 'userName',
+            prop: 'dispatcherName',
             search: true,
             sortable: true,
             overHidden: true,
@@ -427,7 +427,7 @@ export default {
 
           {
             label: '计划下达时间',
-            prop: 'planTime',
+            prop: 'sendDownTime',
             sortable: true,
             filter: true,
             selectWidth: 150,
@@ -446,7 +446,7 @@ export default {
           },
           {
             label: '计划完工时间',
-            prop: 'planTime1',
+            prop: 'planEndDate',
             search: false,
             sortable: true,
             overHidden: true,
@@ -635,4 +635,25 @@ export default {
 };
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+:deep(.el-dropdown-link) {
+  cursor: pointer;
+  color: var(--el-color-primary);
+  display: flex;
+  align-items: center;
+  font-size: 12px;  // 与 el-button type="text" 字体一致
+  
+  &:hover {
+    color: var(--el-color-primary-light-3);
+  }
+}
+
+:deep(.el-dropdown-menu__item) {
+  font-size: 12px;  // 下拉项字体与按钮一致
+  padding: 8px 16px;
+  
+  &:hover {
+    background-color: var(--el-fill-color-light);
+  }
+}
+</style>
diff --git a/src/views/productionManagement/sinTerWorkOrder/index.vue b/src/views/productionManagement/sinTerWorkOrder/index.vue
index 0a0920c..f0306b9 100644
--- a/src/views/productionManagement/sinTerWorkOrder/index.vue
+++ b/src/views/productionManagement/sinTerWorkOrder/index.vue
@@ -233,7 +233,7 @@ export default {
         column: [
           {
             label: '当前工序',
-            prop: 'wpId',
+            prop: 'ppsName',
             fixed: 'left',
             search: false,
             sortable: true,
@@ -296,22 +296,22 @@ export default {
             overHidden: true,
             width: 150,
           },
-          {
-            label: '计划单号',
-            prop: 'poCode',
-            search: true,
-            sortable: true,
-            overHidden: true,
-            width: 150,
-          },
-          {
-            label: '返工单号',
-            prop: 'qcReworkCode',
-            search: false,
-            sortable: true,
-            overHidden: true,
-            width: 150,
-          },
+          // {
+          //   label: '计划单号',
+          //   prop: 'poCode',
+          //   search: true,
+          //   sortable: true,
+          //   overHidden: true,
+          //   width: 150,
+          // },
+          // {
+          //   label: '返工单号',
+          //   prop: 'qcReworkCode',
+          //   search: false,
+          //   sortable: true,
+          //   overHidden: true,
+          //   width: 150,
+          // },
           {
             label: '零件号',
             prop: 'partCode',
@@ -330,7 +330,7 @@ export default {
           },
           {
             label: '产品型号',
-            prop: 'productModel',
+            prop: 'productType',
             search: false,
             sortable: true,
             overHidden: true,
@@ -338,7 +338,7 @@ export default {
           },
           {
             label: '产品名称',
-            prop: 'false',
+            prop: 'partName',
             search: false,
             sortable: true,
             overHidden: true,
@@ -430,7 +430,7 @@ export default {
           },
           {
             label: '调度员',
-            prop: 'userName',
+            prop: 'dispatcherName',
             search: true,
             sortable: true,
             overHidden: true,
@@ -439,7 +439,7 @@ export default {
 
           {
             label: '计划下达时间',
-            prop: 'planTime',
+            prop: 'sendDownTime',
             sortable: true,
             filter: true,
             selectWidth: 150,
@@ -458,7 +458,7 @@ export default {
           },
           {
             label: '计划完工时间',
-            prop: 'planTime1',
+            prop: 'planEndDate',
             search: false,
             sortable: true,
             overHidden: true,