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-item-log/taskItemLogPage.helpers.js |   47 +++++++++++++++++++++++++++++++++++++----------
 1 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/rsf-design/src/views/manager/task-item-log/taskItemLogPage.helpers.js b/rsf-design/src/views/manager/task-item-log/taskItemLogPage.helpers.js
index 6438952..3ac8de3 100644
--- a/rsf-design/src/views/manager/task-item-log/taskItemLogPage.helpers.js
+++ b/rsf-design/src/views/manager/task-item-log/taskItemLogPage.helpers.js
@@ -29,6 +29,9 @@
     logId: '',
     taskId: '',
     taskItemId: '',
+    orderId: '',
+    orderType: '',
+    orderItemId: '',
     matnrId: '',
     maktx: '',
     platItemId: '',
@@ -39,6 +42,7 @@
     sourceCode: '',
     sourceId: '',
     matnrCode: '',
+    trackCode: '',
     unit: '',
     anfme: '',
     batch: '',
@@ -60,7 +64,8 @@
     keeperId: '',
     keeperName: '',
     targetWarehouseId: '',
-    sourceWarehouseId: ''
+    sourceWarehouseId: '',
+    orderBy: 'create_time desc'
   }
 }
 
@@ -76,6 +81,7 @@
 
   ;[
     'condition',
+    'orderType',
     'maktx',
     'platItemId',
     'platOrderCode',
@@ -83,6 +89,7 @@
     'projectCode',
     'sourceCode',
     'matnrCode',
+    'trackCode',
     'unit',
     'batch',
     'spec',
@@ -109,21 +116,28 @@
       result[key] = value
     }
   })
-
   ;['timeStart', 'timeEnd'].forEach((key) => {
     if (params[key]) {
       result[key] = params[key]
     }
   })
-
-  ;['logId', 'taskId', 'taskItemId', 'matnrId', 'source', 'sourceId', 'anfme', 'status'].forEach(
-    (key) => {
-      const value = normalizeNumber(params[key])
-      if (value !== null) {
-        result[key] = value
-      }
+  ;[
+    'logId',
+    'taskId',
+    'taskItemId',
+    'orderId',
+    'orderItemId',
+    'matnrId',
+    'source',
+    'sourceId',
+    'anfme',
+    'status'
+  ].forEach((key) => {
+    const value = normalizeNumber(params[key])
+    if (value !== null) {
+      result[key] = value
     }
-  )
+  })
 
   return {
     condition: '',
@@ -135,6 +149,7 @@
   return {
     current: params.current || 1,
     pageSize: params.pageSize || params.size || 20,
+    orderBy: normalizeText(params.orderBy) || 'create_time desc',
     ...buildTaskItemLogSearchParams(params)
   }
 }
@@ -150,6 +165,9 @@
     logId: record.logId ?? '--',
     taskId: record.taskId ?? '--',
     taskItemId: record.taskItemId ?? '--',
+    orderId: record.orderId ?? '--',
+    orderType: normalizeReportText(record.orderType || record['orderType$']),
+    orderItemId: record.orderItemId ?? '--',
     matnrId: record.matnrId ?? '--',
     maktx: normalizeReportText(record.maktx),
     platItemId: normalizeReportText(record.platItemId),
@@ -160,6 +178,7 @@
     sourceCode: normalizeReportText(record.sourceCode),
     sourceId: record.sourceId ?? '--',
     matnrCode: normalizeReportText(record.matnrCode),
+    trackCode: normalizeReportText(record.trackCode),
     unit: normalizeReportText(record.unit),
     anfme: record.anfme ?? '--',
     batch: normalizeReportText(record.batch),
@@ -194,6 +213,9 @@
   return [
     { source: 'taskId', label: '浠诲姟ID' },
     { source: 'taskItemId', label: '浠诲姟鏄庣粏ID' },
+    { source: 'orderId', label: '鍗曟嵁ID' },
+    { source: 'orderType', label: '鍗曟嵁绫诲瀷' },
+    { source: 'orderItemId', label: '鍗曟嵁鏄庣粏ID' },
     { source: 'matnrId', label: '鐗╂枡ID' },
     { source: 'maktx', label: '鐗╂枡鍚嶇О' },
     { source: 'platWorkCode', label: '宸ュ崟鍙�' },
@@ -202,6 +224,7 @@
     { source: 'source', label: '婧愮紪鐮�' },
     { source: 'sourceCode', label: '婧愬崟鍙�' },
     { source: 'matnrCode', label: '鐗╂枡缂栫爜' },
+    { source: 'trackCode', label: '杩借釜鐮�' },
     { source: 'unit', label: '搴撳瓨鍗曚綅' },
     { source: 'anfme', label: '鏁伴噺' },
     { source: 'batch', label: '搴撳瓨鎵规' },
@@ -223,6 +246,9 @@
     return {
       taskId: row.taskId,
       taskItemId: row.taskItemId,
+      orderId: row.orderId,
+      orderType: row.orderType,
+      orderItemId: row.orderItemId,
       matnrId: row.matnrId,
       maktx: row.maktx,
       platWorkCode: row.platWorkCode,
@@ -231,6 +257,7 @@
       source: row.source,
       sourceCode: row.sourceCode,
       matnrCode: row.matnrCode,
+      trackCode: row.trackCode,
       unit: row.unit,
       anfme: row.anfme,
       batch: row.batch,

--
Gitblit v1.9.1