From 06e000890719fd61c90b3e26caf75ecc328f5d3c Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 30 Sep 2022 17:58:12 +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/board/PODetailForW.vue      | 30 ++++++++++++-------
 .../modules/production/generateReport.vue     |  2 ++
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/board/PODetailForW.vue b/src/views/modules/board/PODetailForW.vue
index 44b64ab..51a1457 100644
--- a/src/views/modules/board/PODetailForW.vue
+++ b/src/views/modules/board/PODetailForW.vue
@@ -22,6 +22,14 @@
           style="font-size: 20px"
           label="工厂编号">
         </el-table-column>
+        <el-table-column
+          prop="receiptNo"
+          header-align="center"
+          align="left"
+          min-width="80"
+          style="font-size: 20px"
+          label="接收单号">
+        </el-table-column>
         <el-table-column
           prop="orderNo"
           header-align="center"
@@ -38,46 +46,46 @@
           label="物料编码">
         </el-table-column>
         <el-table-column
-          prop="partDesc"
+          prop="partDescription"
           header-align="center"
           align="left"
           min-width="200"
           label="物料名称">
         </el-table-column>
         <el-table-column
-          prop="qty"
+          prop="qtytoInspect"
           header-align="center"
           align="right"
           min-width="60"
-          label="采购数量">
+          label="待检数量">
         </el-table-column>
         <el-table-column
-          prop="arriveQty"
+          prop="qtyInspected"
           header-align="center"
           align="right"
           min-width="60"
-          label="接收数量">
+          label="已检数量">
         </el-table-column>
         <el-table-column
-          prop="receiveQty"
+          prop="pOUmID"
           header-align="center"
-          align="right"
+          align="left"
           min-width="60"
-          label="入库数量">
+          label="计量单位">
         </el-table-column>
         <el-table-column
-          prop="supplierDesc"
+          prop="supplierName"
           header-align="center"
           align="left"
           min-width="100"
           label="供应商名称">
         </el-table-column>
         <el-table-column
-          prop="wantReceiveDate"
+          prop="receiveDate"
           header-align="center"
           align="left"
           min-width="120"
-          label="要求交货日期">
+          label="接收日期">
         </el-table-column>
       </el-table>
     </div>
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index 2432d10..ac9da98 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -880,6 +880,7 @@
             this.qty1='';
             this.qty2 ='';
             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')
             searchReportedQty(this.saveHeaderData).then(({data}) => {
               if(data.code===0) {
                 this.qty1 = data.row.qtyReported;
@@ -970,6 +971,7 @@
         startSeqNo(inData).then(({data}) => {
           if (data && data.code === 0) {
             this.scanSeqNo='';
+            this.startModalFlag=false;
             this.$message({
               message: '操作成功',
               type: 'success',