From ca875f8cb622053fb5947925ccc462f1aec3b3d1 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Mon, 27 Apr 2026 10:12:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E5=9B=BE=E7=89=87=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E6=97=8B=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assetManage/inventory/index.vue   | 32 +++++++++++++++++++--
 src/views/assetManage/stocktaking/index.vue |  4 +--
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/views/assetManage/inventory/index.vue b/src/views/assetManage/inventory/index.vue
index 4b355e8..26e54e6 100644
--- a/src/views/assetManage/inventory/index.vue
+++ b/src/views/assetManage/inventory/index.vue
@@ -129,13 +129,19 @@
             <div class="asset-image-wrapper">
               <div v-if="assetImageList.length > 0" class="asset-image-scroll">
                 <div v-for="(item, index) in assetImageList" :key="item.id || index" class="image-item">
-                  <img :src="item.imgUrl" alt="资产图片" class="preview-img">
+                  <!-- <img :src="item.imgUrl" alt="资产图片" class="preview-img" @click="openPreview(item.imgUrl)" > -->
+                  <el-image
+                    class="preview-img"
+                    :src="item.imgUrl"
+                    fit="contain"
+                    :preview-src-list="assetImageList.map(img => img.imgUrl)"
+                    :preview-initial-index="index"
+                  />
                   <div class="delete-btn" @click="deleteAssetImage(item.id, index)">
                     <i class="el-icon-close" />
                   </div>
                 </div>
               </div>
-
               <div v-else class="default-img">
                 <img :src="require('@/assets/images/system/default-img2.png')" alt="默认图片">
               </div>
@@ -144,6 +150,7 @@
         </div>
       </div>
     </el-dialog>
+
   </div>
 </template>
 
@@ -615,4 +622,25 @@ export default {
     margin-top: 30px;
   }
 }
+
+.preview-dialog{
+   ::v-deep .el-dialog {
+    width: 1300px !important;
+    .el-dialog__body{
+      padding: 10px 0 30px 0 !important;
+    }
+    // .preview-content{
+    //   height: calc(100vh - 330px) !important;
+    //   overflow: hidden !important;
+    //   overflow-y: auto !important;
+    //   border: none !important;
+    //   .el-form-item__label{
+    //     color: #0C0E1E !important;
+    //   }
+    // }
+    // .dialog-footer{
+    //   margin-top: 10px !important;
+    // }
+  }
+}
 </style>
diff --git a/src/views/assetManage/stocktaking/index.vue b/src/views/assetManage/stocktaking/index.vue
index 6dcbe93..6f5b800 100644
--- a/src/views/assetManage/stocktaking/index.vue
+++ b/src/views/assetManage/stocktaking/index.vue
@@ -279,10 +279,10 @@
             <el-table-column prop="capitalStatus" label="资产状态" min-width="100px" />
             <el-table-column prop="capitaltypename" label="资产类型" min-width="100px" />
             <el-table-column prop="departmentname" label="使用部门" min-width="260px" :show-overflow-tooltip="true" />
-            <el-table-column prop="resourcename" label="使用人" min-width="100px" />
+            <el-table-column prop="resourcename" label="使用人" min-width="100px" :show-overflow-tooltip="true" />
             <!-- <el-table-column prop="blongsubcompanyname" label="所属单位" min-width="180px" :show-overflow-tooltip="true" />
             <el-table-column prop="blongdepartmentname" label="所属部门" min-width="180px" :show-overflow-tooltip="true" /> -->
-            <el-table-column prop="glrname" label="管理人" min-width="100px" />
+            <el-table-column prop="glrname" label="管理人" min-width="100px" :show-overflow-tooltip="true" />
             <el-table-column prop="cfd" label="存放地" min-width="260px" :show-overflow-tooltip="true" />
           </el-table>
           <div style="margin-top: 10px; display: flex; justify-content: flex-end;">