From 48bdbf8dfd4a4699d5be217de44475ca0aaad2d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 7 Jul 2023 20:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=8A=82=E7=BC=A9=E7=95=A5=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E7=9A=84=E5=B0=BA=E5=AF=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecgbiz/modal/JSelectMaterialModal.vue   |  4 +-
 .../src/views/bill/dialog/BillDetail.vue      | 74 +++++++++++++++----
 .../src/views/material/MaterialList.vue       | 16 +++-
 3 files changed, 74 insertions(+), 20 deletions(-)

diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
index 8215ca3d..7e7fdfd4 100644
--- a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
+++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
@@ -7,7 +7,7 @@
     @ok="handleSubmit"
     @cancel="close"
     cancelText="关闭(ESC)"
-    style="top:5%;height: 90%;overflow-y: hidden"
+    style="top:20px;height: 95%;"
   >
     <a-row :gutter="10" style="padding: 10px; margin: -10px">
       <a-col :md="24" :sm="24">
@@ -89,7 +89,7 @@
                 <template slot="content">
                   <img :src="getImgUrl(record.imgName, '')" width="500px" />
                 </template>
-                <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" style="cursor:pointer; max-width:36px; max-height:27px;" title="查看大图" />
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" style="cursor:pointer; max-width:40px; max-height:30px;" title="查看大图" />
               </a-popover>
             </template>
             <template slot="customName" slot-scope="text, record">
diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index 7f5a0856..f422b215 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -78,7 +78,10 @@
                   :columns="columns"
                   :dataSource="dataSource">
                   <template slot="customBarCode" slot-scope="text, record">
-                    {{record.barCode}} <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+                    {{record.barCode}} <a-popover placement="right" trigger="click">
+                      <template slot="content"><img :src="getImgUrl(record.imgName, '')" width="500px" /></template>
+                      <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+                    </a-popover>
                   </template>
                 </a-table>
               </div>
@@ -162,7 +165,10 @@
                   :columns="columns"
                   :dataSource="dataSource">
                   <template slot="customBarCode" slot-scope="text, record">
-                    {{record.barCode}} <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+                    {{record.barCode}} <a-popover placement="right" trigger="click">
+                    <template slot="content"><img :src="getImgUrl(record.imgName, '')" width="500px" /></template>
+                    <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+                  </a-popover>
                   </template>
                 </a-table>
               </div>
@@ -237,7 +243,10 @@
               :columns="columns"
               :dataSource="dataSource">
               <template slot="customBarCode" slot-scope="text, record">
-                {{record.barCode}} <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+                {{record.barCode}} <a-popover placement="right" trigger="click">
+                  <template slot="content"><img :src="getImgUrl(record.imgName, '')" width="500px" /></template>
+                  <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+                </a-popover>
               </template>
             </a-table>
           </div>
@@ -318,7 +327,10 @@
               :columns="columns"
               :dataSource="dataSource">
               <template slot="customBarCode" slot-scope="text, record">
-                {{record.barCode}} <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+                {{record.barCode}} <a-popover placement="right" trigger="click">
+                  <template slot="content"><img :src="getImgUrl(record.imgName, '')" width="500px" /></template>
+                  <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+                </a-popover>
               </template>
             </a-table>
           </div>
@@ -427,7 +439,10 @@
               :columns="columns"
               :dataSource="dataSource">
               <template slot="customBarCode" slot-scope="text, record">
-                {{record.barCode}} <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+                {{record.barCode}} <a-popover placement="right" trigger="click">
+                <template slot="content"><img :src="getImgUrl(record.imgName, '')" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+              </a-popover>
               </template>
             </a-table>
           </div>
@@ -517,7 +532,10 @@
               :columns="columns"
               :dataSource="dataSource">
               <template slot="customBarCode" slot-scope="text, record">
-                {{record.barCode}} <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+                {{record.barCode}} <a-popover placement="right" trigger="click">
+                <template slot="content"><img :src="getImgUrl(record.imgName, '')" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+              </a-popover>
               </template>
             </a-table>
           </div>
@@ -598,7 +616,10 @@
               :columns="columns"
               :dataSource="dataSource">
               <template slot="customBarCode" slot-scope="text, record">
-                {{record.barCode}} <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+                {{record.barCode}} <a-popover placement="right" trigger="click">
+                <template slot="content"><img :src="getImgUrl(record.imgName, '')" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+              </a-popover>
               </template>
             </a-table>
           </div>
@@ -712,7 +733,10 @@
               :columns="columns"
               :dataSource="dataSource">
               <template slot="customBarCode" slot-scope="text, record">
-                {{record.barCode}} <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+                {{record.barCode}} <a-popover placement="right" trigger="click">
+                <template slot="content"><img :src="getImgUrl(record.imgName, '')" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+              </a-popover>
               </template>
             </a-table>
           </div>
@@ -805,7 +829,10 @@
               :columns="columns"
               :dataSource="dataSource">
               <template slot="customBarCode" slot-scope="text, record">
-                {{record.barCode}} <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+                {{record.barCode}} <a-popover placement="right" trigger="click">
+                <template slot="content"><img :src="getImgUrl(record.imgName, '')" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+              </a-popover>
               </template>
             </a-table>
           </div>
@@ -854,7 +881,10 @@
               :columns="columns"
               :dataSource="dataSource">
               <template slot="customBarCode" slot-scope="text, record">
-                {{record.barCode}} <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+                {{record.barCode}} <a-popover placement="right" trigger="click">
+                <template slot="content"><img :src="getImgUrl(record.imgName, '')" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+              </a-popover>
               </template>
             </a-table>
           </div>
@@ -894,7 +924,10 @@
               :columns="columns"
               :dataSource="dataSource">
               <template slot="customBarCode" slot-scope="text, record">
-                {{record.barCode}} <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+                {{record.barCode}} <a-popover placement="right" trigger="click">
+                <template slot="content"><img :src="getImgUrl(record.imgName, '')" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+              </a-popover>
               </template>
             </a-table>
           </div>
@@ -934,7 +967,10 @@
               :columns="columns"
               :dataSource="dataSource">
               <template slot="customBarCode" slot-scope="text, record">
-                {{record.barCode}} <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+                {{record.barCode}} <a-popover placement="right" trigger="click">
+                <template slot="content"><img :src="getImgUrl(record.imgName, '')" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+              </a-popover>
               </template>
             </a-table>
           </div>
@@ -974,7 +1010,10 @@
               :columns="columns"
               :dataSource="dataSource">
               <template slot="customBarCode" slot-scope="text, record">
-                {{record.barCode}} <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+                {{record.barCode}} <a-popover placement="right" trigger="click">
+                <template slot="content"><img :src="getImgUrl(record.imgName, '')" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+              </a-popover>
               </template>
             </a-table>
           </div>
@@ -1018,7 +1057,10 @@
               :columns="columns"
               :dataSource="dataSource">
               <template slot="customBarCode" slot-scope="text, record">
-                {{record.barCode}} <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+                {{record.barCode}} <a-popover placement="right" trigger="click">
+                <template slot="content"><img :src="getImgUrl(record.imgName, '')" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="material-img" />
+              </a-popover>
               </template>
             </a-table>
           </div>
@@ -1769,7 +1811,7 @@
 
 <style scoped>
  .material-img{
-   max-width:36px;
-   max-height:27px;
+   max-width:40px;
+   max-height:30px;
  }
 </style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue
index e0c418ec..b0795d97 100644
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@@ -152,7 +152,9 @@
                 <template slot="content">
                   <img :src="getImgUrl(record.imgName, '')" width="500px" />
                 </template>
-                <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" style="cursor:pointer; max-width:36px; max-height:27px;" title="查看大图" />
+                <div style="width:52px;height:52px;" v-if="record.imgName">
+                  <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="item-img" title="查看大图" />
+                </div>
               </a-popover>
             </template>
             <template slot="customBarCode" slot-scope="text, record">
@@ -249,7 +251,7 @@
             width: 100,
             scopedSlots: { customRender: 'action' },
           },
-          {title: '图片', dataIndex: 'pic', width: 45, scopedSlots: { customRender: 'customPic' }},
+          {title: '图片', dataIndex: 'pic', width: 65, scopedSlots: { customRender: 'customPic' }},
           {title: '条码', dataIndex: 'mBarCode', width: 120},
           {title: '名称', dataIndex: 'name', width: 160, scopedSlots: { customRender: 'customName' }},
           {title: '规格', dataIndex: 'standard', width: 120},
@@ -419,4 +421,14 @@
 </script>
 <style scoped>
   @import '~@assets/less/common.less'
+</style>
+<style>
+  .item-img {
+    cursor:pointer;
+    position: static;
+    display: block;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+  }
 </style>
\ No newline at end of file