From da693deebd8df149e3d672df99ea9fd5c01ba152 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Tue, 8 Oct 2024 23:09:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E7=9A=84=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/material/MaterialList.vue | 10 ++++++++--
 jshERP-web/src/views/report/MaterialStock.vue  | 14 ++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue
index 95bce8657..5a3efa77c 100644
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@@ -171,7 +171,7 @@
                 <template slot="content">
                   <img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px" />
                 </template>
-                <div style="width:52px;height:52px;" v-if="record.imgName">
+                <div class="item-info" v-if="record.imgName">
                   <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgSmall)" class="item-img" title="查看大图" />
                 </div>
               </a-popover>
@@ -276,7 +276,7 @@
             width: 100,
             scopedSlots: { customRender: 'action' },
           },
-          {title: '图片', dataIndex: 'pic', width: 65, scopedSlots: { customRender: 'customPic' }},
+          {title: '图片', dataIndex: 'pic', width: 60, scopedSlots: { customRender: 'customPic' }},
           {title: '条码', dataIndex: 'mBarCode', width: 120},
           {title: '名称', dataIndex: 'name', width: 160, scopedSlots: { customRender: 'customName' }},
           {title: '规格', dataIndex: 'standard', width: 120},
@@ -486,6 +486,12 @@
   @import '~@assets/less/common.less'
 </style>
 <style>
+  .item-info {
+    float:left;
+    width:38px;
+    height:38px;
+    margin-left:6px
+  }
   .item-img {
     cursor:pointer;
     position: static;
diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue
index f78856d2c..ecb861f43 100644
--- a/jshERP-web/src/views/report/MaterialStock.vue
+++ b/jshERP-web/src/views/report/MaterialStock.vue
@@ -110,8 +110,7 @@
             <span slot="action" slot-scope="text, record">
               <a @click="showMaterialInOutList(record)">{{record.id?'流水':''}}</a>
             </span>
-            <template slot="customBarCode" slot-scope="text, record">
-              <div :style="record.imgName?'float:left;line-height:30px':'float:left;'">{{record.mBarCode}}</div>
+            <template slot="customPic" slot-scope="text, record">
               <a-popover placement="right" trigger="click">
                 <template slot="content">
                   <img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px" />
@@ -209,9 +208,8 @@
           {title: '库存流水', dataIndex: 'action', align:"center", width: 60,
             scopedSlots: { customRender: 'action' }
           },
-          {title: '条码', dataIndex: 'mBarCode', width: 100, sorter: (a, b) => a.mBarCode - b.mBarCode,
-            scopedSlots: { customRender: 'customBarCode' }
-          },
+          {title: '图片', dataIndex: 'pic', width: 40, scopedSlots: { customRender: 'customPic' }},
+          {title: '条码', dataIndex: 'mBarCode', width: 100, sorter: (a, b) => a.mBarCode - b.mBarCode},
           {title: '名称', dataIndex: 'name', width: 140, ellipsis:true},
           {title: '规格', dataIndex: 'standard', width: 100, ellipsis:true},
           {title: '型号', dataIndex: 'model', width: 100, ellipsis:true},
@@ -339,9 +337,9 @@
 <style scoped>
   .item-info {
     float:left;
-    width:30px;
-    height:30px;
-    margin-left:8px
+    width:38px;
+    height:38px;
+    margin-left:6px
   }
   .item-img {
     cursor:pointer;