From d251daa3f55591e9980b112b6d241eefa5718661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Tue, 23 Apr 2024 15:23:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/report/qcReport.js                    | 18 ++++++++++++-
 src/views/report/ingredientReport/day.vue     | 26 ++++++++++++-------
 .../report/qcReport/cutDayReport/index.vue    |  6 ++---
 src/views/report/qcReport/lineReport.vue      |  6 ++---
 src/views/report/qcReport/optimizeCutData.vue |  6 ++---
 5 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/src/api/report/qcReport.js b/src/api/report/qcReport.js
index c4e252ec..5124b97c 100644
--- a/src/api/report/qcReport.js
+++ b/src/api/report/qcReport.js
@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2024-04-18 09:27:54
- * @LastEditTime: 2024-04-23 13:37:12
+ * @LastEditTime: 2024-04-23 15:16:12
  * @LastEditors: zhp
  * @Description:
  */
@@ -78,3 +78,19 @@ export function getCuttingReportDataList(data) {
     data: data
   })
 }
+
+export function getProcessingLineDataList(data) {
+  return request({
+    url: 'extend/customized-reports/getProcessingLine',
+    method: 'get',
+    data: data
+  })
+}
+
+export function getOriginalLineDataList(data) {
+  return request({
+    url: 'extend/customized-reports/getOriginalLine',
+    method: 'get',
+    data: data
+  })
+}
diff --git a/src/views/report/ingredientReport/day.vue b/src/views/report/ingredientReport/day.vue
index 559d7399..bd48be34 100644
--- a/src/views/report/ingredientReport/day.vue
+++ b/src/views/report/ingredientReport/day.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 14:08:46
- * @LastEditTime: 2024-04-23 15:05:47
+ * @LastEditTime: 2024-04-23 15:23:05
  * @LastEditors: zhp
  * @Description:
 -->
@@ -203,14 +203,22 @@ export default {
           colspan: _col
         }
       }
-      // if (columnIndex === 1 ) {
-      //   if (rowIndex === 0 || rowIndex === 2 || rowIndex === 4 || rowIndex === 6 || rowIndex === 8 || rowIndex === 10) {
-      //     return {
-      //       rowspan: 2,
-      //       colspan: 1
-      //     }
-      // }
-      // }
+      if (columnIndex === 1 ) {
+        if (rowIndex === 0 || rowIndex === 2 || rowIndex === 4 || rowIndex === 6 || rowIndex === 8 || rowIndex === 10) {
+          return {
+            rowspan: 2,
+            colspan: 1
+          }
+      }
+      }
+      if (columnIndex === 1 || columnIndex === 2 || columnIndex === 3 || columnIndex === 4 || columnIndex === 5 || columnIndex === 6)  {
+        if (rowIndex === 1 || rowIndex === 3 || rowIndex === 5 || rowIndex === 7 || rowIndex === 9 || rowIndex === 11) {
+          return {
+            rowspan: 1,
+            colspan: 2
+          }
+        }
+      }
     },
     handleExport() {
       // 处理查询参数
diff --git a/src/views/report/qcReport/cutDayReport/index.vue b/src/views/report/qcReport/cutDayReport/index.vue
index 0f701ff5..632b327f 100644
--- a/src/views/report/qcReport/cutDayReport/index.vue
+++ b/src/views/report/qcReport/cutDayReport/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 10:01:33
- * @LastEditTime: 2024-04-23 15:08:51
+ * @LastEditTime: 2024-04-23 15:15:22
  * @LastEditors: zhp
  * @Description:
 -->
@@ -36,7 +36,7 @@
 // import basicPage from '../../../core/mixins/basic-page';
 // import { parseTime } from '../../../core/mixins/code-filter';
 import {
-  getCWSectionList,
+  getOriginalLineDataList,
   getCuttingReportDataList
 } from '@/api/report/qcReport';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
@@ -201,7 +201,7 @@ export default {
   },
   methods: {
     async getDict() {
-      const res = await getCWSectionList()
+      const res = await getOriginalLineDataList()
       console.log(res)
       this.formConfig[1].selectOptions = res.data
     },
diff --git a/src/views/report/qcReport/lineReport.vue b/src/views/report/qcReport/lineReport.vue
index 2cc33ecc..ab2b32c5 100644
--- a/src/views/report/qcReport/lineReport.vue
+++ b/src/views/report/qcReport/lineReport.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 10:01:33
- * @LastEditTime: 2024-04-23 15:08:40
+ * @LastEditTime: 2024-04-23 15:15:45
  * @LastEditors: zhp
  * @Description:
 -->
@@ -36,7 +36,7 @@
 // import { parseTime } from '../../../core/mixins/code-filter';
 import {
   getOriginalData,
-  getCWSectionList
+  getOriginalLineDataList
 } from '@/api/report/qcReport';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import FileSaver from 'file-saver'
@@ -176,7 +176,7 @@ export default {
   },
   methods: {
     async getDict() {
-      const res = await getCWSectionList()
+      const res = await getOriginalLineDataList()
       console.log(res)
       this.formConfig[1].selectOptions = res.data
     },
diff --git a/src/views/report/qcReport/optimizeCutData.vue b/src/views/report/qcReport/optimizeCutData.vue
index bd903db8..77d5411d 100644
--- a/src/views/report/qcReport/optimizeCutData.vue
+++ b/src/views/report/qcReport/optimizeCutData.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 15:07:53
- * @LastEditTime: 2024-04-23 15:07:51
+ * @LastEditTime: 2024-04-23 15:15:52
  * @LastEditors: zhp
  * @Description:
 -->
@@ -36,7 +36,7 @@
 // import { parseTime } from '../../../core/mixins/code-filter';
 import {
   getCuttingtData,
-  getCWSectionList
+  getOriginalLineDataList
 } from '@/api/report/qcReport';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import FileSaver from 'file-saver'
@@ -175,7 +175,7 @@ export default {
   },
   methods: {
     async getDict() {
-      const res = await getCWSectionList()
+      const res = await getOriginalLineDataList()
       console.log(res)
       this.formConfig[1].selectOptions = res.data
     },