From d97d7346ec794ffa34077160bb13424f2f84bc57 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 30 四月 2025 10:47:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/ResourceContent.js | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index acd7bfb..c44aba5 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -40,7 +40,12 @@
import asnOrderLog from './histories/asnOrderLog';
import task from './task';
import taskLog from './histories/taskLog';
-import order from './orders/order';
+import stock from './orders/stock';
+import delivery from './orders/delivery';
+import outStock from './orders/outStock';
+import deviceBind from './deviceBind';
+import wave from './orders/wave';
+
const ResourceContent = (node) => {
switch (node.component) {
@@ -116,8 +121,17 @@
return task;
case 'taskLog':
return taskLog;
- case 'order':
- return order;
+ case 'stock':
+ return stock;
+ case 'delivery':
+ return delivery;
+ case 'outStock':
+ return outStock;
+ case 'deviceBind':
+ return deviceBind;
+ case 'wave':
+ return wave;
+
default:
return {
list: ListGuesser,
--
Gitblit v1.9.1