From 47a682630b8563017db497f2d0b48b3827a2ab40 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 25 三月 2025 14:25:49 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/ResourceContent.js | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 6f35cdf..fb93236 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';
@@ -33,7 +38,7 @@
import purchase from './purchase';
import fields from './fields';
import fieldsItem from './fieldsItem';
-
+import warehouseAreasItem from './warehouseAreasItem';
const ResourceContent = (node) => {
switch (node.component) {
@@ -63,6 +68,8 @@
return warehouse;
case 'warehouseAreas':
return warehouseAreas;
+ case 'warehouseAreasItem':
+ return warehouseAreasItem;
case 'loc':
return loc;
case 'container':
@@ -71,6 +78,8 @@
return contract;
case 'qlyInspect':
return qlyInspect;
+ case 'qlyIsptItem':
+ return qlyIsptItem;
case 'dictType':
return dictType;
case 'dictData':
@@ -95,6 +104,16 @@
return fields;
case 'fieldsItem':
return fieldsItem;
+ case 'locType':
+ return locType;
+ case 'locArea':
+ return locArea;
+ case 'locAreaMatRela':
+ return locAreaMatRela;
+ case 'locAreaMat':
+ return locAreaMat;
+
+
default:
return {
list: ListGuesser,
--
Gitblit v1.9.1