From d97d7346ec794ffa34077160bb13424f2f84bc57 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 30 四月 2025 10:47:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/ResourceContent.js | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 5a90285..c44aba5 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -20,7 +20,7 @@
import loc from './basicInfo/loc';
import container from './container';
import contract from './contract';
-import qlyInspect from './qlyInspect';
+import qlyInspect from './orders/qlyInspect';
import dictType from './system/dicts/dictType';
import companys from './basicInfo/companys';
import locType from './basicInfo/locType';
@@ -34,13 +34,18 @@
import fields from './fields';
import fieldsItem from './fieldsItem';
import warehouseAreasItem from './warehouseAreasItem';
-import deviceSite from './basicInfo//deviceSite';
+import deviceSite from './basicInfo/deviceSite';
import waitPakin from './waitPakin';
-import waitPakinItem from './waitPakinItem';
-import waitPakinLog from './waitPakinLog';
-import asnOrderLog from './orders/asnOrderLog';
+import waitPakinLog from './histories/waitPakinLog';
+import asnOrderLog from './histories/asnOrderLog';
import task from './task';
-import taskLog from './taskLog';
+import taskLog from './histories/taskLog';
+import stock from './orders/stock';
+import delivery from './orders/delivery';
+import outStock from './orders/outStock';
+import deviceBind from './deviceBind';
+import wave from './orders/wave';
+
const ResourceContent = (node) => {
switch (node.component) {
@@ -80,8 +85,6 @@
return contract;
case 'qlyInspect':
return qlyInspect;
- case 'qlyIsptItem':
- return qlyIsptItem;
case 'dictType':
return dictType;
case 'companys':
@@ -92,8 +95,6 @@
return whMat;
case 'asnOrder':
return asnOrder;
- case 'asnOrderItem':
- return asnOrderItem;
case 'asnOrderLog':
return asnOrderLog;
case 'purchase':
@@ -114,14 +115,22 @@
return deviceSite;
case 'waitPakin':
return waitPakin;
- case 'waitPakinItem':
- return waitPakinItem;
case 'waitPakinLog':
return waitPakinLog;
case 'task':
return task;
case 'taskLog':
return taskLog;
+ case 'stock':
+ return stock;
+ case 'delivery':
+ return delivery;
+ case 'outStock':
+ return outStock;
+ case 'deviceBind':
+ return deviceBind;
+ case 'wave':
+ return wave;
default:
return {
--
Gitblit v1.9.1