From b5e8045d5f5b5401b696db12f62fdbcc86dc5c5d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 11:40:02 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/ResourceContent.js | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 61347fe..ed01cd9 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -45,9 +45,11 @@
import waitPakinLog from './waitPakinLog';
import waitPakinItemLog from './waitPakinItemLog';
import asnOrderLog from './asnOrderLog';
-import asnOrderItemLog from './asnOrderItemLog';
+// import asnOrderItemLog from './asnOrderItemLog';
import task from './task';
-import taskItem from './taskItem';
+// import taskItem from './taskItem';
+import taskLog from './taskLog';
+// import taskItemLog from './taskItemLog';
const ResourceContent = (node) => {
@@ -108,8 +110,8 @@
return asnOrderItem;
case 'asnOrderLog':
return asnOrderLog;
- case 'asnOrderItemLog':
- return asnOrderItemLog;
+ // case 'asnOrderItemLog':
+ // return asnOrderItemLog;
case 'purchaseItem':
return purchaseItem;
case 'purchase':
@@ -138,9 +140,12 @@
return waitPakinItemLog;
case 'task':
return task;
- case 'taskItem':
- return taskItem;
-
+ // case 'taskItem':
+ // return taskItem;
+ case 'taskLog':
+ return taskLog;
+ // case 'taskItemLog':
+ // return taskItemLog;
default:
return {
--
Gitblit v1.9.1