|
@@ -98,42 +98,44 @@
|
|
</el-col>
|
|
</el-col>
|
|
<!--文件数据-->
|
|
<!--文件数据-->
|
|
<el-col :span="20" :xs="24">
|
|
<el-col :span="20" :xs="24">
|
|
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
|
|
|
|
- label-width="68px">
|
|
|
|
|
|
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
|
|
<el-form-item label="文件名称" prop="fileName">
|
|
<el-form-item label="文件名称" prop="fileName">
|
|
<el-input
|
|
<el-input
|
|
v-model="queryParams.fileName"
|
|
v-model="queryParams.fileName"
|
|
placeholder="请输入文件名称"
|
|
placeholder="请输入文件名称"
|
|
clearable
|
|
clearable
|
|
- style="width: 240px"
|
|
|
|
|
|
+ style="width: 180px"
|
|
@keyup.enter.native="handleQuery"
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="状态" prop="status">
|
|
|
|
- <el-select
|
|
|
|
- v-model="queryParams.status"
|
|
|
|
- placeholder="文件状态"
|
|
|
|
|
|
+ <el-form-item label="创建者" prop="createBy">
|
|
|
|
+ <el-input
|
|
|
|
+ v-model="queryParams.createBy"
|
|
|
|
+ placeholder="请输入创建者"
|
|
clearable
|
|
clearable
|
|
- style="width: 240px"
|
|
|
|
- >
|
|
|
|
- <el-option
|
|
|
|
- v-for="dict in dict.type.sys_file_status"
|
|
|
|
- :key="dict.value"
|
|
|
|
- :label="dict.label"
|
|
|
|
- :value="dict.value"
|
|
|
|
- />
|
|
|
|
- </el-select>
|
|
|
|
|
|
+ style="width: 150px"
|
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
|
+ />
|
|
|
|
+ </el-form-item>
|
|
|
|
+ <el-form-item label="创建时间范围">
|
|
|
|
+ <el-date-picker
|
|
|
|
+ v-model="createDateRange" style="width: 220px"
|
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
|
+ type="daterange"
|
|
|
|
+ range-separator="-"
|
|
|
|
+ start-placeholder="开始日期"
|
|
|
|
+ end-placeholder="结束日期"
|
|
|
|
+ />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="创建时间">
|
|
|
|
|
|
+ <el-form-item label="更新时间范围">
|
|
<el-date-picker
|
|
<el-date-picker
|
|
- v-model="dateRange"
|
|
|
|
- style="width: 240px"
|
|
|
|
|
|
+ v-model="updateDateRange" style="width: 220px"
|
|
value-format="yyyy-MM-dd"
|
|
value-format="yyyy-MM-dd"
|
|
- type="dateRange"
|
|
|
|
|
|
+ type="daterange"
|
|
range-separator="-"
|
|
range-separator="-"
|
|
start-placeholder="开始日期"
|
|
start-placeholder="开始日期"
|
|
end-placeholder="结束日期"
|
|
end-placeholder="结束日期"
|
|
- ></el-date-picker>
|
|
|
|
|
|
+ />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item>
|
|
<el-form-item>
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
@@ -217,6 +219,11 @@
|
|
<span>{{ parseTime(scope.row.createTime) }}</span>
|
|
<span>{{ parseTime(scope.row.createTime) }}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
+ <el-table-column label="更新时间" align="center" prop="updateTime" v-if="columns[7].visible" width="160">
|
|
|
|
+ <template v-slot="scope">
|
|
|
|
+ <span>{{ parseTime(scope.row.updateTime) }}</span>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
label="操作"
|
|
label="操作"
|
|
align="center"
|
|
align="center"
|
|
@@ -308,24 +315,21 @@ import Treeselect from "@riophae/vue-treeselect";
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
import {
|
|
import {
|
|
addFolder,
|
|
addFolder,
|
|
|
|
+ checkFolderDeletable,
|
|
delFolder,
|
|
delFolder,
|
|
|
|
+ folderTreeSelectByDeptId,
|
|
getFolder,
|
|
getFolder,
|
|
- updateFolder,
|
|
|
|
- checkFolderDeletable,
|
|
|
|
- folderTreeSelectByDeptId
|
|
|
|
|
|
+ updateFolder
|
|
} from "@/api/system/folder";
|
|
} from "@/api/system/folder";
|
|
-import {addFile, delFile, download, downloadTemplate, listFile, updateFile} from "@/api/system/file";
|
|
|
|
|
|
+import {addFile, delFile, download, downloadTemplate, listFile, updateFile, updateFileStatus} from "@/api/system/file";
|
|
import dict from "@/utils/dict";
|
|
import dict from "@/utils/dict";
|
|
import {parseTime} from "@/utils/xzl";
|
|
import {parseTime} from "@/utils/xzl";
|
|
-import {updateFileStatus} from "@/api/system/file";
|
|
|
|
import {listDept} from "@/api/system/dept";
|
|
import {listDept} from "@/api/system/dept";
|
|
-import {getUser, getUserProfile} from "@/api/system/user";
|
|
|
|
-import dept from "@/views/system/dept/index.vue";
|
|
|
|
-
|
|
|
|
|
|
+import {getUserProfile} from "@/api/system/user";
|
|
|
|
|
|
export default {
|
|
export default {
|
|
name: "File",
|
|
name: "File",
|
|
- dicts: ['sys_file_status', 'sys_user_sex'],
|
|
|
|
|
|
+ dicts: ['sys_file_status'],
|
|
components: {Treeselect},
|
|
components: {Treeselect},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
@@ -354,7 +358,11 @@ export default {
|
|
// 默认密码
|
|
// 默认密码
|
|
initPassword: undefined,
|
|
initPassword: undefined,
|
|
// 日期范围
|
|
// 日期范围
|
|
- dateRange: [],
|
|
|
|
|
|
+ daterange: [],
|
|
|
|
+ //创建日期范围
|
|
|
|
+ createDateRange: [],
|
|
|
|
+ //更新日期范围
|
|
|
|
+ updateDateRange: [],
|
|
//父文件夹名称
|
|
//父文件夹名称
|
|
parentFolderCache: [],
|
|
parentFolderCache: [],
|
|
// 用于缓存每个文件夹的 level 值
|
|
// 用于缓存每个文件夹的 level 值
|
|
@@ -424,9 +432,13 @@ export default {
|
|
pageNum: 1,
|
|
pageNum: 1,
|
|
pageSize: 10,
|
|
pageSize: 10,
|
|
fileName: undefined,
|
|
fileName: undefined,
|
|
- fileType: undefined,
|
|
|
|
status: undefined,
|
|
status: undefined,
|
|
- folderId: undefined
|
|
|
|
|
|
+ folderId: undefined,
|
|
|
|
+ createBy: undefined,
|
|
|
|
+ beginCreateTime: undefined,
|
|
|
|
+ endCreateTime: undefined,
|
|
|
|
+ beginUpdateTime: undefined,
|
|
|
|
+ endUpdateTime: undefined
|
|
},
|
|
},
|
|
// 列信息
|
|
// 列信息
|
|
columns: [
|
|
columns: [
|
|
@@ -436,7 +448,8 @@ export default {
|
|
{key: 3, label: `所属文件夹`, visible: true},
|
|
{key: 3, label: `所属文件夹`, visible: true},
|
|
{key: 4, label: `创建者`, visible: true},
|
|
{key: 4, label: `创建者`, visible: true},
|
|
{key: 5, label: `状态`, visible: true},
|
|
{key: 5, label: `状态`, visible: true},
|
|
- {key: 6, label: `创建时间`, visible: true}
|
|
|
|
|
|
+ {key: 6, label: `创建时间`, visible: true},
|
|
|
|
+ {key: 7, label: '更新时间', visible: true},
|
|
],
|
|
],
|
|
// 表单校验
|
|
// 表单校验
|
|
rules: {
|
|
rules: {
|
|
@@ -483,6 +496,7 @@ export default {
|
|
this.getConfigKey("sys.user.initPassword").then(response => {
|
|
this.getConfigKey("sys.user.initPassword").then(response => {
|
|
this.initPassword = response.msg;
|
|
this.initPassword = response.msg;
|
|
});
|
|
});
|
|
|
|
+ console.log('dict.type.sys_file_status:', dict.type.sys_file_status);
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
parseTime,
|
|
parseTime,
|
|
@@ -490,12 +504,33 @@ export default {
|
|
/** 查询文件列表 */
|
|
/** 查询文件列表 */
|
|
getList() {
|
|
getList() {
|
|
this.loading = true;
|
|
this.loading = true;
|
|
- listFile(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
|
|
|
|
- this.fileList = response.rows;
|
|
|
|
- this.total = response.total;
|
|
|
|
- this.loading = false;
|
|
|
|
- }
|
|
|
|
- );
|
|
|
|
|
|
+ let params = this.queryParams;
|
|
|
|
+ console.log('当前参数D:', params);
|
|
|
|
+
|
|
|
|
+ // 自定义添加时间范围参数(小写开头)
|
|
|
|
+ if (this.createDateRange && this.createDateRange.length === 2) {
|
|
|
|
+ params.beginCreateTime = this.createDateRange[0];
|
|
|
|
+ params.endCreateTime = this.createDateRange[1];
|
|
|
|
+ } else {
|
|
|
|
+ delete params.beginCreateTime;
|
|
|
|
+ delete params.endCreateTime;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // 自定义添加更新时间范围参数(小写开头)
|
|
|
|
+ if (this.updateDateRange && this.updateDateRange.length === 2) {
|
|
|
|
+ params.beginUpdateTime = this.updateDateRange[0];
|
|
|
|
+ params.endUpdateTime = this.updateDateRange[1];
|
|
|
|
+ } else {
|
|
|
|
+ delete params.beginUpdateTime;
|
|
|
|
+ delete params.endUpdateTime;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ console.log('请求参数:', params);
|
|
|
|
+ listFile(params).then(response => {
|
|
|
|
+ this.fileList = response.rows;
|
|
|
|
+ this.total = response.total;
|
|
|
|
+ this.loading = false;
|
|
|
|
+ });
|
|
},
|
|
},
|
|
getFileTree() {
|
|
getFileTree() {
|
|
folderTreeSelectByDeptId().then(response => {
|
|
folderTreeSelectByDeptId().then(response => {
|
|
@@ -563,11 +598,33 @@ export default {
|
|
},
|
|
},
|
|
/** 重置按钮操作 */
|
|
/** 重置按钮操作 */
|
|
resetQuery() {
|
|
resetQuery() {
|
|
- this.dateRange = [];
|
|
|
|
|
|
+ // 清空时间范围选择器
|
|
|
|
+ this.createDateRange = [];
|
|
|
|
+ this.updateDateRange = [];
|
|
|
|
+
|
|
|
|
+ // 重置表单字段(如文件名称、状态等)
|
|
this.resetForm("queryForm");
|
|
this.resetForm("queryForm");
|
|
|
|
+
|
|
|
|
+ // 清除部门 ID 和树形结构选中状态
|
|
this.queryParams.deptId = undefined;
|
|
this.queryParams.deptId = undefined;
|
|
this.$refs.tree.setCurrentKey(null);
|
|
this.$refs.tree.setCurrentKey(null);
|
|
- this.handleQuery();
|
|
|
|
|
|
+
|
|
|
|
+ // 清空其他可能存在的搜索参数
|
|
|
|
+ this.queryParams = {
|
|
|
|
+ pageNum: 1,
|
|
|
|
+ pageSize: 10,
|
|
|
|
+ fileName: undefined,
|
|
|
|
+ fileType: undefined,
|
|
|
|
+ status: undefined,
|
|
|
|
+ folderId: undefined,
|
|
|
|
+ beginCreateTime: undefined,
|
|
|
|
+ endCreateTime: undefined,
|
|
|
|
+ beginUpdateTime: undefined,
|
|
|
|
+ endUpdateTime: undefined,
|
|
|
|
+ createBy: undefined
|
|
|
|
+ };
|
|
|
|
+ // 请求全部数据
|
|
|
|
+ this.getList();
|
|
},
|
|
},
|
|
// 多选框选中数据
|
|
// 多选框选中数据
|
|
handleSelectionChange(selection) {
|
|
handleSelectionChange(selection) {
|