From c255a17d7ef4fabb37c1ac84b212768e73c42915 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 29 五月 2025 16:57:17 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/task/TaskItemList.jsx | 1 +
rsf-admin/src/i18n/zh.js | 1 +
rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx | 1 -
rsf-admin/src/i18n/en.js | 1 +
rsf-admin/.env | 2 +-
rsf-admin/src/config/setting.js | 2 +-
6 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/.env b/rsf-admin/.env
index a3c69b2..a0bb09f 100644
--- a/rsf-admin/.env
+++ b/rsf-admin/.env
@@ -1,3 +1,3 @@
-VITE_BASE_IP=127.0.0.1
+VITE_BASE_IP=192.168.4.50
# VITE_BASE_IP=47.76.147.249
VITE_BASE_PORT=8080
diff --git a/rsf-admin/src/config/setting.js b/rsf-admin/src/config/setting.js
index 4e8f089..23e458a 100644
--- a/rsf-admin/src/config/setting.js
+++ b/rsf-admin/src/config/setting.js
@@ -25,7 +25,7 @@
export const ABORT_SIGNAL = false;
-export const DEFAULT_PAGE_SIZE = 15;
+export const DEFAULT_PAGE_SIZE = 25;
export const DEFAULT_ITEM_PAGE_SIZE = 10;
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 4f6fb83..f163c6a 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -891,6 +891,7 @@
taskItem: {
taskId: "taskId",
orderId: "orderId",
+ wkType: 'Work Type',
orderType: "orderType",
orderItemId: "orderItemId",
sourceCode: "sourceCode",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 1dc296c..94a27e4 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -920,6 +920,7 @@
taskId: "taskId",
orderId: "璁㈠崟ID",
orderType: "鍗曟嵁绫诲瀷",
+ wkType: '涓氬姟绫诲瀷',
orderItemId: "璁㈠崟鏄庣粏ID",
source: "婧怚D",
matnrId: "鐗╂枡ID",
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
index ff9084c..71ad947 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
@@ -423,7 +423,6 @@
const notify = useNotify();
const refresh = useRefresh();
-
const [createDialog, setCreateDialog] = useState(false);
return (
diff --git a/rsf-admin/src/page/task/TaskItemList.jsx b/rsf-admin/src/page/task/TaskItemList.jsx
index 295fb18..b481f78 100644
--- a/rsf-admin/src/page/task/TaskItemList.jsx
+++ b/rsf-admin/src/page/task/TaskItemList.jsx
@@ -146,6 +146,7 @@
<NumberField source="taskId" label="table.field.taskItem.taskId" />,
<NumberField source="orderId" label="table.field.taskItem.orderId" />,
<NumberField source="orderType$" label="table.field.taskItem.orderType" />,
+ <NumberField source="wkType$" label="table.field.taskItem.wkType" />,
<NumberField source="orderItemId" label="table.field.taskItem.orderItemId" />,
<NumberField source="matnrId" label="table.field.taskItem.matnrId" />,
<TextField source="maktx" label="table.field.taskItem.maktx" />,
--
Gitblit v1.9.1