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 | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 45aa3f1..2ead1d2 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -26,6 +26,9 @@
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';
@@ -36,6 +39,13 @@
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,6 +103,8 @@
return asnOrder;
case 'asnOrderItem':
return asnOrderItem;
+ case 'asnOrderLog':
+ return asnOrderLog;
case 'purchaseItem':
return purchaseItem;
case 'purchase':
@@ -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