From d692259553b83ed00ada0ba2792ae91704a4def2 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 10 四月 2025 13:52:22 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/page/ResourceContent.js | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 1 deletions(-) diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js index c573c0a..2ead1d2 100644 --- a/rsf-admin/src/page/ResourceContent.js +++ b/rsf-admin/src/page/ResourceContent.js @@ -21,13 +21,31 @@ 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'; - +import asnOrder from './asnOrder'; +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'; +import waitPakinLog from './waitPakinLog'; +import asnOrderLog from './asnOrderLog'; +import task from './task'; +import taskLog from './taskLog'; const ResourceContent = (node) => { switch (node.component) { @@ -57,6 +75,8 @@ return warehouse; case 'warehouseAreas': return warehouseAreas; + case 'warehouseAreasItem': + return warehouseAreasItem; case 'loc': return loc; case 'container': @@ -65,6 +85,8 @@ return contract; case 'qlyInspect': return qlyInspect; + case 'qlyIsptItem': + return qlyIsptItem; case 'dictType': return dictType; case 'dictData': @@ -77,6 +99,41 @@ return serialRule; case 'whMat': return whMat; + case 'asnOrder': + return asnOrder; + case 'asnOrderItem': + return asnOrderItem; + case 'asnOrderLog': + return asnOrderLog; + case 'purchaseItem': + 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; + case 'waitPakinLog': + return waitPakinLog; + case 'task': + return task; + case 'taskLog': + return taskLog; + default: return { list: ListGuesser, -- Gitblit v1.9.1