From 33bd4dd1f0e41131cd8e5bbf87204a1f0b72bb08 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期六, 11 四月 2026 07:45:59 +0800
Subject: [PATCH] #页面优化

---
 rsf-design/src/views/orders/wave/wavePage.helpers.js |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/rsf-design/src/views/orders/wave/wavePage.helpers.js b/rsf-design/src/views/orders/wave/wavePage.helpers.js
index 705c383..bb2df45 100644
--- a/rsf-design/src/views/orders/wave/wavePage.helpers.js
+++ b/rsf-design/src/views/orders/wave/wavePage.helpers.js
@@ -80,16 +80,20 @@
     code: '',
     type: '',
     exceStatus: '',
+    anfme: '',
+    qty: '',
+    orderNum: '',
     status: '',
     memo: '',
     timeStart: '',
-    timeEnd: ''
+    timeEnd: '',
+    orderBy: 'create_time desc'
   }
 }
 
 export function buildWaveSearchParams(params = {}) {
   const result = {}
-  ;['condition', 'code', 'memo', 'timeStart', 'timeEnd'].forEach((key) => {
+  ;['condition', 'code', 'memo', 'timeStart', 'timeEnd', 'orderBy'].forEach((key) => {
     const value = normalizeText(params[key])
     if (value) {
       result[key] = value
@@ -108,6 +112,12 @@
     result.status = Number(params.status)
   }
 
+  ;['anfme', 'qty', 'orderNum'].forEach((key) => {
+    if (params[key] !== '' && params[key] !== undefined && params[key] !== null) {
+      result[key] = Number(params[key])
+    }
+  })
+
   return result
 }
 
@@ -115,6 +125,7 @@
   return {
     current: params.current || 1,
     pageSize: params.pageSize || params.size || 20,
+    orderBy: normalizeText(params.orderBy) || 'create_time desc',
     ...buildWaveSearchParams(params)
   }
 }
@@ -129,19 +140,30 @@
 
 export function normalizeWaveRow(record = {}, t) {
   const statusConfig = getStatusConfig(record.exceStatus, record['exceStatus$'], t)
-  const progress = normalizeNumber(record.anfme) > 0
-    ? Math.min(Math.round((normalizeNumber(record.workQty) / normalizeNumber(record.anfme)) * 100), 100)
-    : 0
+  const progress =
+    normalizeNumber(record.anfme) > 0
+      ? Math.min(
+          Math.round((normalizeNumber(record.workQty) / normalizeNumber(record.anfme)) * 100),
+          100
+        )
+      : 0
 
   return {
     ...record,
     code: record.code || '-',
-    typeLabel: record['type$'] || translate(t, `pages.orders.wave.status.type.${record.type}`) || record.type || '-',
+    typeLabel:
+      record['type$'] ||
+      translate(t, `pages.orders.wave.status.type.${record.type}`) ||
+      record.type ||
+      '-',
     exceStatusText: statusConfig.label,
     exceStatusTagType: statusConfig.tagType,
     statusLabel:
       record['status$'] ||
-      translate(t, Number(record.status) === 1 ? 'common.status.normal' : 'common.status.disabled') ||
+      translate(
+        t,
+        Number(record.status) === 1 ? 'common.status.normal' : 'common.status.disabled'
+      ) ||
       record.status ||
       '-',
     anfme: normalizeNumber(record.anfme),
@@ -169,13 +191,18 @@
   const statusConfig = getItemStatusConfig(record.exceStatus, record['exceStatus$'], t)
   return {
     ...record,
+    id: record.id ?? null,
+    waveId: record.waveId ?? '-',
     waveCode: record.waveCode || '-',
     orderCode: record.orderCode || '-',
+    orderItemId: record.orderItemId ?? '-',
+    matnrId: record.matnrId ?? '-',
     matnrCode: record.matnrCode || '-',
     maktx: record.maktx || '-',
     batch: record.batch || '-',
     splrBatch: record.splrBatch || '-',
     unit: record.unit || '-',
+    memo: record.memo || '-',
     trackCode: record.trackCode || '-',
     fieldsIndex: record.fieldsIndex || '-',
     anfme: normalizeNumber(record.anfme),
@@ -183,6 +210,8 @@
     workQty: normalizeNumber(record.workQty),
     stockQty: normalizeNumber(record.stockQty),
     stockLocsText: normalizeStockLocs(record.stockLocs),
+    updateByText: record['updateBy$'] || record.updateBy || '-',
+    createByText: record['createBy$'] || record.createBy || '-',
     statusLabel: record['status$'] || record.status || '-',
     exceStatusText: statusConfig.label,
     exceStatusTagType: statusConfig.tagType,
@@ -319,3 +348,20 @@
     ...buildWaveItemSearchParams(params)
   }
 }
+
+export function normalizeWaveOrderRelaRow(record = {}) {
+  return {
+    ...record,
+    id: record.id ?? null,
+    asnCode: record.asnCode || record.orderCode || '-',
+    matnrCode: record.matnrCode || '-',
+    maktx: record.maktx || '-',
+    splrBatch: record.splrBatch || '-',
+    platOrderCode: record.platOrderCode || '-',
+    spec: record.spec || '-',
+    model: record.model || '-',
+    stockUnit: record.stockUnit || '-',
+    splrName: record.splrName || '-',
+    anfme: normalizeNumber(record.anfme)
+  }
+}

--
Gitblit v1.9.1