Kaynağa Gözat

fix(s0): apply default domain to manufacturing factor pages

YY968XX 1 gün önce
ebeveyn
işleme
2e03154c65

+ 1 - 1
Web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "admin.net",
   "type": "module",
-  "version": "2.4.245",
+  "version": "2.4.246",
   "packageManager": "pnpm@10.32.1",
   "lastBuildTime": "2026.03.15",
   "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",

+ 7 - 2
Web/src/views/aidop/s0/manufacturing/MaterialProcessElementList.vue

@@ -126,6 +126,7 @@ import { useRoute } from 'vue-router';
 import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from 'element-plus';
 import AidopDemoShell from '../../components/AidopDemoShell.vue';
 import { s0MfgMaterialProcessElementsApi } from '../api/s0ManufacturingApi';
+import { S0_DEFAULT_FACTORY_CODE } from '../composables/useS0MfgOrgScope';
 
 const route = useRoute();
 const pageTitle = computed(() => (route.meta?.title as string) || '物料工序生产要素');
@@ -174,6 +175,7 @@ async function loadList() {
 		if (!query.domain.trim()) {
 			rows.value = [];
 			total.value = 0;
+			ElMessage.warning('请输入工厂域后再查询');
 			return;
 		}
 		const data = await s0MfgMaterialProcessElementsApi.list({
@@ -197,7 +199,8 @@ async function loadList() {
 }
 
 function resetQuery() {
-	query.domain = '';
+	// 重置后恢复默认工厂域,保证仍自动带 domain 发请求
+	query.domain = S0_DEFAULT_FACTORY_CODE;
 	query.itemNum = '';
 	query.op = '';
 	query.line = '';
@@ -288,7 +291,9 @@ function toggleEnabled(row: Row) {
 }
 
 onMounted(async () => {
-	await loadOrgs();
+	// 首屏补默认工厂域(复用 S0 示范工厂 code),确保进入即发列表请求。
+	// 移除原 `await loadOrgs()` 无效调用:该函数在本页未定义/未导入,会抛错中断 onMounted、导致首屏不请求。
+	if (!query.domain.trim()) query.domain = S0_DEFAULT_FACTORY_CODE;
 	await loadList();
 });
 </script>

+ 6 - 1
Web/src/views/aidop/s0/manufacturing/PreprocessElementList.vue

@@ -106,6 +106,7 @@ import { useRoute } from 'vue-router';
 import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from 'element-plus';
 import AidopDemoShell from '../../components/AidopDemoShell.vue';
 import { s0MfgPreprocessElementsApi } from '../api/s0ManufacturingApi';
+import { S0_DEFAULT_FACTORY_CODE } from '../composables/useS0MfgOrgScope';
 
 const route = useRoute();
 const pageTitle = computed(() => (route.meta?.title as string) || '物料前处理要素');
@@ -152,6 +153,7 @@ async function loadList() {
 		if (!query.domain.trim()) {
 			rows.value = [];
 			total.value = 0;
+			ElMessage.warning('请输入工厂域后再查询');
 			return;
 		}
 		const data = await s0MfgPreprocessElementsApi.list({
@@ -175,7 +177,8 @@ async function loadList() {
 
 function resetQuery() {
 	query.keyword = '';
-	query.domain = '';
+	// 重置后恢复默认工厂域,保证仍自动带 domain 发请求
+	query.domain = S0_DEFAULT_FACTORY_CODE;
 	query.itemNum = '';
 	query.op = '';
 	query.itemCode = '';
@@ -253,6 +256,8 @@ function onDelete(row: Row) {
 }
 
 onMounted(async () => {
+	// 首屏补默认工厂域(复用 S0 示范工厂 code),确保进入即发列表请求
+	if (!query.domain.trim()) query.domain = S0_DEFAULT_FACTORY_CODE;
 	await loadList();
 });
 </script>

+ 6 - 1
Web/src/views/aidop/s0/manufacturing/ProductionElementParamList.vue

@@ -125,6 +125,7 @@ import { useRoute } from 'vue-router';
 import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from 'element-plus';
 import AidopDemoShell from '../../components/AidopDemoShell.vue';
 import { s0MfgElementParamsApi } from '../api/s0ManufacturingApi';
+import { S0_DEFAULT_FACTORY_CODE } from '../composables/useS0MfgOrgScope';
 
 const route = useRoute();
 const pageTitle = computed(() => (route.meta?.title as string) || '生产要素参数');
@@ -173,6 +174,7 @@ async function loadList() {
 		if (!query.domain.trim()) {
 			rows.value = [];
 			total.value = 0;
+			ElMessage.warning('请输入工厂域后再查询');
 			return;
 		}
 		const data = await s0MfgElementParamsApi.list({
@@ -193,7 +195,8 @@ async function loadList() {
 
 function resetQuery() {
 	query.keyword = '';
-	query.domain = '';
+	// 重置后恢复默认工厂域,保证仍自动带 domain 发请求
+	query.domain = S0_DEFAULT_FACTORY_CODE;
 	query.page = 1;
 	void loadList();
 }
@@ -274,6 +277,8 @@ function onDelete(row: Row) {
 }
 
 onMounted(async () => {
+	// 首屏补默认工厂域(复用 S0 示范工厂 code),确保进入即发列表请求
+	if (!query.domain.trim()) query.domain = S0_DEFAULT_FACTORY_CODE;
 	await loadList();
 });
 </script>