From 34079a90f7fbdd0f1c47aeb75588628ebf21f15a Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期四, 10 四月 2025 13:25:20 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/ResourceContent.js | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 1b3287b..2ead1d2 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -43,9 +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 taskLog from './taskLog';
const ResourceContent = (node) => {
switch (node.component) {
@@ -105,8 +105,6 @@
return asnOrderItem;
case 'asnOrderLog':
return asnOrderLog;
- case 'asnOrderItemLog':
- return asnOrderItemLog;
case 'purchaseItem':
return purchaseItem;
case 'purchase':
@@ -131,11 +129,10 @@
return waitPakinItem;
case 'waitPakinLog':
return waitPakinLog;
- case 'waitPakinItemLog':
- return waitPakinItemLog;
-
-
-
+ case 'task':
+ return task;
+ case 'taskLog':
+ return taskLog;
default:
return {
--
Gitblit v1.9.1