From ae9b2f667322312ad09dd83ab1ec59fe578162a7 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Sat, 30 Mar 2024 15:20:22 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E6=8A=A5=E8=A1=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/WIPInquiryReport/index.vue   | 22 +++++++++----------
 .../boxTurnoverTraceabilityReport/index.vue   | 14 ++++++++++--
 .../productionExecutionReport/index.vue       | 22 +++++++++----------
 src/views/report/repairRateReport/index.vue   |  8 ++++++-
 .../report/scanOfflineRecordReport/index.vue  | 10 +++++++++
 5 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/src/views/report/WIPInquiryReport/index.vue b/src/views/report/WIPInquiryReport/index.vue
index 5a5eef0..edac10b 100644
--- a/src/views/report/WIPInquiryReport/index.vue
+++ b/src/views/report/WIPInquiryReport/index.vue
@@ -101,13 +101,13 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
     </el-table>
-    <!--    <pagination-->
-    <!--      v-show="total>0"-->
-    <!--      :total="total"-->
-    <!--      :page.sync="queryParams.pageNum"-->
-    <!--      :limit.sync="queryParams.pageSize"-->
-    <!--      @pagination="getList"-->
-    <!--    />-->
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
 
   </div>
 </template>
@@ -148,8 +148,8 @@ export default {
       daterangeBeginTime: [],
       // 查询参数
       queryParams: {
-        // pageNum: 1,
-        // pageSize: 10,
+        pageNum: 1,
+        pageSize: 10,
         beginBeginTime: null,
         endBeginTime: null,
         productLineCode: 'CX_02',
@@ -207,12 +207,12 @@ export default {
     getList() {
       this.loading = true
       WIPInquiryReportList(this.queryParams).then(response => {
-        this.reportList = response.data
+        this.reportList = response.rows
+        this.total = response.total;
         this.totalSum = 0
         this.reportList.forEach(e => {
           this.totalSum += e.COMP_AMOUNT
         })
-        // this.total = response.total;
         this.loading = false
       })
     },
diff --git a/src/views/report/boxTurnoverTraceabilityReport/index.vue b/src/views/report/boxTurnoverTraceabilityReport/index.vue
index f7380a1..212e01d 100644
--- a/src/views/report/boxTurnoverTraceabilityReport/index.vue
+++ b/src/views/report/boxTurnoverTraceabilityReport/index.vue
@@ -51,7 +51,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="起止时间">
+      <el-form-item label="打印时间">
         <el-date-picker
           v-model="daterangeBeginTime"
           style="width: 340px"
@@ -69,6 +69,14 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          size="mini"
+        >打印数：{{ totalSum }}
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -99,7 +107,7 @@
       <el-table-column label="销售订单号" align="center" prop="SALEORDER_CODE" v-if="columns[4].visible"/>
       <el-table-column label="销售订单行号" align="center" prop="SALEORDER_LINENUMBER" v-if="columns[5].visible"/>
       <el-table-column label="产品编码" align="center" prop="MATERIAL_CODE" v-if="columns[6].visible"/>
-      <el-table-column label="产品名称" align="center" prop="MATERIAL_NAME" v-if="columns[7].visible" width="250"/>
+      <el-table-column label="产品名称" align="center" prop="MATERIAL_NAME" v-if="columns[7].visible" width="280"/>
       <el-table-column label="MES条码" align="center" prop="BOX_CODE" v-if="columns[8].visible" width="200"/>
       <el-table-column label="成品条码" align="center" prop="PRODUCT_SNCODE" v-if="columns[9].visible" width="200"/>
       <el-table-column label="MES码打印时间" align="center" prop="PRINT_TIME" v-if="columns[10].visible" width="180"/>
@@ -200,6 +208,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      totalSum: 0,
       // 报表表格数据
       reportList: [],
       // 弹出层标题
@@ -271,6 +280,7 @@ export default {
       boxTurnoverTraceabilityReportList(this.queryParams).then(response => {
         this.reportList = response.rows
         this.total = response.total
+        this.totalSum = response.total
         this.loading = false
       })
     },
diff --git a/src/views/report/productionExecutionReport/index.vue b/src/views/report/productionExecutionReport/index.vue
index 5017dbd..8e821db 100644
--- a/src/views/report/productionExecutionReport/index.vue
+++ b/src/views/report/productionExecutionReport/index.vue
@@ -113,13 +113,13 @@
         </template>
       </el-table-column>
     </el-table>
-    <!--    <pagination-->
-    <!--      v-show="total>0"-->
-    <!--      :total="total"-->
-    <!--      :page.sync="queryParams.pageNum"-->
-    <!--      :limit.sync="queryParams.pageSize"-->
-    <!--      @pagination="getList"-->
-    <!--    />-->
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
 
   </div>
 </template>
@@ -162,8 +162,8 @@ export default {
       daterangeBeginTime: [],
       // 查询参数
       queryParams: {
-        // pageNum: 1,
-        // pageSize: 10,
+        pageNum: 1,
+        pageSize: 10,
         beginBeginTime: null,
         endBeginTime: null,
         productLineCode: 'CX_02',
@@ -238,12 +238,12 @@ export default {
         this.queryParams.endBeginTime = null
       }
       productionExecutionReportList(this.queryParams).then(response => {
-        this.reportList = response.data
+        this.reportList = response.rows
+        this.total = response.total
         this.totalSum = 0;
         this.reportList.forEach(e => {
           this.totalSum += e.COMP_AMOUNT
         })
-        // this.total = response.total
         this.loading = false
       })
     },
diff --git a/src/views/report/repairRateReport/index.vue b/src/views/report/repairRateReport/index.vue
index 239cc8b..d197f8c 100644
--- a/src/views/report/repairRateReport/index.vue
+++ b/src/views/report/repairRateReport/index.vue
@@ -186,6 +186,8 @@ export default {
     const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
     this.daterangeBeginTime[0] = weekDate
     this.daterangeBeginTime[1] = nowDate
+    this.queryParams.beginBeginTime = this.daterangeBeginTime[0]
+    this.queryParams.endBeginTime = this.daterangeBeginTime[1]
     // this.getList()
     this.getChart()
 
@@ -527,7 +529,6 @@ export default {
     },
     /** 查询工单信息列表 */
     getList() {
-      this.isChart = false
       this.loading = true
       if (null != this.daterangeBeginTime && '' != this.daterangeBeginTime) {
         this.queryParams.beginBeginTime = this.daterangeBeginTime[0]
@@ -537,7 +538,12 @@ export default {
         this.queryParams.endBeginTime = null
       }
       if (this.queryParams.STATION_CODE.length > 0) {
+        this.isChart = false
         this.queryParams.stationCodeList = this.queryParams.STATION_CODE.join(',')
+      }else {
+        this.isChart = true
+        this.reportList = [];
+        this.getChart()
       }
       repairRateReportList(this.queryParams).then(response => {
         this.reportList = response.data
diff --git a/src/views/report/scanOfflineRecordReport/index.vue b/src/views/report/scanOfflineRecordReport/index.vue
index 4e16d77..2544ca5 100644
--- a/src/views/report/scanOfflineRecordReport/index.vue
+++ b/src/views/report/scanOfflineRecordReport/index.vue
@@ -61,6 +61,14 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          size="mini"
+        >下线数：{{ totalSum }}
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -140,6 +148,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      totalSum: 0,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -224,6 +233,7 @@ export default {
       listProductOffLine(this.queryParams).then(response => {
         this.productOffLineList = response.rows;
         this.total = response.total;
+        this.totalSum = response.total;
         this.loading = false;
       });
     },