From d75b5048524369878e32448964d867c816a632f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 7 Aug 2021 21:15:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=85=A5=E5=BA=93=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E5=92=8C=E5=87=BA=E5=BA=93=E6=B1=87=E6=80=BB=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/components/jeecg/JUpload.vue      | 2 +-
 jshERP-web/src/views/report/InMaterialCount.vue  | 1 +
 jshERP-web/src/views/report/OutMaterialCount.vue | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jshERP-web/src/components/jeecg/JUpload.vue b/jshERP-web/src/components/jeecg/JUpload.vue
index 0e5aa8f7..f333fa00 100644
--- a/jshERP-web/src/components/jeecg/JUpload.vue
+++ b/jshERP-web/src/components/jeecg/JUpload.vue
@@ -212,7 +212,7 @@
         let fileList = [];
         let arr = paths.split(",")
         for(var a=0;a<arr.length;a++){
-          let url = getFileAccessHttpUrl(arr[a]);
+          let url = getFileAccessHttpUrl('systemConfig/static/' + arr[a]);
           fileList.push({
             uid:uidGenerator(),
             name:getFileName(arr[a]),
diff --git a/jshERP-web/src/views/report/InMaterialCount.vue b/jshERP-web/src/views/report/InMaterialCount.vue
index ac4e5e34..a5dcba89 100644
--- a/jshERP-web/src/views/report/InMaterialCount.vue
+++ b/jshERP-web/src/views/report/InMaterialCount.vue
@@ -128,6 +128,7 @@
           {title: '规格', dataIndex: 'standard', width: 100},
           {title: '型号', dataIndex: 'model', width: 100},
           {title: '类型', dataIndex: 'categoryName', width: 120},
+          {title: '单位', dataIndex: 'materialUnit', width: 120},
           {title: '入库数量', dataIndex: 'numSum', width: 120},
           {title: '入库金额', dataIndex: 'priceSum', width: 120}
         ],
diff --git a/jshERP-web/src/views/report/OutMaterialCount.vue b/jshERP-web/src/views/report/OutMaterialCount.vue
index df996a30..b8d3e09b 100644
--- a/jshERP-web/src/views/report/OutMaterialCount.vue
+++ b/jshERP-web/src/views/report/OutMaterialCount.vue
@@ -128,6 +128,7 @@
           {title: '规格', dataIndex: 'standard', width: 100},
           {title: '型号', dataIndex: 'model', width: 100},
           {title: '类型', dataIndex: 'categoryName', width: 120},
+          {title: '单位', dataIndex: 'materialUnit', width: 120},
           {title: '出库数量', dataIndex: 'numSum', width: 120},
           {title: '出库金额', dataIndex: 'priceSum', width: 120}
         ],