From dbb8f101f25741739c97b938743c43cca8715d98 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期日, 25 六月 2023 10:53:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/file/main.vue | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/file/main.vue b/Source/UBCS-WEB/src/components/file/main.vue
index 7a9ba08..9e5a099 100644
--- a/Source/UBCS-WEB/src/components/file/main.vue
+++ b/Source/UBCS-WEB/src/components/file/main.vue
@@ -196,7 +196,7 @@
},
data: {
ownbizOid:this.options.ownbizOid || "share",
- ownBtmname:this.options.ownbizBtm || "share",
+ ownBtmName:this.options.ownbizBtm || "share",
fileDocClassify:this.options.fileDocClassify || "ADMIN_SHARE",
fileDocClassifyName:this.options.fileDocClassifyName || "绠＄悊鍛樺叡浜枃浠�"
},
@@ -311,10 +311,10 @@
setParams() {
var queryMap = {
currentButtonKey: 'VIEW',
- ownbizOid: this.options.ownbizOid,
- ownbizBtm: this.options.ownbizBtm,
- fileDocClassify: this.options.fileDocClassify,
- fileDocClassifyName: this.options.fileDocClassifyName
+ ownbizOid:this.options.ownbizOid || "share",
+ ownBtmName:this.options.ownbizBtm || "share",
+ fileDocClassify: this.options.fileDocClassify|| "ADMIN_SHARE",
+ fileDocClassifyName: this.options.fileDocClassifyName || "绠＄悊鍛樺叡浜枃浠�"
};
if (this.options.where) {
Object.assign(queryMap, this.options.where);
@@ -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