From 8876c234904459d038a2b282b3fdc30e006f9925 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期日, 18 八月 2024 14:21:40 +0800
Subject: [PATCH] fix8-气动打码

---
 jcdm-ui/src/views/main/da/followReport/index.vue |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/jcdm-ui/src/views/main/da/followReport/index.vue b/jcdm-ui/src/views/main/da/followReport/index.vue
index 09784ac..0ff3286 100644
--- a/jcdm-ui/src/views/main/da/followReport/index.vue
+++ b/jcdm-ui/src/views/main/da/followReport/index.vue
@@ -56,10 +56,10 @@
                 <dict-tag :options="dict.type.order_scheduling_produce_status" :value="scope.row.productionStatus"/>
               </template>
             </el-table-column>
-            <el-table-column label="宸ユ椂" align="center" prop="workingHours">
+<!--            <el-table-column label="宸ユ椂" align="center" prop="workingHours">-->
 
-            </el-table-column>
-            <el-table-column label="褰撳墠宸ヤ綅" align="center" prop="currentWorkstation">
+<!--            </el-table-column>-->
+            <el-table-column label="宸ヤ綅缂栧彿" align="center" prop="currentWorkstation">
 
             </el-table-column>
             <el-table-column label="璐ㄩ噺鐘舵��" align="center" prop="qualityStatus">
@@ -187,7 +187,7 @@
     let workOrderNo = this.$route.query.workOrderNo;
     this.queryParams.orderNo = workOrderNo
     this.getMainList();
-    this.getChildList();
+    // this.getChildList();
   },
   methods: {
     toggleSelection(rows) {
@@ -238,7 +238,14 @@
     getMainList() {
       this.loading = true;
       console.log(this.queryParams)
-      listOrderScheduling(this.queryParams).then(response => {
+      let query = {
+        pageNum: this.queryParams.pageNum,
+        pageSize: this.queryParams.pageSize,
+        orderNo: this.queryParams.orderNo,
+        engineNo: this.queryParams.engineNo,
+        engineNoList: [],
+      }
+      listOrderScheduling(query).then(response => {
         this.orderSchedulingList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -257,7 +264,7 @@
     },
     getList(){
       this.getMainList()
-      this.getChildList()
+      // this.getChildList()
     }
     // handleCurrentChange(val) {
     //   this.multipleSelection = val;

--
Gitblit v1.9.3