|
@@ -35,7 +35,7 @@
|
|
|
<el-form-item label="审计状态">
|
|
|
<el-select size="mini" v-model="formInline.auditStatus" placeholder="审计状态" clearable>
|
|
|
<el-option label="已审核" value="2,3"></el-option>
|
|
|
- <el-option label="未审核" value="1"></el-option>
|
|
|
+ <el-option label="未审核" value="0,1"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item style="float: right">
|
|
@@ -54,7 +54,11 @@
|
|
|
<el-table-column type="index" width="50"> </el-table-column>
|
|
|
<!-- <el-table-column prop="c_task_id" label="任务编号"> </el-table-column> -->
|
|
|
<el-table-column prop="c_task_name" label="任务名称"> </el-table-column>
|
|
|
- <el-table-column prop="c_create_time" label="创建时间"> </el-table-column>
|
|
|
+ <el-table-column prop="c_create_time" label="创建时间">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ $dayjs(scope.row.c_create_time).format("YYYY-MM-DD HH:mm:ss") }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column prop="state" label="状态">
|
|
|
<template slot-scope="scope">
|
|
|
<el-tag :type="scope.row.state >= 2 ? 'success' : 'info'" disable-transitions>{{
|
|
@@ -91,7 +95,7 @@ export default {
|
|
|
components: { Pagination },
|
|
|
data() {
|
|
|
return {
|
|
|
- tableInitLoading: true,
|
|
|
+ tableInitLoading: false,
|
|
|
// 我的任务弹窗显示状态
|
|
|
dialogVisible: false,
|
|
|
// 查询条件
|
|
@@ -127,8 +131,9 @@ export default {
|
|
|
tableData: []
|
|
|
};
|
|
|
},
|
|
|
- mounted() {
|
|
|
+ created() {
|
|
|
// 我的任务事件监听
|
|
|
+ this.$bus.$off("wdrw");
|
|
|
this.$bus.$on("wdrw", () => {
|
|
|
this.changeShowBottomMenusStatus();
|
|
|
});
|
|
@@ -159,7 +164,7 @@ export default {
|
|
|
let params = new FormData();
|
|
|
params.append("columnId", "60");
|
|
|
params.append("states", "2,3");
|
|
|
- params.append("pageSize", 20);
|
|
|
+ params.append("pageSize", 999);
|
|
|
params.append("page", 0);
|
|
|
let sortparam = [{ field: "c_create_date", orderByType: 2 }];
|
|
|
params.append("orderBy", JSON.stringify(sortparam));
|
|
@@ -202,66 +207,66 @@ export default {
|
|
|
onSubmit() {
|
|
|
if (!this.tableInitLoading) {
|
|
|
this.tableInitLoading = true;
|
|
|
- }
|
|
|
- let params = new FormData();
|
|
|
- params.append("columnId", "61");
|
|
|
- params.append("pageSize", this.paginationData.pageSize);
|
|
|
- params.append("page", this.paginationData.currentPage - 1);
|
|
|
- let searchParam = [];
|
|
|
- let param = {
|
|
|
- field: "c_user_id",
|
|
|
- searchType: "2",
|
|
|
- content: {
|
|
|
- value: localStorage.getItem("USER_ID")
|
|
|
- }
|
|
|
- };
|
|
|
- searchParam.push(param);
|
|
|
- if (this.formInline.taskType) {
|
|
|
- let param1 = {
|
|
|
- field: "c_task_type",
|
|
|
- searchType: "1",
|
|
|
- content: {
|
|
|
- value: this.formInline.taskType
|
|
|
- }
|
|
|
- };
|
|
|
- searchParam.push(param1);
|
|
|
- }
|
|
|
- if (this.formInline.associatedItems) {
|
|
|
- let param1 = {
|
|
|
- field: "c_associated_item_ids",
|
|
|
+ let params = new FormData();
|
|
|
+ params.append("columnId", "61");
|
|
|
+ params.append("pageSize", this.paginationData.pageSize);
|
|
|
+ params.append("page", this.paginationData.currentPage - 1);
|
|
|
+ let searchParam = [];
|
|
|
+ let param = {
|
|
|
+ field: "c_user_id",
|
|
|
searchType: "2",
|
|
|
content: {
|
|
|
- value: this.formInline.associatedItems
|
|
|
+ value: localStorage.getItem("USER_ID")
|
|
|
}
|
|
|
};
|
|
|
- searchParam.push(param1);
|
|
|
- }
|
|
|
- if (this.formInline.auditStatus) {
|
|
|
- params.append("states", this.formInline.auditStatus);
|
|
|
- } else {
|
|
|
- params.append("states", "1,2,3");
|
|
|
- }
|
|
|
- params.append("search", JSON.stringify(searchParam));
|
|
|
- let sortparam = [{ field: "c_create_time", orderByType: 2 }];
|
|
|
- params.append("orderBy", JSON.stringify(sortparam));
|
|
|
- this.$Post(this.urlsCollection.selectContentList, params).then(
|
|
|
- res => {
|
|
|
- if (res.code === 200 && res.content.data.length > 0) {
|
|
|
- this.tableData = res.content.data;
|
|
|
- this.tableInitLoading = false;
|
|
|
- this.paginationData.total = res.content.count;
|
|
|
- } else {
|
|
|
+ searchParam.push(param);
|
|
|
+ if (this.formInline.taskType) {
|
|
|
+ let param1 = {
|
|
|
+ field: "c_task_type",
|
|
|
+ searchType: "1",
|
|
|
+ content: {
|
|
|
+ value: this.formInline.taskType
|
|
|
+ }
|
|
|
+ };
|
|
|
+ searchParam.push(param1);
|
|
|
+ }
|
|
|
+ if (this.formInline.associatedItems) {
|
|
|
+ let param1 = {
|
|
|
+ field: "c_associated_item_ids",
|
|
|
+ searchType: "2",
|
|
|
+ content: {
|
|
|
+ value: this.formInline.associatedItems
|
|
|
+ }
|
|
|
+ };
|
|
|
+ searchParam.push(param1);
|
|
|
+ }
|
|
|
+ if (this.formInline.auditStatus) {
|
|
|
+ params.append("states", this.formInline.auditStatus);
|
|
|
+ } else {
|
|
|
+ params.append("states", "0,1,2,3");
|
|
|
+ }
|
|
|
+ params.append("search", JSON.stringify(searchParam));
|
|
|
+ let sortparam = [{ field: "c_create_time", orderByType: 2 }];
|
|
|
+ params.append("orderBy", JSON.stringify(sortparam));
|
|
|
+ this.$Post(this.urlsCollection.selectContentList, params).then(
|
|
|
+ res => {
|
|
|
+ if (res.code === 200 && res.content.data.length > 0) {
|
|
|
+ this.tableData = res.content.data;
|
|
|
+ this.tableInitLoading = false;
|
|
|
+ this.paginationData.total = res.content.count;
|
|
|
+ } else {
|
|
|
+ this.tableData = [];
|
|
|
+ this.tableInitLoading = false;
|
|
|
+ this.$message.error(res.message);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ error => {
|
|
|
this.tableData = [];
|
|
|
this.tableInitLoading = false;
|
|
|
- this.$message.error(res.message);
|
|
|
+ this.$message.error(error);
|
|
|
}
|
|
|
- },
|
|
|
- error => {
|
|
|
- this.tableData = [];
|
|
|
- this.tableInitLoading = false;
|
|
|
- this.$message.error(error);
|
|
|
- }
|
|
|
- );
|
|
|
+ );
|
|
|
+ }
|
|
|
},
|
|
|
// 查询条件重置
|
|
|
resetForm() {
|
|
@@ -279,20 +284,19 @@ export default {
|
|
|
// 当用户点击svg底座时,切换底部菜单显示隐藏状态。
|
|
|
changeShowBottomMenusStatus() {
|
|
|
// 打开弹窗
|
|
|
- this.dialogVisible = true;
|
|
|
- if (this.$ifMenu("3", "")) {
|
|
|
- this.selectSelectDataMap = {
|
|
|
- projectType: [],
|
|
|
- associatedItems: [],
|
|
|
- associatedItemsOptions: []
|
|
|
- };
|
|
|
- // 首先获取数据字典中的下拉框数据
|
|
|
- this.selectSelectData("0", "c_task_type", "projectType");
|
|
|
- this.selectSelectData("0", "浦东新区行政区划", "associatedItems");
|
|
|
- // 请求所有项目数据
|
|
|
- this.getAllPorjects();
|
|
|
- this.onSubmit();
|
|
|
- this.$emit("changeShowBottomMenusStatus", false);
|
|
|
+ if (!this.dialogVisible) {
|
|
|
+ this.dialogVisible = true;
|
|
|
+ if (this.$ifMenu("3", "")) {
|
|
|
+ if (this.selectSelectDataMap.projectType.length === 0) {
|
|
|
+ // 首先获取数据字典中的下拉框数据
|
|
|
+ this.selectSelectData("0", "c_task_type", "projectType");
|
|
|
+ this.selectSelectData("0", "浦东新区行政区划", "associatedItems");
|
|
|
+ // 请求所有项目数据
|
|
|
+ this.getAllPorjects();
|
|
|
+ }
|
|
|
+ this.onSubmit();
|
|
|
+ this.$emit("changeShowBottomMenusStatus", false);
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
// 数据字典查询
|