From b5cb2129674c45050362bf7b2188a6a3b56d71d3 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 21 Jan 2026 16:02:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue | 44 ++++++++------------------------------------
1 files changed, 8 insertions(+), 36 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
index 8df7d39..a69b97d 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
@@ -5,9 +5,10 @@
:title="titleEnum[dialogMode]"
@closed="visible = false"
destroy-on-close
+ :close-on-click-modal="false"
>
<div class="detail-container" v-if="dialogReadonly">
- <el-row>
+ <el-row class="detail-row-view">
<el-col :span="12">
<div class="label">标题</div>
<div class="val">{{ formData.title }}</div>
@@ -24,10 +25,6 @@
<div class="label">提交人联系方式</div>
<div class="val">{{ formData.submitterContact }}</div>
</el-col>
- <!-- <el-col :span="12">
- <div class="label">提交单位</div>
- <div class="val">{{ formData.submitUnitName }}</div>
- </el-col> -->
<el-col :span="12">
<div class="label">目录/申请资源名称</div>
<div class="val">{{ formData.catalogResourceName }}</div>
@@ -54,7 +51,7 @@
:model="formData"
:rules="rules"
:disabled="dialogReadonly"
- label-width="120px"
+ label-width="180px"
>
<el-row>
<el-col :span="12">
@@ -90,20 +87,6 @@
<el-input class="gd-input" v-model="formData.submitterContact" placeholder="请输入" clearable />
</el-form-item>
</el-col>
-<!-- <el-col :span="12">-->
-<!-- <el-form-item label="提交单位" prop="submitUnitId">-->
-<!-- <el-tree-select-->
-<!-- class="gd-select"-->
-<!-- popper-class="gd-tree-select-popper"-->
-<!-- v-model="formData.submitUnitId"-->
-<!-- node-key="id"-->
-<!-- :data="deptTree"-->
-<!-- :props="treeProps"-->
-<!-- check-strictly-->
-<!-- clearable-->
-<!-- />-->
-<!-- </el-form-item>-->
-<!-- </el-col>-->
<el-col :span="12">
<el-form-item label="目录/申请资源名称" prop="catalogResourceName">
<el-input class="gd-input" v-model="formData.catalogResourceName" placeholder="请输入" clearable />
@@ -166,7 +149,7 @@
>
保存
</el-button>
- <el-button color="#F2F3F5" @click="handleApply">申请</el-button>
+ <el-button color="#F2F3F5" :loading="submitting" :disabled="submitting" @click="handleApply">申请</el-button>
</template>
</el-dialog>
@@ -329,7 +312,7 @@
}
// 申请提交
async function handleApply() {
-
+
}
// 加载详情
async function loadDetail() {
@@ -356,22 +339,11 @@
<style scoped lang="scss">
.detail-container {
padding: 20px;
- .label {
- font-weight: 500;
- color: #333333;
- margin-bottom: 8px;
- }
- .val {
- padding: 8px;
- background-color: #f5f7fa;
- border-radius: 4px;
- min-height: 32px;
- word-break: break-all;
- margin-bottom: 16px;
- }
}
-
.upload-container {
width: 100%;
}
+.label {
+ width: 120px !important;
+}
</style>
--
Gitblit v1.9.3