From 6f00a956a64330c583f77c20081ff25c0f390832 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 30 Nov 2022 18:35:06 +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/closeSchedule.vue      | 56 +++++++++---------
 .../modules/production/generateReport.vue     | 58 +++++++++----------
 .../modules/production/soscheduleRouting.vue  | 50 ++++++++--------
 3 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/src/views/modules/production/closeSchedule.vue b/src/views/modules/production/closeSchedule.vue
index 5e38a0b..714068e 100644
--- a/src/views/modules/production/closeSchedule.vue
+++ b/src/views/modules/production/closeSchedule.vue
@@ -130,6 +130,34 @@
         min-width="100"
         label="生产订单号">
       </el-table-column>
+      <el-table-column
+        prop="sScheduledDate"
+        header-align="center"
+        align="left"
+        min-width="80"
+        label="派工日期">
+      </el-table-column>
+      <el-table-column
+        prop="operatorName"
+        header-align="center"
+        align="left"
+        min-width="80"
+        label="操作员姓名">
+      </el-table-column>
+      <el-table-column
+        prop="partNo"
+        header-align="center"
+        align="left"
+        min-width="80"
+        label="产品编码">
+      </el-table-column>
+      <el-table-column
+        prop="partDesc"
+        header-align="center"
+        align="left"
+        min-width="200"
+        label="产品名称">
+      </el-table-column>
       <el-table-column
         prop="scheduleType"
         header-align="center"
@@ -193,34 +221,6 @@
         min-width="80"
         label="需求时间">
       </el-table-column>
-      <el-table-column
-        prop="sScheduledDate"
-        header-align="center"
-        align="left"
-        min-width="80"
-        label="派工日期">
-      </el-table-column>
-      <el-table-column
-        prop="operatorName"
-        header-align="center"
-        align="left"
-        min-width="80"
-        label="操作员姓名">
-      </el-table-column>
-      <el-table-column
-        prop="partNo"
-        header-align="center"
-        align="left"
-        min-width="80"
-        label="产品编码">
-      </el-table-column>
-      <el-table-column
-        prop="partDesc"
-        header-align="center"
-        align="left"
-        min-width="200"
-        label="产品名称">
-      </el-table-column>
       <el-table-column
         prop="sResourceID"
         header-align="center"
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index 7c1572c..1add793 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -145,6 +145,34 @@
         min-width="100"
         label="生产订单号">
       </el-table-column>
+      <el-table-column
+        prop="sScheduledDate"
+        header-align="center"
+        align="left"
+        min-width="80"
+        label="派工日期">
+      </el-table-column>
+      <el-table-column
+        prop="operatorName"
+        header-align="center"
+        align="left"
+        min-width="80"
+        label="操作员姓名">
+      </el-table-column>
+      <el-table-column
+        prop="partNo"
+        header-align="center"
+        align="left"
+        min-width="80"
+        label="产品编码">
+      </el-table-column>
+      <el-table-column
+        prop="partDesc"
+        header-align="center"
+        align="left"
+        min-width="200"
+        label="产品名称">
+      </el-table-column>
       <el-table-column
         prop="scheduleType"
         header-align="center"
@@ -201,34 +229,6 @@
         min-width="80"
         label="需求时间">
       </el-table-column>
-      <el-table-column
-        prop="sScheduledDate"
-        header-align="center"
-        align="left"
-        min-width="80"
-        label="派工日期">
-      </el-table-column>
-      <el-table-column
-        prop="operatorName"
-        header-align="center"
-        align="left"
-        min-width="80"
-        label="操作员姓名">
-      </el-table-column>
-      <el-table-column
-        prop="partNo"
-        header-align="center"
-        align="left"
-        min-width="80"
-        label="产品编码">
-      </el-table-column>
-      <el-table-column
-        prop="partDesc"
-        header-align="center"
-        align="left"
-        min-width="200"
-        label="产品名称">
-      </el-table-column>
       <el-table-column
         prop="sResourceID"
         header-align="center"
@@ -967,7 +967,7 @@
             this.saveHeaderData.planStartTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00')
             this.saveHeaderData.planFinishTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00')
 
-             (this.saveHeaderData).then(({data}) => {
+            searchReportedQty(this.saveHeaderData).then(({data}) => {
               if(data.code===0) {
                 this.cavity= data.row.cavity
                 this.qty1 = data.row.qtyReported;
diff --git a/src/views/modules/production/soscheduleRouting.vue b/src/views/modules/production/soscheduleRouting.vue
index 0d73f71..166f90e 100644
--- a/src/views/modules/production/soscheduleRouting.vue
+++ b/src/views/modules/production/soscheduleRouting.vue
@@ -131,53 +131,53 @@
         label="生产订单号">
       </el-table-column>
       <el-table-column
-        prop="scheduleType"
+        prop="sScheduledDate"
         header-align="center"
         align="left"
-        min-width="100"
-        label="派工单类型">
+        min-width="80"
+        label="派工日期">
       </el-table-column>
       <el-table-column
-        prop="itemNo"
+        prop="operatorName"
         header-align="center"
         align="left"
-        min-width="70"
-        label="工序号">
+        min-width="80"
+        label="操作员姓名">
       </el-table-column>
       <el-table-column
-        prop="itemDesc"
+        prop="partNo"
         header-align="center"
         align="left"
-        min-width="160"
-        label="工序名称">
+        min-width="80"
+        label="产品编码">
       </el-table-column>
       <el-table-column
-        prop="qtyRequired"
+        prop="partDesc"
         header-align="center"
-        align="right"
-        min-width="80"
-        label="派工数量">
+        align="left"
+        min-width="200"
+        label="产品名称">
       </el-table-column>
       <el-table-column
-        prop="weight"
+        prop="scheduleType"
         header-align="center"
-        align="right"
-        min-width="80"
-        label="参考重量">
+        align="left"
+        min-width="100"
+        label="派工单类型">
       </el-table-column>
       <el-table-column
-        prop="qtyReported"
+        prop="itemNo"
         header-align="center"
-        align="right"
-        min-width="80"
-        label="报工数量">
+        align="left"
+        min-width="70"
+        label="工序号">
       </el-table-column>
       <el-table-column
-        prop="qtyApprove"
+        prop="itemDesc"
         header-align="center"
-        align="right"
-        min-width="80"
-        label="合格数量">
+        align="left"
+        min-width="160"
+        label="工序名称">
       </el-table-column>
       <el-table-column
         prop="closedFlag"