From 41f11d5fd764a2bc7e8463a70bb340467d99a3ca Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 14 七月 2023 09:42:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/file/main.vue | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/file/main.vue b/Source/UBCS-WEB/src/components/file/main.vue
index cfbd438..9866551 100644
--- a/Source/UBCS-WEB/src/components/file/main.vue
+++ b/Source/UBCS-WEB/src/components/file/main.vue
@@ -7,6 +7,7 @@
:before-open="beforeOpen"
:permission="permissionList"
v-model="form"
+ :height="options.height || 300"
ref="crud"
@row-del="rowDel"
@search-change="searchChange"
@@ -67,13 +68,14 @@
import {validatenull} from "@/util/validate";
export default {
- props: ["options","visible"],
+ props: ["options","visible","ownbizOid"],
data() {
return {
form: {},
query: {},
params:{},
loading: false,
+ hasPage:this.options.hasPage||false,
page: {
pageSize: 10,
currentPage: 1,
@@ -89,7 +91,7 @@
height:(this.options.tableHeight?this.options.tableHeight:'auto'),
calcHeight: 30,
tip: false,
- searchShow: true,
+ searchShow: false,
searchMenuSpan: 6,
border: true,
index: true,
@@ -232,6 +234,12 @@
mounted() {
},
+ watch:{
+ ownbizOid(val){
+ this.setParams()
+ this.refreshChange()
+ }
+ },
methods: {
setFormItem(){
/*this.options.formItems=[{
@@ -312,9 +320,9 @@
setParams() {
var queryMap = {
currentButtonKey: 'VIEW',
- ownbizOid:this.options.ownbizOid || "share",
- ownBtmName:this.options.ownbizBtm || "share",
- fileDocClassify: this.options.fileDocClassify|| "ADMIN_SHARE",
+ ownbizOid: this.options.ownbizOid || "share",
+ ownBtmName: this.options.ownbizBtm || "share",
+ fileDocClassify: this.options.fileDocClassify || "ADMIN_SHARE",
fileDocClassifyName: this.options.fileDocClassifyName || "绠＄悊鍛樺叡浜枃浠�"
};
if (this.options.where) {
@@ -330,6 +338,12 @@
}
this.page.pageSize = this.options.pageObject.limit;
this.page.currentPage = this.options.pageObject.page;
+
+ this.attachOption.column[1].data.ownbizOid = this.options.ownbizOid || "share";
+ this.attachOption.column[1].data.ownBtmName = this.options.ownbizBtm || "share";
+ this.attachOption.column[1].data.fileDocClassify = this.options.fileDocClassify || "ADMIN_SHARE";
+ this.attachOption.column[1].data.fileDocClassifyName = this.options.fileDocClassifyName || "绠＄悊鍛樺叡浜枃浠�"
+
},
handleUpload() {
this.attachOption.column[1].data.fileOid='';
@@ -370,7 +384,7 @@
download(data)
}else{
if (this.selectionList.length === 0) {
- this.$message.warning("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");x
+ this.$message.warning("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
return;
}
data.append('fileOids',this.oids)
@@ -448,7 +462,7 @@
this.page.pageSize = pageSize;
},
refreshChange() {
- this.onLoad(this.page, this.query);
+ this.onLoad(this.page);
},
onLoad(page, params={}) {
this.loading = true;
--
Gitblit v1.9.3