From beb95fb5fc166804056abafd70fc01ac27de7621 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 09:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue
index 99608fa..2031353 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue
@@ -5,6 +5,7 @@
 		:title="titleEnum[dialogMode]"
 		@closed="visible = false"
 		destroy-on-close
+		:close-on-click-modal="false"
 	>
 		<div class="detail-container" v-if="dialogReadonly">
 			<el-row class="detail-row-view">
@@ -66,7 +67,7 @@
 			:model="formData"
 			:rules="rules"
 			:disabled="dialogReadonly"
-			label-width="130px"
+			label-width="160px"
 		>
 			<el-row>
 				<el-col :span="12">
@@ -184,18 +185,16 @@
 				</el-col>
 			</el-row>
 		</el-form>
-		<template #footer>
+		<template #footer v-if="!dialogReadonly">
 			<el-button
-				class="save-btn"
-				color="#4C34FF"
-				v-if="!dialogReadonly"
+				color="#F2F3F5"
 				:loading="submitting"
 				:disabled="submitting"
 				@click="handleSubmit"
 			>
 				保存
 			</el-button>
-			<el-button color="#F2F3F5" :loading="submitting" :disabled="submitting" @click="handleApply">申请</el-button>
+			<el-button class="save-btn" color="#4C34FF" :loading="submitting" :disabled="submitting" @click="handleApply">申请</el-button>
 
 		</template>
 	</el-dialog>

--
Gitblit v1.9.3