From dbe1b807e2a0e4aaa37277b69c50dd69dc42dda2 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期日, 25 六月 2023 10:34:36 +0800 Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs --- Source/UBCS-WEB/src/components/file/main.vue | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Source/UBCS-WEB/src/components/file/main.vue b/Source/UBCS-WEB/src/components/file/main.vue index f4021d0..9e5a099 100644 --- a/Source/UBCS-WEB/src/components/file/main.vue +++ b/Source/UBCS-WEB/src/components/file/main.vue @@ -353,17 +353,13 @@ done(); }, uploadAfter(res, done, loading, column) { - if(res.success){ - this.attachBox = false; - this.$message.success('鏂囦欢涓婁紶鎴愬姛') - }else{ - this.$message.error(res.msg); - } + this.attachBox = false; + this.$message.success('鏂囦欢涓婁紶鎴愬姛') this.refreshChange(); done(); }, uploadError(error, column) { - this.$message.error('涓婁紶鏂囦欢鍑虹幇浜嗗紓甯�') + this.$message.error(error || '涓婁紶鏂囦欢鍑虹幇浜嗗紓甯�') }, handleDownload(row) { //window.open(`${row.link}`); @@ -384,7 +380,7 @@ type: "warning" }) .then(() => { - return remove(row.oid); + return remove(row.oid,row.oid); }) .then(() => { this.onLoad(this.page); @@ -405,7 +401,7 @@ type: "warning" }) .then(() => { - return remove(this.oids); + return remove(this.oids,this.oids); }) .then(() => { this.onLoad(this.page); @@ -461,7 +457,7 @@ getList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => { const data = res.data.data; this.page.total = data.total; - if(data && data.records.length>0 && this.options.fileDocClassifyCombox){ + if(this.options.fileDocClassifyCombox){ this.data = data.records.map(item => { if(validatenull(item.fileDocClassifyName)&& !validatenull(item.fileDocClassify)){ item.fileDocClassifyName = this.options.fileDocClassifyCombox[item.fileDocClassify] || ''; @@ -470,8 +466,10 @@ ...item } }) + }else{ + this.data = data.records; } - //this.data = data.records; + this.loading = false; this.selectionClear(); }).catch(error=>{ -- Gitblit v1.9.3