From b3c141c677e894b1e47f083167ca33e8248dd2d9 Mon Sep 17 00:00:00 2001
From: ljx120 <10717296+ljx120@user.noreply.gitee.com>
Date: Mon, 13 Jan 2025 17:31:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=9F=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/documentary/detail.vue     | 23 ++++++++++++-----------
 pages/documentary/ex-factory.vue | 15 ++++++++-------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/pages/documentary/detail.vue b/pages/documentary/detail.vue
index f394577..354a5f7 100644
--- a/pages/documentary/detail.vue
+++ b/pages/documentary/detail.vue
@@ -16,7 +16,7 @@
 	const specialPro = ref([] as any[])
 	const list = ref([] as any[])
 	const special = ref('' as any)
-	const getLog = ref([] as any[])
+	const trackingLog = ref([] as any[])
 	const form = ref({ czrq: formatDate(new Date()), yjxybrq: formatDate(new Date()) } as any)
 
 	onLoad(async (option : any) => {
@@ -58,26 +58,26 @@
 						specialPro.value = res.data
 					}
 				})
-				getAction('/tracking/getLog?id=' + itemList.value.subId).then((res : any) => {
+				getAction('/tracking/getLog?id=' + itemList.value.id).then((res : any) => {
 					if (res.code === 200) {
-						let index=false
+						trackingLog.value=res.data
 						processes.value.processes.forEach((m : any) => {
-							if (!m.id||!index) {
+							if (!m.id) {
 								let a = res.data.find((l : any) => l.details.zt == m.name)
 								if (a) {
 									m.rq = a.details.form.czrq
+									res.data=res.data.concat(a.details.trackingLog)
 								}
-							} else {
-								index=true
-								let a = res.data.find((l : any) => l.details.zt == m.name && l.trackingLogId == itemList.value.id)
-								if (a) {
-									m.rq = a.details.form.czrq
-								}
+							}
+						})
+						processes.value.processes.forEach((m : any) => {
+							let a = res.data.find((l : any) => l.details.zt == m.name)
+							if (a) {
+								m.rq = a.details.form.czrq
 							}
 						})
 					}
 				})
-				console.log(processes.value);
 			} catch (error) {
 				console.error('Failed to parse item JSON:', error);
 				// 可以选择在这里显示错误消息给用户
@@ -262,6 +262,7 @@
 				trackingLogId: itemList.value.id,
 				subId: itemList.value.subId,
 				details: {
+					trackingLog:trackingLog.value,
 					zt: special.value,
 					list: list.value,
 					form: form.value,
diff --git a/pages/documentary/ex-factory.vue b/pages/documentary/ex-factory.vue
index 4da982b..4b90eec 100644
--- a/pages/documentary/ex-factory.vue
+++ b/pages/documentary/ex-factory.vue
@@ -38,20 +38,21 @@
 				} else {
 					processes.value = JSON.parse(itemList.value.processes)
 				}
-				getAction('/tracking/getLog?id='+itemList.value.subId).then((res:any)=>{
+				getAction('/tracking/getLog?id='+itemList.value.id).then((res:any)=>{
 					if(res.code===200){
-						let index=''
 						processes.value.processes.forEach((m : any) => {
 							if (!m.id) {
 								let a = res.data.find((l : any) => l.details.zt == m.name)
 								if (a) {
 									m.rq = a.details.form.czrq
+									res.data=res.data.concat(a.details.trackingLog)
 								}
-							} else {
-								let a = res.data.find((l : any) => l.details.zt == m.name && l.trackingLogId == itemList.value.id)
-								if (a) {
-									m.rq = a.details.form.czrq
-								}
+							}
+						})
+						processes.value.processes.forEach((m : any) => {
+							let a = res.data.find((l : any) => l.details.zt == m.name && l.trackingLogId == itemList.value.id)
+							if (a) {
+								m.rq = a.details.form.czrq
 							}
 						})
 						let b=res.data.find((l:any)=>l.trackingLogId==itemList.value.id&&l.details.zt==='待出厂')