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 | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js index b17dc51..8214420 100644 --- a/rsf-admin/src/page/ResourceContent.js +++ b/rsf-admin/src/page/ResourceContent.js @@ -28,6 +28,7 @@ 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'; @@ -38,6 +39,9 @@ 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) { @@ -109,6 +113,15 @@ return locArea; case 'locAreaMatRela': return locAreaMatRela; + case 'locAreaMat': + return locAreaMat; + case 'deviceSite': + return deviceSite; + case 'waitPakin': + return waitPakin; + case 'waitPakinItem': + return waitPakinItem; + default: -- Gitblit v1.9.1