From 84226527dbf4da0f8756994754b4b320e01b573b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 5 Sep 2021 22:36:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=8F=AF=E4=BB=A5=E5=9C=A8=E7=BA=BF=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/dialog/BillDetail.vue      | 27 +++++--------------
 .../financial/dialog/FinancialDetail.vue      | 26 +++++-------------
 2 files changed, 13 insertions(+), 40 deletions(-)

diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index d7f4f6ca..214e72d7 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -821,15 +821,11 @@
               </a-row>
             </section>
           </template>
-          <template v-if="fileList.length>0">
+          <template v-if="fileList && fileList.length>0">
             <a-row class="form-row" :gutter="24">
               <a-col :span="10">
                 <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 3 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 21 }}" label="附件">
-                  <ul style="list-style-type:none">
-                    <li v-for="(item,index) in fileList" :key="index">
-                      <a :href="item.url" target="_blank">{{item.name}}</a>
-                    </li>
-                  </ul>
+                  <j-upload v-model="fileList" bizPath="bill" :disabled="true" :buttonVisible="false"></j-upload>
                 </a-form-item>
               </a-col>
               <a-col :span="14"></a-col>
@@ -845,9 +841,13 @@
   import { getAction } from '@/api/manage'
   import { findBillDetailByNumber} from '@/api/api'
   import { getMpListShort } from "@/utils/util"
+  import JUpload from '@/components/jeecg/JUpload'
   import Vue from 'vue'
   export default {
     name: 'BillDetail',
+    components: {
+      JUpload
+    },
     data () {
       return {
         title: "详情",
@@ -1098,20 +1098,7 @@
       show(record, type) {
         this.billType = type
         //附件下载
-        let fileName = record.fileName
-        if(fileName) {
-          let fileArr = fileName.split(",")
-          this.fileList = []
-          for(let i=0; i<fileArr.length; i++) {
-            let fileInfo = {}
-            let shortName = fileArr[i].replace("bill/","")
-            fileInfo.name= shortName.substring(shortName.indexOf('/')+1)
-            fileInfo.url= window._CONFIG['domianURL'] + '/systemConfig/static/' + fileArr[i]
-            this.fileList.push(fileInfo)
-          }
-        } else {
-          this.fileList = []
-        }
+        this.fileList = record.fileName
         this.visible = true;
         this.model = Object.assign({}, record);
         this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2)
diff --git a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
index d82f144d..b308d813 100644
--- a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
+++ b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
@@ -385,15 +385,11 @@
             </a-row>
           </section>
         </template>
-        <template v-if="fileList.length>0">
+        <template v-if="fileList && fileList.length>0">
           <a-row class="form-row" :gutter="24">
             <a-col :span="12">
               <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 3 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 21 }}" label="附件">
-                <ul style="list-style-type:none">
-                  <li v-for="(item,index) in fileList" :key="index">
-                    <a :href="item.url" target="_blank">{{item.name}}</a>
-                  </li>
-                </ul>
+                <j-upload v-model="fileList" bizPath="bill" :disabled="true" :buttonVisible="false"></j-upload>
               </a-form-item>
             </a-col>
             <a-col :span="12"></a-col>
@@ -410,10 +406,12 @@
   import BillDetail from '../../bill/dialog/BillDetail'
   import { getAction } from '@/api/manage'
   import { findBillDetailByNumber} from '@/api/api'
+  import JUpload from '@/components/jeecg/JUpload'
   export default {
     name: 'FinancialDetail',
     components: {
-      BillDetail
+      BillDetail,
+      JUpload
     },
     data () {
       return {
@@ -482,19 +480,7 @@
       show(record, type) {
         this.financialType = type
         //附件下载
-        let fileName = record.fileName
-        if(fileName) {
-          let fileArr = fileName.split(",")
-          this.fileList = []
-          for(let i=0; i<fileArr.length; i++) {
-            let fileInfo = {}
-            fileInfo.name= fileArr[i].replace("financial/","")
-            fileInfo.url= window._CONFIG['domianURL'] + '/systemConfig/static/' + fileArr[i]
-            this.fileList.push(fileInfo)
-          }
-        } else {
-          this.fileList = []
-        }
+        this.fileList = record.fileName
         this.visible = true;
         this.model = Object.assign({}, record);
         this.$nextTick(() => {