From 162a9f30cf6bb5c44fe93fe2ce096a841fb25991 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 3 Nov 2023 15:38:36 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/production/scheduleForSOTask.vue    | 7 +++++++
 src/views/modules/production/scheduleForShopOrder.vue | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue
index 7b187f8..1b449d1 100644
--- a/src/views/modules/production/scheduleForSOTask.vue
+++ b/src/views/modules/production/scheduleForSOTask.vue
@@ -198,6 +198,13 @@
         min-width="100"
         label="加工中心">
       </el-table-column>
+      <el-table-column
+        prop="equipment"
+        header-align="center"
+        align="left"
+        min-width="80"
+        label="设备类型">
+      </el-table-column>
       <el-table-column
         prop="status"
         header-align="center"
diff --git a/src/views/modules/production/scheduleForShopOrder.vue b/src/views/modules/production/scheduleForShopOrder.vue
index 05b4d6e..72f2e32 100644
--- a/src/views/modules/production/scheduleForShopOrder.vue
+++ b/src/views/modules/production/scheduleForShopOrder.vue
@@ -272,6 +272,13 @@
         width="80"
         label="合格数量">
       </el-table-column>
+      <el-table-column
+        prop="defectiveQty"
+        header-align="center"
+        align="right"
+        width="80"
+        label="让步接收数">
+      </el-table-column>
       <el-table-column
         prop="enterDate"
         header-align="center"
@@ -570,6 +577,7 @@
           "调机时间": "machSetupTime",
           "单位产出量": "machRunFactor",
           "产出单位": "factorUnit",
+          "让步接收数":"defectiveQty",
         },
         exportName: "生产订单工序列表"+this.getStrDate(),
         exportHeader: ["生产订单工序列表"],