From 1500f9a7240115afd736dbd5256f87639d4a227a Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 24 May 2022 15:16:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8D=B7=E7=B3=BB=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...rchProductionLineOutputReportInOrderNo.vue | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/shopOrder/productionReport/searchProductionLineOutputReportInOrderNo.vue b/src/views/modules/shopOrder/productionReport/searchProductionLineOutputReportInOrderNo.vue
index 70e2d0d..64de176 100644
--- a/src/views/modules/shopOrder/productionReport/searchProductionLineOutputReportInOrderNo.vue
+++ b/src/views/modules/shopOrder/productionReport/searchProductionLineOutputReportInOrderNo.vue
@@ -197,7 +197,7 @@
         </el-table>
       </el-tab-pane>
     </el-tabs>
-    <el-dialog title="数据表" :close-on-click-modal="false" v-drag :visible.sync="modelFlag2" width="680px" >
+    <el-dialog title="订单列表" :close-on-click-modal="false" v-drag :visible.sync="modelFlag2" width="680px" >
       <el-table
         height="400"
         :data="dataList3"
@@ -284,7 +284,7 @@
           partNo:'',
           planner:'',
           orderType:'',
-          date1:new Date(),
+          date1:'',
           date2:'',
         },
         modelData: {
@@ -1506,7 +1506,20 @@
         }
         searchReportInOrderNo(this.searchData).then(({data}) => {
           this.dataList3=data.rows;
-          this.modelFlag2=true;
+          if(data.rows.length>0){
+            this.modelData=data.rows[0];
+            let inData={
+              site:this.modelData.site,
+              orderNo:this.modelData.orderNo,
+              user:this.$store.state.user.name
+            }
+            searchItemToBeProduct(inData).then(({data}) => {
+              this.dataList = data.rows
+            })
+            searchProductionLineOutputReport(inData).then(({data}) => {
+              this.dataList2 = data.rows
+            })
+          }
         })
       },
       cancelReport(row){
@@ -1523,8 +1536,13 @@
         }).then(() => {
           cancelReport(data).then(({data}) => {
             if (data && data.code == 200) {
-              searchReportInOrderNo(this.searchData).then(({data}) => {
-                this.dataList3=data.rows;
+              let inData={
+                site: this.modelData.site,
+                orderNo: this.modelData.orderNo,
+                user:this.$store.state.user.name
+              }
+              searchProductionLineOutputReport(inData).then(({data}) => {
+                this.dataList2 = data.rows
               })
               this.$message.success( '操作成功')
             } else {
@@ -1536,7 +1554,6 @@
         })
       },
       tableHanddle(row){
-        console.log(row);
         this.modelData=row;
         this.modelFlag2=false;
         let inData={