From 2d35ab113c47311087a8e96ba0351c25be80a24b Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Fri, 10 Sep 2021 19:00:54 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E6=89=93=E5=8C=85=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=88=B0=E8=B4=A6?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=94=B6=E5=85=A5?= =?UTF-8?q?=E5=90=88=E5=90=8C=E5=85=B3=E8=81=94=E5=B7=A5=E4=BD=9C=E7=BB=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A0=E5=90=88=E5=90=8Cid=EF=BC=8C?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/jero/JImageUpload.vue | 53 +++++++++++++++---- .../modules/RevenueContractModule.vue | 4 +- .../modules/ArriveStageModule.vue | 2 +- .../modules/InvoicingStageModule.vue | 2 +- src/views/packManagement/PackCompanyList.vue | 12 ++--- .../modules/PackCompanyModule.vue | 4 +- 6 files changed, 53 insertions(+), 24 deletions(-) diff --git a/src/components/jero/JImageUpload.vue b/src/components/jero/JImageUpload.vue index 159f5bf..77e6667 100644 --- a/src/components/jero/JImageUpload.vue +++ b/src/components/jero/JImageUpload.vue @@ -103,7 +103,8 @@ }, watch:{ value: { - handler(val) { + handler() { + let val = this.value if (val instanceof Array) { this.initFileList(val.join(',')) } else { @@ -122,25 +123,57 @@ this.headers = {'X-Access-Token':token} }, methods:{ - initFileList(paths){ + async initFileList(paths){ if(!paths || paths.length === 0){ this.fileList = [] return } this.picUrl = true let arr = paths.split(',') - console.log(this.fileList) + let fileList = [] for(var a=0;a{ - if(this.returnId){ - item.url = this.getImgUrl(item.response.result.id,item.name) - } - if (item.url === arr[a]){ - item.uid = uidGenerator() - item.response.status = 'history' + // 通过文件id获取文件信息 + const fileObj = await this.getFileInfo(arr[a]) + // 获取图片路径 + const url = getFileAccessHttpUrl(fileObj.url) + fileList.push({ + uid: uidGenerator(), + name: (fileObj || {}).fileName, + status: 'done', + url: url, + response: { + status: 'history', + message: arr[a], + result: fileObj } }) } + this.fileList = [...fileList] + this.fileList.forEach((item)=>{ + if(this.returnId){ + item.url = this.getImgUrl(item.response.result.id,item.name) + } + if (item.url === arr[a]){ + item.uid = uidGenerator() + item.response.status = 'history' + } + }) + }, + /** + * 通过文件的id获取文件的相关信息 + * @param id + */ + getFileInfo(id) { + return new Promise(resolve => { + let result = {} + getFileInfo({id: id}).then(res => { + if (res.success) { + result = res.result + } + }).finally(() => { + resolve(result) + }) + }) }, beforeUpload: function(file){ var fileType = file.type diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index e04be77..cef2e65 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -733,7 +733,9 @@ export default { // 工作组项目 case 2: this.$refs.selectWorkingGroupProjectModule.filters = { - companyId: this.selectedCompany.id + companyId: this.selectedCompany.id, + + contractId: this.contractId } this.$refs.selectWorkingGroupProjectModule.open() break diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue index 27acd50..f84fe75 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue @@ -67,7 +67,7 @@ export default { data() { return { title: '来款阶段', - width: 800, + width: 900, visible: false, confirmLoading: false, form: this.$form.createForm(this), diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue index f27388c..bdde141 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue @@ -83,7 +83,7 @@ export default { data() { return { title: '开票阶段', - width: 800, + width: 900, visible: false, confirmLoading: false, form: this.$form.createForm(this), diff --git a/src/views/packManagement/PackCompanyList.vue b/src/views/packManagement/PackCompanyList.vue index 0d0166e..45a9d6a 100644 --- a/src/views/packManagement/PackCompanyList.vue +++ b/src/views/packManagement/PackCompanyList.vue @@ -146,16 +146,10 @@ export default { scopedSlots: { customRender: 'action' } } ], - dataSource: [ - { - id: 1, - companyTemporaryName: '企业名称' - } - ], url: { - list: '', - delete: '', - deleteBatch: '', + list: '/pack/payPackCompany/list', + delete: '/pack/payPackCompany/delete', + deleteBatch: '/pack/payPackCompany/deleteBatch', exportXlsUrl: '' } } diff --git a/src/views/packManagement/modules/PackCompanyModule.vue b/src/views/packManagement/modules/PackCompanyModule.vue index 033dd95..aca625b 100644 --- a/src/views/packManagement/modules/PackCompanyModule.vue +++ b/src/views/packManagement/modules/PackCompanyModule.vue @@ -126,8 +126,8 @@ export default { sm: { span: 20 } }, url: { - add: '', - edit: '' + add: '/pack/payPackCompany/add', + edit: '/pack/payPackCompany/edit' }, selectedCompany: null, validatorRules: {