From 53e5f901803f85acc1c50b791c4c1eb58e86ba9a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 17:46:05 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/ResourceContent.js | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 61347fe..7f54c8c 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -34,7 +34,7 @@
import whMat from './basicInfo/whMat';
import asnOrder from './asnOrder';
import asnOrderItem from './asnOrderItem';
-import purchaseItem from './purchaseItem';
+// import purchaseItem from './purchaseItem';
import purchase from './purchase';
import fields from './fields';
import fieldsItem from './fieldsItem';
@@ -43,12 +43,9 @@
import waitPakin from './waitPakin';
import waitPakinItem from './waitPakinItem';
import waitPakinLog from './waitPakinLog';
-import waitPakinItemLog from './waitPakinItemLog';
import asnOrderLog from './asnOrderLog';
-import asnOrderItemLog from './asnOrderItemLog';
import task from './task';
-import taskItem from './taskItem';
-
+import taskLog from './taskLog';
const ResourceContent = (node) => {
switch (node.component) {
@@ -108,10 +105,8 @@
return asnOrderItem;
case 'asnOrderLog':
return asnOrderLog;
- case 'asnOrderItemLog':
- return asnOrderItemLog;
- case 'purchaseItem':
- return purchaseItem;
+ // case 'purchaseItem':
+ // return purchaseItem;
case 'purchase':
return purchase;
case 'fields':
@@ -134,13 +129,10 @@
return waitPakinItem;
case 'waitPakinLog':
return waitPakinLog;
- case 'waitPakinItemLog':
- return waitPakinItemLog;
case 'task':
return task;
- case 'taskItem':
- return taskItem;
-
+ case 'taskLog':
+ return taskLog;
default:
return {
--
Gitblit v1.9.1