From 954d6c81265856bfa05ec6474dd7d5cc12afc0af Mon Sep 17 00:00:00 2001
From: Ledo <Watch13755@#.>
Date: Fri, 10 Jan 2025 09:31:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=AE=A1=E6=A0=B8=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/heli/projectorder/startprint.vue    | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue
index 4e3460f..55c3894 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue
@@ -278,13 +278,13 @@ style="
               <span v-else> {{ userInit.find((user) => user.id == planData.approver)?.nickname+'/'+formatDate(new Date(planData.auditDate), 'YYYY-MM-DD') }}</span>
             </td> -->
             <td colspan="4">
-              <span v-if="!planData.auditor"> &nbsp;</span>
-              <span v-else> {{ userInit.find((user) => user.id == planData.auditor)?.nickname+'/'+formatDate(new Date(planData.auditDate), 'YYYY-MM-DD')}}</span>
+              <span v-if="!formData.approveUserName"> &nbsp;</span>
+              <span v-else> {{ formData.approveUserName+'/'+formatDate(new Date(formData.approveTime), 'YYYY-MM-DD')}}</span>
 
             </td>
             <td colspan="3">
-              <span v-if="!planData.approver"> &nbsp;</span>
-              <span v-else> {{ userInit.find((user) => user.id == planData.approver)?.nickname+'/'+formatDate(new Date(planData.auditDate), 'YYYY-MM-DD') }}</span>
+              <span v-if="!formData.auditUserName"> &nbsp;</span>
+              <span v-else> {{formData.auditUserName +'/'+formatDate(new Date(formData.auditTime), 'YYYY-MM-DD') }}</span>
             </td>
             <td colspan="3">
 
@@ -786,18 +786,24 @@ const open = async (id: number,propertynew :number) => {
   formData.value.customer = await getCustomer(formData.value.customerId)
   // 操作日志查询 并筛选审核/批准信息
   let logParams = {
-    pageNo: 1,
-    pageSize: 2,
-    typeList: [9, 10]
-  }
-  const logs = await getOperateLogPage(logParams)
-  if (logs.list && logs.list.length == 2) {
-    const approveLog = logs.list[0]
-    const auditLog = logs.list[1]
+					pageNo: 1,
+			  	pageSize: 99,
+					businessId: id,
+					businessType: 'PROJECT_ORDER'
+				}
+	formData.value.operateLogs = (await getOperateLogPage(logParams)).list
+  if (formData.value.operateLogs && formData.value.operateLogs.length >= 3) {
+    const approveLog = formData.value.operateLogs[2]
     formData.value.approveTime = approveLog.startTime
     formData.value.approveUserName = approveLog.userNickname
-    formData.value.auditTime = auditLog.startTime
-    formData.value.auditUserName = auditLog.userNickname
+    if(formData.value.operateLogs.length ==4){
+      const auditLog = formData.value.operateLogs[3]
+      formData.value.auditTime = auditLog.startTime
+      formData.value.auditUserName = auditLog.userNickname
+    }
+    // const auditLog = formData.value.operateLogs[3]
+    // formData.value.auditTime = auditLog.startTime
+    // formData.value.auditUserName = auditLog.userNickname
   }
   formData.value.propertynew = propertynew;
   // loading .value = false;