From 9d98db0eda1de8f5a2a8f1fb19bca6fb427b3409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 6 Jul 2023 00:01:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=95=86=E5=93=81=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E3=80=81=E5=8D=95=E6=8D=AE=E6=9F=A5=E7=9C=8B=E5=92=8C=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=BC=A9=E7=95=A5?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecgbiz/modal/JSelectMaterialModal.vue   | 11 +++-
 .../src/views/bill/dialog/BillDetail.vue      | 66 +++++++++++++++++--
 .../src/views/material/MaterialList.vue       | 18 +++--
 3 files changed, 81 insertions(+), 14 deletions(-)

diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
index a5044040..4b989084 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, '')" width="500px" />
                 </template>
-                <a-icon v-if="record.imgName" style="font-size: 18px" theme="twoTone" type="file-image" />
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" style="cursor:pointer; max-width:36px; max-height:27px;" title="查看大图" />
               </a-popover>
             </template>
             <template slot="customName" slot-scope="text, record">
@@ -307,6 +307,13 @@
           return ''
         }
       },
+      getImgMiniUrl(imgName) {
+        if(imgName && imgName.split(',')) {
+          return getFileAccessHttpUrl('systemConfig/static/mini/' + imgName.split(',')[0])
+        } else {
+          return ''
+        }
+      },
       close() {
         this.searchReset(0);
         this.visible = false;
diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index fe21a793..7f5a0856 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -77,6 +77,9 @@
                   :pagination="false"
                   :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" />
+                  </template>
                 </a-table>
               </div>
             </a-col>
@@ -158,6 +161,9 @@
                   :pagination="false"
                   :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" />
+                  </template>
                 </a-table>
               </div>
             </a-col>
@@ -230,6 +236,9 @@
               :pagination="false"
               :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" />
+              </template>
             </a-table>
           </div>
           <a-row class="form-row" :gutter="24">
@@ -308,6 +317,9 @@
               :pagination="false"
               :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" />
+              </template>
             </a-table>
           </div>
           <a-row class="form-row" :gutter="24">
@@ -414,6 +426,9 @@
               :pagination="false"
               :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" />
+              </template>
             </a-table>
           </div>
           <a-row class="form-row" :gutter="24">
@@ -501,6 +516,9 @@
               :pagination="false"
               :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" />
+              </template>
             </a-table>
           </div>
           <a-row class="form-row" :gutter="24">
@@ -579,6 +597,9 @@
               :pagination="false"
               :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" />
+              </template>
             </a-table>
           </div>
           <a-row class="form-row" :gutter="24">
@@ -690,6 +711,9 @@
               :pagination="false"
               :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" />
+              </template>
             </a-table>
           </div>
           <a-row class="form-row" :gutter="24">
@@ -780,6 +804,9 @@
               :pagination="false"
               :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" />
+              </template>
             </a-table>
           </div>
           <a-row class="form-row" :gutter="24">
@@ -826,6 +853,9 @@
               :pagination="false"
               :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" />
+              </template>
             </a-table>
           </div>
           <a-row class="form-row" :gutter="24">
@@ -863,6 +893,9 @@
               :pagination="false"
               :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" />
+              </template>
             </a-table>
           </div>
           <a-row class="form-row" :gutter="24">
@@ -900,6 +933,9 @@
               :pagination="false"
               :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" />
+              </template>
             </a-table>
           </div>
           <a-row class="form-row" :gutter="24">
@@ -937,6 +973,9 @@
               :pagination="false"
               :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" />
+              </template>
             </a-table>
           </div>
           <a-row class="form-row" :gutter="24">
@@ -978,6 +1017,9 @@
               :pagination="false"
               :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" />
+              </template>
             </a-table>
           </div>
           <a-row class="form-row" :gutter="24">
@@ -1007,7 +1049,7 @@
 
 <script>
   import pick from 'lodash.pick'
-  import { getAction, postAction } from '@/api/manage'
+  import { getAction, postAction, getFileAccessHttpUrl } from '@/api/manage'
   import { findBillDetailByNumber, findFinancialDetailByNumber, getPlatformConfigByKey, getCurrentSystemConfig} from '@/api/api'
   import { getMpListShort, getCheckFlag, openDownloadDialog, sheet2blob } from "@/utils/util"
   import BillPrintIframe from './BillPrintIframe'
@@ -1411,10 +1453,12 @@
             let info = {}
             info.title = this.defColumns[i].title
             info.dataIndex = this.defColumns[i].dataIndex
-            info.width = this.defColumns[i].width
             if(this.defColumns[i].dataIndex === 'finishNumber') {
               info.title = '已采购'
             }
+            if(this.defColumns[i].dataIndex === 'barCode') {
+              info.scopedSlots = { customRender: 'customBarCode' }
+            }
             currentCol.push(info)
           }
           this.columns = currentCol
@@ -1427,7 +1471,9 @@
               let info = {}
               info.title = this.defColumns[i].title
               info.dataIndex = this.defColumns[i].dataIndex
-              info.width = this.defColumns[i].width
+              if(this.defColumns[i].dataIndex === 'barCode') {
+                info.scopedSlots = { customRender: 'customBarCode' }
+              }
               currentCol.push(info)
             }
             //添加有数据的列
@@ -1435,7 +1481,6 @@
               let info = {}
               info.title = this.defColumns[i].title
               info.dataIndex = this.defColumns[i].dataIndex
-              info.width = this.defColumns[i].width
               currentCol.push(info)
             }
           }
@@ -1580,6 +1625,14 @@
           }
         })
       },
+      getImgUrl(imgName, type) {
+        if(imgName && imgName.split(',')) {
+          type = type? type + '/':''
+          return getFileAccessHttpUrl('systemConfig/static/' + type + imgName.split(',')[0])
+        } else {
+          return ''
+        }
+      },
       //三联打印预览
       handlePrint() {
         getPlatformConfigByKey({"platformKey": "bill_print_url"}).then((res)=> {
@@ -1715,5 +1768,8 @@
 </script>
 
 <style scoped>
-
+ .material-img{
+   max-width:36px;
+   max-height:27px;
+ }
 </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 a2a2b561..e0c418ec 100644
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@@ -147,15 +147,17 @@
                 <a>删除</a>
               </a-popconfirm>
             </span>
-            <template slot="customBarCode" slot-scope="text, record">
-              {{record.mBarCode}}
+            <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, '')" width="500px" />
                 </template>
-                <a-icon v-if="record.imgName" style="font-size: 18px" theme="twoTone" type="file-image" />
+                <img v-if="record.imgName" :src="getImgUrl(record.imgName, 'mini')" style="cursor:pointer; max-width:36px; max-height:27px;" title="查看大图" />
               </a-popover>
             </template>
+            <template slot="customBarCode" slot-scope="text, record">
+              {{record.mBarCode}}
+            </template>
             <template slot="customName" slot-scope="text, record">
               {{record.name}}
               <a-tag v-if="record.enableSerialNumber==1" color="orange">序</a-tag>
@@ -247,7 +249,8 @@
             width: 100,
             scopedSlots: { customRender: 'action' },
           },
-          {title: '条码', dataIndex: 'mBarCode', width: 160, scopedSlots: { customRender: 'customBarCode' }},
+          {title: '图片', dataIndex: 'pic', width: 45, scopedSlots: { customRender: 'customPic' }},
+          {title: '条码', dataIndex: 'mBarCode', width: 120},
           {title: '名称', dataIndex: 'name', width: 160, scopedSlots: { customRender: 'customName' }},
           {title: '规格', dataIndex: 'standard', width: 120},
           {title: '型号', dataIndex: 'model', width: 120},
@@ -390,9 +393,10 @@
           this.$refs.modalForm.showOkFlag = false
         }
       },
-      getImgUrl(imgName) {
+      getImgUrl(imgName, type) {
         if(imgName && imgName.split(',')) {
-          return getFileAccessHttpUrl('systemConfig/static/' + imgName.split(',')[0])
+          type = type? type + '/':''
+          return getFileAccessHttpUrl('systemConfig/static/' + type + imgName.split(',')[0])
         } else {
           return ''
         }