From c4caa0cc655dff69597786ff013e4c27084bec37 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 25 Jan 2024 17:57:00 +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

---
 .../modules/production/soscheduleRouting.vue  | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/production/soscheduleRouting.vue b/src/views/modules/production/soscheduleRouting.vue
index 222f7e5..0f9da56 100644
--- a/src/views/modules/production/soscheduleRouting.vue
+++ b/src/views/modules/production/soscheduleRouting.vue
@@ -31,8 +31,8 @@
       <el-form-item :label="'是否报工完成'">
         <el-select v-model="searchData.reportFlag" style="width: 120px">
           <el-option label="全部" value=""></el-option>
-          <el-option label="是" value="QtyApprove>=QtyRequired"></el-option>
-          <el-option label="否" value="QtyRequired>QtyApprove"></el-option>
+          <el-option label="是" value="a.QtyApprove>=a.QtyRequired"></el-option>
+          <el-option label="否" value="a.QtyRequired>a.QtyApprove"></el-option>
         </el-select>
       </el-form-item>
     </el-form>
@@ -233,6 +233,20 @@
         min-width="80"
         label="工作效率">
       </el-table-column>
+      <el-table-column
+        prop="machRunFactor"
+        header-align="center"
+        align="right"
+        min-width="80"
+        label="单位产出数量">
+      </el-table-column>
+      <el-table-column
+        prop="xiaolv"
+        header-align="center"
+        align="right"
+        min-width="80"
+        label="效率对比">
+      </el-table-column>
       <el-table-column
         prop="closedFlag"
         header-align="center"
@@ -458,7 +472,7 @@
           site: '',
           partDesc:'',
           scheduleType:'',
-          reportFlag:'QtyRequired>QtyApprove',
+          reportFlag:'a.QtyRequired>a.QtyApprove',
           startDate:'',
           endDate:'',
           operatorName:'',