From 4554e205f886b522fa2005ba3189e81866f3e89d Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 21 Jan 2026 16:02:43 +0800
Subject: [PATCH] feat:调整
---
applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue | 39 +++++----------------------------------
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/auditRecord.vue | 6 +++---
2 files changed, 8 insertions(+), 37 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 3dc777d..ac943fb 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
@@ -24,10 +24,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 +50,7 @@
:model="formData"
:rules="rules"
:disabled="dialogReadonly"
- label-width="120px"
+ label-width="180px"
>
<el-row>
<el-col :span="12">
@@ -90,20 +86,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 +148,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>
@@ -356,22 +338,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>
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/auditRecord.vue b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/auditRecord.vue
index fe24617..6ab0aff 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/auditRecord.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/auditRecord.vue
@@ -45,7 +45,7 @@
steps.push({
status: '0',
title: '需求申请',
- person: sortedRecords.find(r => r.auditStatus === '0')?.createUser || '',
+ person: sortedRecords.find(r => r.auditStatus === '0')?.userName || '',
time: sortedRecords.find(r => r.auditStatus === '0')?.createTime || ''
})
@@ -55,7 +55,7 @@
steps.push({
status: '1',
title: '审核通过',
- person: approvedRecord.createUser || '',
+ person: approvedRecord.userName || '',
time: approvedRecord.createTime || ''
})
}
@@ -66,7 +66,7 @@
steps.push({
status: '2',
title: '拒绝申请',
- person: rejectedRecord.createUser || '',
+ person: rejectedRecord.userName || '',
time: rejectedRecord.createTime || ''
})
// 查找拒绝原因
--
Gitblit v1.9.3