From 6c1eea41afd348e1ca6e2baab9852e3b878aedf0 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 18 May 2022 22:18:10 +0800
Subject: [PATCH] =?UTF-8?q?0505=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/production/search_schedule.vue    | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/production/search_schedule.vue b/src/views/modules/production/search_schedule.vue
index 2e30769..7eb2ad6 100644
--- a/src/views/modules/production/search_schedule.vue
+++ b/src/views/modules/production/search_schedule.vue
@@ -115,8 +115,10 @@
         <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
           <span>合计：排产数量</span>
           <el-input v-model="sum1" readonly style="width: 60px"></el-input>
-          <span>已入库数量</span>
+          <span>已完成数量</span>
           <el-input v-model="sum2" readonly style="width: 60px"></el-input>
+          <span>已入库数量</span>
+          <el-input v-model="sum3" readonly style="width: 60px"></el-input>
         </el-form>
       </div>
     </el-form>
@@ -157,6 +159,7 @@
       return {
         sum1:'',
         sum2:'',
+        sum3:'',
         printModalFlag:false,
         printQty:'',
         // 导出 start
@@ -312,6 +315,24 @@
             status: true,
             fixed: false
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 5302,
+            serialNumber: '5302ProduceQtyApprove',
+            tableId: "5302Produce",
+            tableName: "待生产工单",
+            columnProp: "qtyApprove",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "已完成数量",
+            columnWidth: 70,
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 5302,
@@ -628,7 +649,7 @@
           site:'',
           partNo:'',
           resourceId:'',
-          date1:'',
+          date1:new Date(),
           date2:'',
           orderNo:'',
           closedFlag:'N',
@@ -695,10 +716,12 @@
           this.dataList = data.rows;
           this.sum1=0;
           this.sum2=0;
+          this.sum3=0;
           if(data.rows.length>0){
             for (let i = 0; i < data.rows.length; i++) {
               this.sum1=Number(this.sum1)+Number(data.rows[i].qtyRequired);
-              this.sum2=Number(this.sum2)+Number(data.rows[i].qtyReported);
+              this.sum2=Number(this.sum2)+Number(data.rows[i].qtyApprove);
+              this.sum3=Number(this.sum3)+Number(data.rows[i].qtyReported);
             }
 
           }