From 7aa1d1fac96e4241ccf35aa3a19d95d62fab623b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 28 三月 2025 15:45:30 +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, 36 insertions(+), 1 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 448aec3..8214420 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -21,9 +21,14 @@
import container from './container';
import contract from './contract';
import qlyInspect from './qlyInspect';
+import qlyIsptItem from './qlyIsptItem';
import dictType from './system/dicts/dictType';
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';
@@ -31,7 +36,12 @@
import asnOrderItem from './asnOrderItem';
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';
const ResourceContent = (node) => {
switch (node.component) {
@@ -61,6 +71,8 @@
return warehouse;
case 'warehouseAreas':
return warehouseAreas;
+ case 'warehouseAreasItem':
+ return warehouseAreasItem;
case 'loc':
return loc;
case 'container':
@@ -69,6 +81,8 @@
return contract;
case 'qlyInspect':
return qlyInspect;
+ case 'qlyIsptItem':
+ return qlyIsptItem;
case 'dictType':
return dictType;
case 'dictData':
@@ -89,6 +103,27 @@
return purchaseItem;
case 'purchase':
return purchase;
+ case 'fields':
+ return fields;
+ case 'fieldsItem':
+ 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;
+
+
+
default:
return {
list: ListGuesser,
--
Gitblit v1.9.1