From 0c92fd00fae033a2aa04bb65b2d32bd2c8f9fd4a Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 04 Feb 2026 15:48:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/task-work-order/src/views/orderView/appConfiguration/materials/FormDiaLog.vue |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/applications/task-work-order/src/views/orderView/appConfiguration/materials/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/appConfiguration/materials/FormDiaLog.vue
index 57c6898..215d36f 100644
--- a/applications/task-work-order/src/views/orderView/appConfiguration/materials/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/appConfiguration/materials/FormDiaLog.vue
@@ -7,7 +7,7 @@
 		destroy-on-close
 		:close-on-click-modal="false"
 	>
-		<el-row class="detail-row-view" v-if="dialogReadonly">
+		<el-row class="detail-row-view detailContainer" v-if="dialogReadonly">
 			<el-col :span="12">
 				<div class="label">材料名称</div>
 				<div class="val">{{ formData.materialName }}</div>
@@ -24,10 +24,10 @@
 				<div class="label">是否适用全部情形</div>
 				<div class="val">{{ getDictLabel(String(formData.isAllScenario), dictObj.isAllScenario) }}</div>
 			</el-col>
-			<el-col :span="12">
+			<!-- <el-col :span="12">
 				<div class="label">所属区域</div>
 				<div class="val">{{ formData.areaName }}</div>
-			</el-col>
+			</el-col> -->
 		</el-row>
 
 		<el-form
@@ -86,7 +86,7 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
-				<el-col :span="12">
+				<!-- <el-col :span="12">
 					<el-form-item label="所属区域" prop="areaCode">
 						<el-tree-select
 							class="gd-select"
@@ -104,7 +104,7 @@
 							:render-after-expand="false"
 						/>
 					</el-form-item>
-				</el-col>
+				</el-col> -->
 			</el-row>
 		</el-form>
 		<template #footer v-if="!dialogReadonly">
@@ -300,4 +300,10 @@
 defineExpose({ open })
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.detailContainer {
+	.label {
+		width: 120px !important;
+	}
+}
+</style>

--
Gitblit v1.9.3