From 8eaee61fbbdea1eaa294b0f1a7d9f2a10da9ade9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 10 三月 2025 17:06:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev
---
rsf-admin/src/page/ResourceContent.js | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index d91a310..448aec3 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -13,18 +13,24 @@
import menu from './system/menu'
import user from './system/user';
import operationRecord from './system/operationRecord';
-import customer from './customer';
-import shipper from './basicInfo/shipper';
import matnr from './basicInfo/matnr';
import matnrGroup from './basicInfo/matnrGroup';
import warehouse from './basicInfo/warehouse';
import warehouseAreas from './warehouseAreas';
-import loc from './loc';
+import loc from './basicInfo/loc';
import container from './container';
import contract from './contract';
-import stockItem from './stockItem';
-import stock from './stock';
import qlyInspect from './qlyInspect';
+import dictType from './system/dicts/dictType';
+import dictData from './system/dicts/dictData';
+import companys from './basicInfo/companys';
+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 purchase from './purchase';
const ResourceContent = (node) => {
@@ -47,10 +53,6 @@
return user;
case 'operationRecord':
return operationRecord;
- case 'customer':
- return customer;
- case 'shipper':
- return shipper;
case 'matnr':
return matnr;
case 'matnrGroup':
@@ -65,12 +67,28 @@
return container;
case 'contract':
return contract;
- case 'stockItem':
- return stockItem;
- case 'stock':
- return stock;
case 'qlyInspect':
return qlyInspect;
+ case 'dictType':
+ return dictType;
+ case 'dictData':
+ return dictData;
+ case 'companys':
+ return companys;
+ case 'serialRuleItem':
+ return serialRuleItem;
+ case 'serialRule':
+ return serialRule;
+ case 'whMat':
+ return whMat;
+ case 'asnOrder':
+ return asnOrder;
+ case 'asnOrderItem':
+ return asnOrderItem;
+ case 'purchaseItem':
+ return purchaseItem;
+ case 'purchase':
+ return purchase;
default:
return {
list: ListGuesser,
--
Gitblit v1.9.1