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 | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 45aa3f1..7f54c8c 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -26,16 +26,26 @@
import dictData from './system/dicts/dictData';
import companys from './basicInfo/companys';
import locType from './basicInfo/locType';
+import locArea from './basicInfo//locArea';
+import locAreaMatRela from './basicInfo/locAreaMatRela';
+import locAreaMat from './basicInfo/locAreaMat';
import serialRuleItem from './system/serialRuleItem';
import serialRule from './system/serialRule';
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';
import warehouseAreasItem from './warehouseAreasItem';
+import deviceSite from './basicInfo//deviceSite';
+import waitPakin from './waitPakin';
+import waitPakinItem from './waitPakinItem';
+import waitPakinLog from './waitPakinLog';
+import asnOrderLog from './asnOrderLog';
+import task from './task';
+import taskLog from './taskLog';
const ResourceContent = (node) => {
switch (node.component) {
@@ -93,8 +103,10 @@
return asnOrder;
case 'asnOrderItem':
return asnOrderItem;
- case 'purchaseItem':
- return purchaseItem;
+ case 'asnOrderLog':
+ return asnOrderLog;
+ // case 'purchaseItem':
+ // return purchaseItem;
case 'purchase':
return purchase;
case 'fields':
@@ -103,6 +115,25 @@
return fieldsItem;
case 'locType':
return locType;
+ case 'locArea':
+ return locArea;
+ case 'locAreaMatRela':
+ return locAreaMatRela;
+ case 'locAreaMat':
+ return locAreaMat;
+ case 'deviceSite':
+ return deviceSite;
+ case 'waitPakin':
+ return waitPakin;
+ case 'waitPakinItem':
+ return waitPakinItem;
+ case 'waitPakinLog':
+ return waitPakinLog;
+ case 'task':
+ return task;
+ case 'taskLog':
+ return taskLog;
+
default:
return {
list: ListGuesser,
--
Gitblit v1.9.1