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="
{{ userInit.find((user) => user.id == planData.approver)?.nickname+'/'+formatDate(new Date(planData.auditDate), 'YYYY-MM-DD') }}
-->
-
- {{ userInit.find((user) => user.id == planData.auditor)?.nickname+'/'+formatDate(new Date(planData.auditDate), 'YYYY-MM-DD')}}
+
+ {{ formData.approveUserName+'/'+formatDate(new Date(formData.approveTime), 'YYYY-MM-DD')}}
|
-
- {{ userInit.find((user) => user.id == planData.approver)?.nickname+'/'+formatDate(new Date(planData.auditDate), 'YYYY-MM-DD') }}
+
+ {{formData.auditUserName +'/'+formatDate(new Date(formData.auditTime), 'YYYY-MM-DD') }}
|
@@ -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;
|