From 06ca842a5219511302497d0a87be4293ae7cb7a0 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 17 四月 2025 23:10:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/resourceDemand/device/component/files.vue | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/files.vue b/src/views/CNAS/resourceDemand/device/component/files.vue
index de19de7..3a96e5a 100644
--- a/src/views/CNAS/resourceDemand/device/component/files.vue
+++ b/src/views/CNAS/resourceDemand/device/component/files.vue
@@ -25,7 +25,7 @@
<el-col :span="8">
<div class="form-item">
<label>璁惧鍚嶇О</label>
- <!-- <p>{{ Mdata.deviceName }}</p> -->
+<!-- <p>{{ Mdata.deviceName }}</p> -->
<el-tooltip class="item" :content="Mdata.deviceName">
<span class="text-ellipsis">{{ Mdata.deviceName }}</span>
</el-tooltip>
@@ -170,9 +170,9 @@
<el-table-column prop="quantity" label="浠芥暟" min-width="80" />
<el-table-column prop="pageCount" label="椤电爜" min-width="80" />
<el-table-column prop="provider" label="鎻愪緵鑰�" min-width="150" />
- <el-table-column prop="provideDate" label="褰掓。鏃ユ湡" min-width="150" />
+ <el-table-column prop="provideDate" label="褰掓。鏃ユ湡" min-width="170" />
<el-table-column prop="comments" label="澶囨敞" min-width="150" />
- <el-table-column fixed="right" label="鎿嶄綔" min-width="180">
+ <el-table-column fixed="right" label="鎿嶄綔" min-width="180" align="center">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleAttachmentClick(scope.row)">涓嬭浇闄勪欢</el-button>
<el-button type="text" size="small" @click="handleViewClick(scope.row)">缂栬緫</el-button>
@@ -914,7 +914,6 @@
.page-header {
display: flex;
justify-content: space-between;
- margin-top: 10px;
}
h4 {
--
Gitblit v1.9.3