From 4f80f62126754d8e317ccef15170a2fc97b34635 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 24 Jul 2023 23:27:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=95=86=E5=93=81=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E7=9A=84=E7=BC=A9=E7=95=A5=E5=9B=BE=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
index 7e7fdfd4..d701d9e7 100644
--- a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
+++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
@@ -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:40px; max-height:30px;" title="查看大图" />
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgType)" 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 f422b215..2fce6f17 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -80,7 +80,7 @@
                   <template slot="customBarCode" slot-scope="text, record">
                     {{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" />
+                      <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgType)" class="material-img" />
                     </a-popover>
                   </template>
                 </a-table>
@@ -167,7 +167,7 @@
                   <template slot="customBarCode" slot-scope="text, record">
                     {{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" />
+                    <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgType)" class="material-img" />
                   </a-popover>
                   </template>
                 </a-table>
@@ -245,7 +245,7 @@
               <template slot="customBarCode" slot-scope="text, record">
                 {{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" />
+                  <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgType)" class="material-img" />
                 </a-popover>
               </template>
             </a-table>
@@ -329,7 +329,7 @@
               <template slot="customBarCode" slot-scope="text, record">
                 {{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" />
+                  <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgType)" class="material-img" />
                 </a-popover>
               </template>
             </a-table>
@@ -441,7 +441,7 @@
               <template slot="customBarCode" slot-scope="text, record">
                 {{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" />
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgType)" class="material-img" />
               </a-popover>
               </template>
             </a-table>
@@ -534,7 +534,7 @@
               <template slot="customBarCode" slot-scope="text, record">
                 {{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" />
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgType)" class="material-img" />
               </a-popover>
               </template>
             </a-table>
@@ -618,7 +618,7 @@
               <template slot="customBarCode" slot-scope="text, record">
                 {{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" />
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgType)" class="material-img" />
               </a-popover>
               </template>
             </a-table>
@@ -735,7 +735,7 @@
               <template slot="customBarCode" slot-scope="text, record">
                 {{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" />
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgType)" class="material-img" />
               </a-popover>
               </template>
             </a-table>
@@ -831,7 +831,7 @@
               <template slot="customBarCode" slot-scope="text, record">
                 {{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" />
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgType)" class="material-img" />
               </a-popover>
               </template>
             </a-table>
@@ -883,7 +883,7 @@
               <template slot="customBarCode" slot-scope="text, record">
                 {{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" />
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgType)" class="material-img" />
               </a-popover>
               </template>
             </a-table>
@@ -926,7 +926,7 @@
               <template slot="customBarCode" slot-scope="text, record">
                 {{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" />
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgType)" class="material-img" />
               </a-popover>
               </template>
             </a-table>
@@ -969,7 +969,7 @@
               <template slot="customBarCode" slot-scope="text, record">
                 {{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" />
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgType)" class="material-img" />
               </a-popover>
               </template>
             </a-table>
@@ -1012,7 +1012,7 @@
               <template slot="customBarCode" slot-scope="text, record">
                 {{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" />
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgType)" class="material-img" />
               </a-popover>
               </template>
             </a-table>
@@ -1059,7 +1059,7 @@
               <template slot="customBarCode" slot-scope="text, record">
                 {{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" />
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgType)" class="material-img" />
               </a-popover>
               </template>
             </a-table>
diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue
index 54de937d..fa60e383 100644
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@@ -153,7 +153,7 @@
                   <img :src="getImgUrl(record.imgName, '')" width="500px" />
                 </template>
                 <div style="width:52px;height:52px;" v-if="record.imgName">
-                  <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" class="item-img" title="查看大图" />
+                  <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgType)" class="item-img" title="查看大图" />
                 </div>
               </a-popover>
             </template>