From d4e039545c9e97347223eb415fbba85ee01bc263 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期六, 11 四月 2026 10:10:14 +0800
Subject: [PATCH] #页面优化
---
rsf-design/src/views/manager/task-log/taskLogPage.helpers.js | 65 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/rsf-design/src/views/manager/task-log/taskLogPage.helpers.js b/rsf-design/src/views/manager/task-log/taskLogPage.helpers.js
index 41c7013..d4bf5dd 100644
--- a/rsf-design/src/views/manager/task-log/taskLogPage.helpers.js
+++ b/rsf-design/src/views/manager/task-log/taskLogPage.helpers.js
@@ -1,9 +1,11 @@
+import { $t } from '@/locales'
+
const STATUS_META = {
- 1: { text: '姝ｅ父', type: 'success' },
- 0: { text: '鍐荤粨', type: 'info' }
+ 1: { text: $t('common.status.enabled'), type: 'success' },
+ 0: { text: $t('common.status.disabled'), type: 'info' }
}
-export const TASK_LOG_REPORT_TITLE = '浠诲姟鍘嗗彶妗ｆ姤琛�'
+export const TASK_LOG_REPORT_TITLE = $t('pages.manager.taskLog.reportTitle')
function normalizeText(value) {
return String(value ?? '').trim()
@@ -37,7 +39,10 @@
sort: '',
expCode: '',
startTime: '',
- endTime: ''
+ endTime: '',
+ memo: '',
+ status: '',
+ orderBy: 'create_time desc'
}
}
@@ -61,21 +66,20 @@
'barcode',
'robotCode',
'expDesc',
- 'expCode'
+ 'expCode',
+ 'memo'
].forEach((key) => {
const value = normalizeText(params[key])
if (value) {
result[key] = value
}
})
-
;['timeStart', 'timeEnd', 'startTime', 'endTime'].forEach((key) => {
if (params[key]) {
result[key] = params[key]
}
})
-
- ;['taskId', 'taskStatus', 'taskType', 'exceStatus', 'sort'].forEach((key) => {
+ ;['taskId', 'taskStatus', 'taskType', 'exceStatus', 'sort', 'status'].forEach((key) => {
const value = normalizeNumber(params[key])
if (value !== null) {
result[key] = value
@@ -92,6 +96,7 @@
return {
current: params.current || 1,
pageSize: params.pageSize || params.size || 20,
+ orderBy: normalizeText(params.orderBy) || 'create_time desc',
...buildTaskLogSearchParams(params)
}
}
@@ -132,15 +137,27 @@
export function getTaskLogReportColumns() {
return [
- { prop: 'taskCode', label: '浠诲姟鍙�' },
- { prop: 'taskStatusText', label: '浠诲姟鐘舵��' },
- { prop: 'taskTypeText', label: '浠诲姟绫诲瀷' },
- { prop: 'orgLoc', label: '婧愬簱浣�' },
- { prop: 'targLoc', label: '鐩爣搴撲綅' },
- { prop: 'barcode', label: '鎵樼洏鐮�' },
- { prop: 'robotCode', label: '鏈哄櫒浜虹紪鐮�' },
- { prop: 'startTimeText', label: '寮�濮嬫椂闂�' },
- { prop: 'endTimeText', label: '缁撴潫鏃堕棿' }
+ { prop: 'id', label: $t('table.id') },
+ { prop: 'taskId', label: $t('pages.manager.taskLog.detail.taskId') },
+ { prop: 'taskCode', label: $t('pages.manager.taskLog.table.taskCode') },
+ { prop: 'taskStatusText', label: $t('pages.manager.taskLog.table.taskStatus') },
+ { prop: 'taskTypeText', label: $t('pages.manager.taskLog.table.taskType') },
+ { prop: 'orgLoc', label: $t('pages.manager.taskLog.table.orgLoc') },
+ { prop: 'orgSite', label: $t('pages.manager.taskLog.table.orgSite') },
+ { prop: 'targLoc', label: $t('pages.manager.taskLog.table.targLoc') },
+ { prop: 'targSite', label: $t('pages.manager.taskLog.table.targSite') },
+ { prop: 'barcode', label: $t('pages.manager.taskLog.table.barcode') },
+ { prop: 'robotCode', label: $t('pages.manager.taskLog.table.robotCode') },
+ { prop: 'exceStatusText', label: $t('pages.manager.taskLog.detail.exceStatus') },
+ { prop: 'sort', label: $t('pages.manager.taskLog.detail.sort') },
+ { prop: 'expCode', label: $t('pages.manager.taskLog.detail.expCode') },
+ { prop: 'startTimeText', label: $t('pages.manager.taskLog.table.startTime') },
+ { prop: 'endTimeText', label: $t('pages.manager.taskLog.table.endTime') },
+ { prop: 'createByText', label: $t('table.createBy') },
+ { prop: 'createTimeText', label: $t('table.createTime') },
+ { prop: 'updateByText', label: $t('table.updateBy') },
+ { prop: 'updateTimeText', label: $t('table.updateTime') },
+ { prop: 'memo', label: $t('table.memo') }
]
}
@@ -148,15 +165,27 @@
return records.map((record) => {
const row = normalizeTaskLogRow(record)
return {
+ id: row.id ?? '--',
+ taskId: row.taskId,
taskCode: row.taskCode,
taskStatusText: row.taskStatusText,
taskTypeText: row.taskTypeText,
orgLoc: row.orgLoc,
+ orgSite: row.orgSite,
targLoc: row.targLoc,
+ targSite: row.targSite,
barcode: row.barcode,
robotCode: row.robotCode,
+ exceStatusText: row.exceStatusText,
+ sort: row.sort,
+ expCode: row.expCode,
startTimeText: row.startTimeText,
- endTimeText: row.endTimeText
+ endTimeText: row.endTimeText,
+ createByText: row.createByText,
+ createTimeText: row.createTimeText,
+ updateByText: row.updateByText,
+ updateTimeText: row.updateTimeText,
+ memo: row.memo
}
})
}
--
Gitblit v1.9.1