From fb00d48448750781e12e35167250c99aa0493920 Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Mon, 30 Mar 2026 20:59:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=95=8A=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/addTemplateDialog.vue          |  5 ++---
 .../deductionPreserve/index.vue               | 22 +++++++++++--------
 .../reworkOrder/index.vue                     |  1 +
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/views/processManagement/components/addTemplateDialog.vue b/src/views/processManagement/components/addTemplateDialog.vue
index 4b4a6c3..80a3845 100644
--- a/src/views/processManagement/components/addTemplateDialog.vue
+++ b/src/views/processManagement/components/addTemplateDialog.vue
@@ -344,7 +344,7 @@ import {
   getDetail,
   getProcessAbilityList,
 } from '@/api/processManagement/processTemplate';
-import { getProject, getStandardList } from '@/api/processManagement/taskProcessing';
+import { getProject, getStandardList,getCraftAbilityList } from '@/api/processManagement/taskProcessing';
 import { getList } from '@/api/processManagement/basicProcesses';
 import { getWorkCenterList } from '@/api/processManagement/addQuantity';
 import pinyin from 'pinyin';
@@ -617,8 +617,7 @@ export default {
     },
     // 获取工艺能力
     getProcessAbilityList() {
-      getProcessAbilityList().then(res => {
-        console.log('99999', res.data.data);
+      getCraftAbilityList().then(res => {
         this.caIdList = res.data.data;
       });
     },
diff --git a/src/views/productionManagement/deductionPreserve/index.vue b/src/views/productionManagement/deductionPreserve/index.vue
index 054cdca..3eec4df 100644
--- a/src/views/productionManagement/deductionPreserve/index.vue
+++ b/src/views/productionManagement/deductionPreserve/index.vue
@@ -43,7 +43,7 @@
 
 <script>
 import editDialog from './editDialog.vue';
-import { getList,getWorkOrderByCardNo } from '@/api/productionManagement/deductionPreserve';
+import { getList, getWorkOrderByCardNo } from '@/api/productionManagement/deductionPreserve';
 
 export default {
   components: {
@@ -206,20 +206,24 @@ export default {
       },
 
       data: [],
-      rowItem:{}
+      rowItem: {},
     };
   },
   methods: {
     // 扫描流程卡号
     queryOrder() {
       this.loading = true;
-      getWorkOrderByCardNo({cardNo:this.cardNo}).then(res => {
-        this.rowItem = res.data.data
-        this.editOpen = true;
-        this.loading = false
-      }).catch(err=>{
-        this.loading = false
-      })
+      getWorkOrderByCardNo({ cardNo: this.cardNo })
+        .then(res => {
+          if (res.data.data) {
+            this.rowItem = res.data.data;
+            this.editOpen = true;
+            this.loading = false;
+          }
+        })
+        .catch(err => {
+          this.loading = false;
+        });
     },
 
     closeDialog(type) {
diff --git a/src/views/productionManagement/reworkOrder/index.vue b/src/views/productionManagement/reworkOrder/index.vue
index 4b4ca68..ef8c2a7 100644
--- a/src/views/productionManagement/reworkOrder/index.vue
+++ b/src/views/productionManagement/reworkOrder/index.vue
@@ -88,6 +88,7 @@ export default {
         menuAlign: 'left',
         gridBtn: false,
         searchMenuPosition: 'right',
+        menu:false,
         column: [
           {
             label: '返工单号',