From 9c1122ea52b7517949b21bbb5fd5b165fe2a5241 Mon Sep 17 00:00:00 2001
From: GaoF <gf18734201506@163.com>
Date: Tue, 20 Aug 2024 09:09:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/columns/detailColumns.js           | 92 ++++++++++++++-----
 .../report/columns/reportColumns.js           |  2 +-
 .../productionCenter/report/detail/index.vue  |  4 +-
 3 files changed, 73 insertions(+), 25 deletions(-)

diff --git a/src/views/productionBusiness/productionCenter/report/columns/detailColumns.js b/src/views/productionBusiness/productionCenter/report/columns/detailColumns.js
index 8b5ac3f..12af906 100644
--- a/src/views/productionBusiness/productionCenter/report/columns/detailColumns.js
+++ b/src/views/productionBusiness/productionCenter/report/columns/detailColumns.js
@@ -25,7 +25,7 @@ export const detailColumns = [
 	},
 	{
 		title: '完工数量',
-		dataIndex: 'amount',
+		dataIndex: 'finishAmount',
 		width: 200,
 		resizable: true,
 		align: 'center',
@@ -33,7 +33,7 @@ export const detailColumns = [
 	},
 	{
 		title: '入库数量',
-		dataIndex: 'amount',
+		dataIndex: 'storeAmount',
 		width: 200,
 		resizable: true,
 		align: 'center',
@@ -41,7 +41,7 @@ export const detailColumns = [
 	},
 	{
 		title: '基本完工数量',
-		dataIndex: 'basicAmount',
+		dataIndex: 'basicFinishAmount',
 		width: 200,
 		resizable: true,
 		align: 'center',
@@ -49,7 +49,7 @@ export const detailColumns = [
 	},
 	{
 		title: '基本入库数量',
-		dataIndex: 'basicAmount',
+		dataIndex: 'basicStoreAmount',
 		width: 200,
 		resizable: true,
 		align: 'center',
@@ -79,17 +79,17 @@ export const detailColumns = [
 		align: 'center',
 		ellipsis: true
 	},
-	{
-		title: '包装数量',
-		dataIndex: 'name',
-		width: 200,
-		resizable: true,
-		align: 'center',
-		ellipsis: true
-	},
+	// {
+	// 	title: '包装数量',
+	// 	dataIndex: 'name',
+	// 	width: 200,
+	// 	resizable: true,
+	// 	align: 'center',
+	// 	ellipsis: true
+	// },
 	{
 		title: '采集失败数',
-		dataIndex: 'name',
+		dataIndex: 'collectFailAmount',
 		width: 200,
 		resizable: true,
 		align: 'center',
@@ -97,15 +97,31 @@ export const detailColumns = [
 	},
 	{
 		title: '采集成功率',
-		dataIndex: 'name',
+		dataIndex: 'collectSuccessRate',
 		width: 200,
 		resizable: true,
 		align: 'center',
 		ellipsis: true
 	},
 	{
-		title: '生产率',
-		dataIndex: 'name',
+		title: '生产日期',
+		dataIndex: 'collectSuccessRate',
+		width: 200,
+		resizable: true,
+		align: 'center',
+		ellipsis: true
+	},
+	{
+		title: '生产类型',
+		dataIndex: 'collectSuccessRate',
+		width: 200,
+		resizable: true,
+		align: 'center',
+		ellipsis: true
+	},
+	{
+		title: '生产类型',
+		dataIndex: 'collectSuccessRate',
 		width: 200,
 		resizable: true,
 		align: 'center',
@@ -139,7 +155,7 @@ export const modalColumns = [
 	},
 	{
 		title: '条码类型',
-		dataIndex: 'unitName',
+		dataIndex: 'barcodeType',
 		width: 200,
 		resizable: true,
 		align: 'center',
@@ -163,7 +179,7 @@ export const modalColumns = [
 	},
 	{
 		title: '数量',
-		dataIndex: '',
+		dataIndex: 'amount',
 		width: 200,
 		resizable: true,
 		align: 'center',
@@ -179,7 +195,7 @@ export const modalColumns = [
 	},
 	{
 		title: '基本数量',
-		dataIndex: 'parentBarcode',
+		dataIndex: 'basicAmount',
 		width: 200,
 		resizable: true,
 		align: 'center',
@@ -187,7 +203,7 @@ export const modalColumns = [
 	},
 	{
 		title: '基本单位',
-		dataIndex: 'baseUnitNames',
+		dataIndex: 'baseUnitName',
 		width: 200,
 		resizable: true,
 		align: 'center',
@@ -195,10 +211,42 @@ export const modalColumns = [
 	},
 	{
 		title: '子码数',
-		dataIndex: 'parentBarcode',
+		dataIndex: 'subAmount',
 		width: 200,
 		resizable: true,
 		align: 'center',
 		ellipsis: true
-	}
+	},
+	{
+		title: '批次',
+		dataIndex: 'specification',
+		width: 200,
+		resizable: true,
+		align: 'center',
+		ellipsis: true
+	},
+	{
+		title: '打码时间',
+		dataIndex: 'subAmount',
+		width: 200,
+		resizable: true,
+		align: 'center',
+		ellipsis: true
+	},
+	{
+		title: '扫描时间',
+		dataIndex: 'scanTime',
+		width: 200,
+		resizable: true,
+		align: 'center',
+		ellipsis: true
+	},
+	{
+		title: '扫描人',
+		dataIndex: 'createUserName',
+		width: 200,
+		resizable: true,
+		align: 'center',
+		ellipsis: true
+	},
 ]
diff --git a/src/views/productionBusiness/productionCenter/report/columns/reportColumns.js b/src/views/productionBusiness/productionCenter/report/columns/reportColumns.js
index 88442d4..f91a492 100644
--- a/src/views/productionBusiness/productionCenter/report/columns/reportColumns.js
+++ b/src/views/productionBusiness/productionCenter/report/columns/reportColumns.js
@@ -43,7 +43,7 @@ export const reportColumns = [
 	},
 	{
 		title: '创建人',
-		dataIndex: 'createUser',
+		dataIndex: 'createUserName',
 		width: 200,
 		resizable: true,
 		align: 'center',
diff --git a/src/views/productionBusiness/productionCenter/report/detail/index.vue b/src/views/productionBusiness/productionCenter/report/detail/index.vue
index 742b7ba..e2234bf 100644
--- a/src/views/productionBusiness/productionCenter/report/detail/index.vue
+++ b/src/views/productionBusiness/productionCenter/report/detail/index.vue
@@ -130,14 +130,14 @@
 		if (expanded) {
 			producePackageBarcodeApi
 				.producePackageBarcodeTreeChildrenList({
-					reportDetailId: record.id,
+					reportDetailId: record.reportDetailId,
 					reportId: record.reportId,
 					parentBarcode: record.barcode
 				})
 				.then((res) => {
 					record.children = res
 					record.children.forEach((item) => {
-						if (item.subAmount > 0) item.children = []
+						item.children = []
 					})
 				})
 		}