Commit 5d5c7818 authored by Kimber's avatar Kimber
parents 57f0fd5b 7d71ecfe
...@@ -15,14 +15,14 @@ export default { ...@@ -15,14 +15,14 @@ export default {
saveFolderAuth: (data) => { saveFolderAuth: (data) => {
return request({ return request({
url: 'api/document-catalogue', url: 'api/document-catalogue/distributionCatalogue',
method: 'post', method: 'post',
data data
}) })
}, },
/** /**
* 目录-文件 显示页面 * 目录-文件 显示页面
* @param {*} pageParam * @param {*} pageParam
...@@ -30,8 +30,23 @@ export default { ...@@ -30,8 +30,23 @@ export default {
*/ */
// 获取所有目录 // 获取所有目录
getDataList: (pageParam) => { getDataList: (pageParam) => {
return request({
// url: 'api/document-catalogue/all',
url: 'api/document-catalogue/tree',
method: 'get',
params: pageParam
})
},
/**
* 目录-文件 显示页面
* @param {*} pageParam
* @returns
*/
// 获取所有目录
getAllDocList: (pageParam) => {
return request({ return request({
url: 'api/document-catalogue/all', url: 'api/document-catalogue/all',
// url: 'api/document-catalogue/tree',
method: 'get', method: 'get',
params: pageParam params: pageParam
}) })
......
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
placeholder="用户名/昵称" placeholder="用户名/昵称"
style="width: 200px" style="width: 200px"
class="filter-item" class="filter-item"
@keyup.enter.native="crud.toQuery"
/> />
<el-button type="primary" size="mini">查询</el-button> <el-button type="primary" size="mini" @click="search">查询</el-button>
</div> </div>
<el-table <el-table
highlight-current-row
ref="table" ref="table"
style="width: 100%" style="width: 100%"
:data="dataList" :data="dataList"
...@@ -43,8 +43,9 @@ ...@@ -43,8 +43,9 @@
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<el-button <el-button
type="primary" type="primary"
size="mini"
@click="saveFolderAuth" @click="saveFolderAuth"
:loading="menuLoading" :loading="saveAuthLoading"
>保存</el-button >保存</el-button
> >
</div> </div>
...@@ -60,35 +61,44 @@ ...@@ -60,35 +61,44 @@
> >
<div class="custom-tree-node" slot-scope="{ node, data }"> <div class="custom-tree-node" slot-scope="{ node, data }">
<span>{{ node.label }}</span> <span>{{ node.label }}</span>
<el-button <div class="authButtonWrapper">
:type="`${data.editWhether ? 'primary' : 'default'}`" <el-button
icon="el-icon-edit" :type="`${data.viewWhether ? 'primary' : 'default'}`"
circle icon="el-icon-view"
size="mini" circle
style="margin-left: 40px" size="small"
@click="data.editWhether = true" style="margin-left: 40px"
></el-button> @click="changeAuth(data, 'viewWhether')"
<el-button ></el-button>
:type="`${data.deleteWhether ? 'primary' : 'default'}`" <el-button
icon="el-icon-delete" :type="`${data.editWhether ? 'primary' : 'default'}`"
circle icon="el-icon-edit"
size="mini" circle
@click="data.deleteWhether = true" size="small"
></el-button> @click="changeAuth(data, 'editWhether')"
<el-button ></el-button>
:type="`${data.uploadWhether ? 'primary' : 'default'}`" <el-button
icon="el-icon-upload2" :type="`${data.deleteWhether ? 'primary' : 'default'}`"
circle icon="el-icon-delete"
size="mini" circle
@click="data.uploadWhether = true" size="small"
></el-button> @click="changeAuth(data, 'deleteWhether')"
<el-button ></el-button>
:type="`${data.downloadWhether ? 'primary' : 'default'}`" <el-button
icon="el-icon-download" :type="`${data.uploadWhether ? 'primary' : 'default'}`"
circle icon="el-icon-upload2"
size="mini" circle
@click="data.downloadWhether = true" size="small"
></el-button> @click="changeAuth(data, 'uploadWhether')"
></el-button>
<el-button
:type="`${data.downloadWhether ? 'primary' : 'default'}`"
icon="el-icon-download"
circle
size="small"
@click="changeAuth(data, 'downloadWhether')"
></el-button>
</div>
</div> </div>
</el-tree> </el-tree>
</el-card> </el-card>
...@@ -118,10 +128,11 @@ export default { ...@@ -118,10 +128,11 @@ export default {
defaultProps: { children: "children", label: "name", isLeaf: "leaf" }, defaultProps: { children: "children", label: "name", isLeaf: "leaf" },
currentUserId: 0, currentUserId: 0,
currentName: "", currentName: "",
menuLoading: false, saveAuthLoading: false,
showButton: false, showButton: false,
folders: [], folders: [],
menuIds: [], menuIds: [],
// tempAuthObj: {} // 操作权限数据集合
}; };
}, },
computed: {}, computed: {},
...@@ -130,6 +141,16 @@ export default { ...@@ -130,6 +141,16 @@ export default {
}, },
created() {}, created() {},
methods: { methods: {
search(){
this.getDataList4User()
},
changeAuth(data, attr) {
data[attr] = !data[attr];
// console.log('*****', data)
// deelete
// this.tempAuthObj[data.id] =
},
// 触发单选 // 触发单选
handleCurrentChange4table(val, oldVal) { handleCurrentChange4table(val, oldVal) {
if (val) { if (val) {
...@@ -138,11 +159,10 @@ export default { ...@@ -138,11 +159,10 @@ export default {
text: "加载中...", text: "加载中...",
background: "transparent", background: "transparent",
}); });
this.currentUserId = val.id this.currentUserId = val.id;
// this.dataList = []; // this.dataList = [];
this.getFolderByUserId(); this.getFolderByUserId();
loading.close(); loading.close();
} }
}, },
// 当前页的条数变化 // 当前页的条数变化
...@@ -153,27 +173,30 @@ export default { ...@@ -153,27 +173,30 @@ export default {
// 当前第几页 // 当前第几页
handleCurrentChange(val) { handleCurrentChange(val) {
this.page = val; this.page = val;
this.getFolderByUserId(); this.getDataList4User();
}, },
getDataList4User() { getDataList4User() {
edocApi edocApi
.getDataList4User({ .getDataList4User({
page: this.page, page: this.page > 0 ? this.page - 1 : this.page,
size: this.size, size: this.size,
fluzz: this.query.fluzz, blurry: this.query.blurry,
}) })
.then((res) => { .then((res) => {
console.log("res", res); console.log("res", res);
this.dataList = res.content; this.dataList = res.content;
this.totalElement = res.totalElements;
}); });
}, },
getFolderByUserId() { getFolderByUserId() {
edocApi.getDataList({ edocApi
userId: this.currentUserId, .getAllDocList({
}).then((res) => { userId: this.currentUserId,
this.folders = res.body; })
}); .then((res) => {
this.folders = res.body;
});
// edocApi // edocApi
// .getFolderByUserId({ // .getFolderByUserId({
// userId: this.currentUserId, // userId: this.currentUserId,
...@@ -215,16 +238,19 @@ export default { ...@@ -215,16 +238,19 @@ export default {
}); });
edocApi edocApi
.saveFolderAuth({ .saveFolderAuth({
data: this.folders, userId: this.currentUserId,
// data: JSON.stringify(this.folders),
documentCatalogueVos: this.folders
}) })
.then(() => { .then(() => {
this.$message.success("操作成功"); this.$message.success("操作成功");
this.menuLoading = false; this.saveAuthLoading = false;
}) })
.catch((err) => { .catch((err) => {
this.menuLoading = false; this.saveAuthLoading = false;
}); });
loading.close() loading.close();
}, },
}, },
}; };
...@@ -233,5 +259,15 @@ export default { ...@@ -233,5 +259,15 @@ export default {
<style rel="stylesheet/scss" lang="scss" scoped> <style rel="stylesheet/scss" lang="scss" scoped>
</style> ::v-deep .custom-tree-node {
width: 100%;
\ No newline at end of file }
.authButtonWrapper {
float: right;
}
::v-deep .el-tree-node__content {
height: 36px;
}
</style>
de9l9l9l9l9l ;;;;;;;;;;;;;;;;;O
<((O9l9l9l9l))
\ No newline at end of file
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
class="filter-item" class="filter-item"
@keyup.enter.native="crud.toQuery" @keyup.enter.native="crud.toQuery"
/> />
<date-range-picker v-model="query.createTime" class="date-item" /> <date-range-picker v-model="query.time" class="date-item" />
<el-input <el-input
v-model="query.name" v-model="query.name"
size="small" size="small"
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
prop="classification" prop="classification"
width="100" width="100"
/> />
<el-table-column width="200px" prop="createTime" label="录入时间" /> <el-table-column width="200px" prop="time" label="录入时间" />
<el-table-column label="操作" width="230px" align="center"> <el-table-column label="操作" width="230px" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -216,9 +216,9 @@ export default { ...@@ -216,9 +216,9 @@ export default {
return { return {
modalBtnLoad: false, modalBtnLoad: false,
query:{ query:{
name: '', originallyName: '',
type:'', type:'',
createTime: '' time: ''
}, },
folderModal: false, folderModal: false,
folderForm: { folderForm: {
...@@ -307,10 +307,10 @@ export default { ...@@ -307,10 +307,10 @@ export default {
}, },
addFolder() { addFolder() {
if (!this.currentCheckedFolderId) { // if (!this.currentCheckedFolderId) {
this.$message.warning("请勾选文件夹"); // this.$message.warning("请勾选文件夹");
return; // return;
} // }
this.folderModal = true; this.folderModal = true;
this.folderForm = { name: "", order: "" }; this.folderForm = { name: "", order: "" };
}, },
...@@ -420,7 +420,7 @@ export default { ...@@ -420,7 +420,7 @@ export default {
page: this.page, page: this.page,
size: this.size, size: this.size,
...this.query, ...this.query,
createTime: this.query.createTime ? this.query.createTime.join(',') : '' time: this.query.time ? this.query.time.join(',') : ''
}) })
.then((res) => { .then((res) => {
this.fileDataList = res.body.results; this.fileDataList = res.body.results;
......
...@@ -288,11 +288,11 @@ ...@@ -288,11 +288,11 @@
<el-pagination <el-pagination
:page-sizes="[10, 20, 50, 100]" :page-sizes="[10, 20, 50, 100]"
:current-page.sync="searchParam.page" :current-page.sync="searchParam.page"
:page-size.sync="searchParam.count" :page-size.sync="searchParam.size"
:total="searchResult.total" :total="searchResult.total"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
@size-change="searchSubmit" @size-change="handleSizeChange"
@current-change="searchSubmit" @current-change="handleCurrentChange"
/> />
</div> </div>
</template> </template>
...@@ -378,6 +378,16 @@ export default { ...@@ -378,6 +378,16 @@ export default {
}); });
}, },
methods: { methods: {
// 当前页的条数变化
handleSizeChange(val) {
this.searchParam.size = val;
this.searchSubmit();
},
// 当前第几页
handleCurrentChange(val) {
this.searchParam.page = val;
this.searchSubmit();
},
getMineTypeByMineId(mineId){ getMineTypeByMineId(mineId){
return this.mineList.find((item)=>{ return this.mineList.find((item)=>{
return item.id === mineId return item.id === mineId
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment