From cf2f8fd2d995c3122d9076afec3d24320a88e8e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 25 Jul 2023 00:22:45 +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=E5=8E=9F=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   |  4 +-
 .../src/views/bill/dialog/BillDetail.vue      | 56 +++++++++----------
 .../src/views/material/MaterialList.vue       |  4 +-
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
index d701d9e7..e03112f7 100644
--- a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
+++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
@@ -87,9 +87,9 @@
               {{record.mBarCode}}
               <a-popover placement="right" trigger="click">
                 <template slot="content">
-                  <img :src="getImgUrl(record.imgName, '')" width="500px" />
+                  <img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px" />
                 </template>
-                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgType)" style="cursor:pointer; max-width:40px; max-height:30px;" title="查看大图" />
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgSmall)" 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 2fce6f17..4761daea 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -79,8 +79,8 @@
                   :dataSource="dataSource">
                   <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, record.imgType)" class="material-img" />
+                      <template slot="content"><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px" /></template>
+                      <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgSmall)" class="material-img" />
                     </a-popover>
                   </template>
                 </a-table>
@@ -166,8 +166,8 @@
                   :dataSource="dataSource">
                   <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, record.imgType)" class="material-img" />
+                    <template slot="content"><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px" /></template>
+                    <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgSmall)" class="material-img" />
                   </a-popover>
                   </template>
                 </a-table>
@@ -244,8 +244,8 @@
               :dataSource="dataSource">
               <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, record.imgType)" class="material-img" />
+                  <template slot="content"><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px" /></template>
+                  <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgSmall)" class="material-img" />
                 </a-popover>
               </template>
             </a-table>
@@ -328,8 +328,8 @@
               :dataSource="dataSource">
               <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, record.imgType)" class="material-img" />
+                  <template slot="content"><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px" /></template>
+                  <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgSmall)" class="material-img" />
                 </a-popover>
               </template>
             </a-table>
@@ -440,8 +440,8 @@
               :dataSource="dataSource">
               <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, record.imgType)" class="material-img" />
+                <template slot="content"><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgSmall)" class="material-img" />
               </a-popover>
               </template>
             </a-table>
@@ -533,8 +533,8 @@
               :dataSource="dataSource">
               <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, record.imgType)" class="material-img" />
+                <template slot="content"><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgSmall)" class="material-img" />
               </a-popover>
               </template>
             </a-table>
@@ -617,8 +617,8 @@
               :dataSource="dataSource">
               <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, record.imgType)" class="material-img" />
+                <template slot="content"><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgSmall)" class="material-img" />
               </a-popover>
               </template>
             </a-table>
@@ -734,8 +734,8 @@
               :dataSource="dataSource">
               <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, record.imgType)" class="material-img" />
+                <template slot="content"><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgSmall)" class="material-img" />
               </a-popover>
               </template>
             </a-table>
@@ -830,8 +830,8 @@
               :dataSource="dataSource">
               <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, record.imgType)" class="material-img" />
+                <template slot="content"><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgSmall)" class="material-img" />
               </a-popover>
               </template>
             </a-table>
@@ -882,8 +882,8 @@
               :dataSource="dataSource">
               <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, record.imgType)" class="material-img" />
+                <template slot="content"><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgSmall)" class="material-img" />
               </a-popover>
               </template>
             </a-table>
@@ -925,8 +925,8 @@
               :dataSource="dataSource">
               <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, record.imgType)" class="material-img" />
+                <template slot="content"><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgSmall)" class="material-img" />
               </a-popover>
               </template>
             </a-table>
@@ -968,8 +968,8 @@
               :dataSource="dataSource">
               <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, record.imgType)" class="material-img" />
+                <template slot="content"><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgSmall)" class="material-img" />
               </a-popover>
               </template>
             </a-table>
@@ -1011,8 +1011,8 @@
               :dataSource="dataSource">
               <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, record.imgType)" class="material-img" />
+                <template slot="content"><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgSmall)" class="material-img" />
               </a-popover>
               </template>
             </a-table>
@@ -1058,8 +1058,8 @@
               :dataSource="dataSource">
               <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, record.imgType)" class="material-img" />
+                <template slot="content"><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px" /></template>
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgSmall)" 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 fa60e383..f23a1624 100644
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@@ -150,10 +150,10 @@
             <template slot="customPic" slot-scope="text, record">
               <a-popover placement="right" trigger="click">
                 <template slot="content">
-                  <img :src="getImgUrl(record.imgName, '')" width="500px" />
+                  <img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px" />
                 </template>
                 <div style="width:52px;height:52px;" v-if="record.imgName">
-                  <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgType)" class="item-img" title="查看大图" />
+                  <img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgSmall)" class="item-img" title="查看大图" />
                 </div>
               </a-popover>
             </template>