From cd8b7ff53f570dfe2447028eb2331eb9cbdc00e5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 25 三月 2025 23:43:38 +0800
Subject: [PATCH] 项目查询条件完善
---
src/views/projectEngineering/projectLibrary/index.vue | 256 ++++++++++++++++++++------------------------------
1 files changed, 104 insertions(+), 152 deletions(-)
diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index ac4390f..f92d6b6 100644
--- a/src/views/projectEngineering/projectLibrary/index.vue
+++ b/src/views/projectEngineering/projectLibrary/index.vue
@@ -70,15 +70,6 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="椤圭洰鏍囩">
- <el-select v-model="queryParams.tag" clearable placeholder="璇烽�夋嫨" class="select-option"
- @change="handleQuery">
- <el-option v-for="item in dict.type.sys_project_tags" :key="item.value" :label="item.label"
- :value="item.value"/>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
<el-form-item label="椤圭洰鐘舵��">
<el-select v-model="queryParams.projectStatus" :disabled="isProjectCategory" clearable
@change="handleQuery"
@@ -88,8 +79,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="12">
<el-form-item label="椤圭洰鐮�">
<el-select v-model="queryParams.coding" clearable placeholder="璇烽�夋嫨" class="select-option"
@@ -99,20 +88,13 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="鍏宠仈鐘舵��">
- <el-select v-model="queryParams.assignmentStatus" clearable placeholder="璇烽�夋嫨" class="select-option"
- @change="handleQuery">
- <el-option v-for="item in dict.type.sys_association_status" :key="item.value" :label="item.label"
- :value="item.value"/>
- </el-select>
- </el-form-item>
- </el-col>
+ </el-row>
+ <el-row>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="璧勯噾绫诲瀷">
- <el-select v-model="queryParams.investmentType" clearable placeholder="璇烽�夋嫨" class="select-option"
+ <el-select v-model="queryParams.fundType" clearable placeholder="璇烽�夋嫨" class="select-option"
@change="handleQuery">
<el-option v-for="item in dict.type.sys_funding_type" :key="item.value" :label="item.label"
:value="item.value"/>
@@ -205,7 +187,6 @@
<!-- 鍔ㄦ�佸垪 -->
<el-table-column
v-for="item in columnsNew"
- :key="item.columns"
v-if="item.visible"
:prop="item.columns"
:label="item.label"
@@ -221,6 +202,14 @@
<!-- coding鎻掓Ы -->
<template v-if="item.slotName === 'coding'">
<dict-tag :options="dict.type.sys_project_code" :value="scope.row.coding"/>
+ </template>
+ <!-- 琛屾斂鍖哄垝鎻掓Ы -->
+ <template v-if="item.slotName === 'area'">
+ <dict-tag :options="dict.type.sys_administrative_divisions" :value="scope.row.area"/>
+ </template>
+ <!-- 璧勯噾绫诲瀷鎻掓Ы -->
+ <template v-if="item.slotName === 'fundType'">
+ <dict-tag :options="dict.type.sys_funding_type" :value="scope.row.fundType"/>
</template>
<!-- projectType鎻掓Ы -->
<template v-if="item.slotName === 'projectType'">
@@ -242,15 +231,21 @@
<template v-if="item.slotName === 'importanceType'">
<dict-tag :options="dict.type.sys_key_categories" :value="scope.row.importanceType"/>
</template>
- <!-- planStartTime -->
- <template v-if="item.slotName === 'planStartTime'">
- {{ scope.row.planStartTime ? scope.row.planStartTime.split('-')[0] + '骞�' : '' }}
+ <!-- plannedStartDate -->
+ <template v-if="item.slotName === 'plannedStartDate'">
+ {{ scope.row.plannedStartDate ? scope.row.plannedStartDate.split('-')[0] + '骞�' : '' }}
</template>
<!-- usedStatus鎻掓Ы -->
<template v-if="item.slotName === 'usedStatus'">
<dict-tag :options="dict.type.sys_used_status" :value="scope.row.usedStatus"/>
</template>
+ <!-- planStartTime -->
+ <template v-else-if="item.slotName === 'planStartTime'">
+ {{ scope.row.planStartTime ? scope.row.planStartTime.split(' ')[0] : '' }}
+ </template>
</template>
+ <!-- 杞崲璁″垝寮�宸ユ牱寮� 绌烘牸鍒囧壊鏁扮粍 -->
+
<!-- 榛樿鏄剧ず -->
<span v-else>{{ scope.row[item.columns] }}</span>
</template>
@@ -323,7 +318,7 @@
</template>
<script>
-import {listProject, getProject, delProject, addProject, updateProject,getHiddenList,addList} from "@/api/projectEngineering/projectInfo";
+import {listProject, getProject, delProject, addProject, updateProject,getHiddenList,addList,getAll} from "@/api/projectEngineering/projectInfo";
import {current, currentRest} from '@/views/projectEngineering/projectLibrary/list';
import FileDialog from '@/views/projectEngineering/projectLibrary/component/FileDialog';
import Cookies from "js-cookie";
@@ -426,39 +421,24 @@
if (projectPhase) {
this.isProjectCategory = true;
}
- // const columns = current.map((item, index) => {
- // item.index = index + 1;
- // item.key = index;
- // item.serialNumber = index + 1;
- // if(item.id ==='usedStatus' ){
- // if(projectPhase !== '6') {
- // item.visible = false
- // } else {
- // item.visible = true
- // }
- // }
- // return item;
- // });
- // this.columns = columns;
- // this.defaultColumns = JSON.parse(JSON.stringify(columns));
- this.hiddenList();
-
+ this.hiddenColumnsList();
+ this.pageHiddenColumnsList();
this.getList(this.$route.query.projectPhase == '5' || this.$route.query.projectPhase == '6' ? null : this.$route.query.projectPhase);
},
beforeDestroy() {
this.removeStore();
},
methods: {
- hiddenList(){
- getHiddenList().then(res =>{
+
+ //鏌ヨ鍚庣鎵�鏈夎〃澶存暟鎹�
+ hiddenColumnsList(){
+ getAll().then(res =>{
const projectPhase = this.$route.query.projectPhase;
//杞崲
res.data.forEach((item,index)=>{
item.index = index + 1;
- item.key = index;
- item.serialNumber = item.sort;
item.label = item.name;
- // item.slotName = item.columns;
+
if(item.display === '0'){
item.visible = false
}else {
@@ -472,13 +452,43 @@
}
}
});
-
- this.defaultColumns = res.data;
this.columnsNew = res.data;
- console.log(this.columnsNew)
+ })
+ },
+ pageHiddenColumnsList(){
+ getHiddenList(this.pageQueryParams).then(res =>{
+ this.buildColumns(res.data);
this.hiddenTotal = res.total;
})
-
+ },
+ //闅愯棌鍒楄〃缈婚〉
+ handlePage(page){
+ this.pageQueryParams.currentPage = page;
+ getHiddenList(this.pageQueryParams).then(res =>{
+ this.buildColumns(res.data);
+ })
+ },
+ buildColumns(data){
+ const projectPhase = this.$route.query.projectPhase;
+ //杞崲
+ data.forEach((item,index)=>{
+ item.index = index + 1;
+ item.label = item.name;
+ if(item.display === '0'){
+ item.visible = false
+ }else {
+ item.visible = true;
+ }
+ if(item.columns ==='usedStatus' ){
+ if(projectPhase !== '6') {
+ item.visible = false
+ } else {
+ item.visible = true
+ }
+ }
+ });
+ //鍒嗛〉鏁版嵁浼犲叆鏄鹃殣缁勪欢
+ this.defaultColumns = data;
},
// async getProjectSubType(projectType, projectSubType) {
// if (!projectType || !projectSubType) {
@@ -522,127 +532,69 @@
localStorage.removeItem("policyInfoForm")
localStorage.removeItem("documentsInfoForm")
},
- //闅愯棌鍒楄〃缈婚〉
- handlePage(page){
- this.pageQueryParams.currentPage = page;
- getHiddenList(this.pageQueryParams).then(res =>{
- this.buildColumns(res.data);
- })
- },
- buildColumns(data){
- const projectPhase = this.$route.query.projectPhase;
- //杞崲
- data.forEach((item,index)=>{
- item.index = index + 1;
- item.key = index;
- item.serialNumber = item.sort;
- item.label = item.name;
- // item.slotName = item.columns;
- if(item.display === '0'){
- item.visible = false
- }else {
- item.visible = true;
- }
- if(item.columns ==='usedStatus' ){
- if(projectPhase !== '6') {
- item.visible = false
- } else {
- item.visible = true
- }
- }
- });
- this.columnsNew = data;
- this.defaultColumns = data;
-
- },
- save(){
- const list =current.map((item, index) => {
- item.name = item.label;
- item.sort = index + 1;
- item.columns = item.id;
- item.id = 0;
- if(item.slotName === undefined){
- item.slotName = null;
- }
- if(item.visible){
- item.display = "1";
- }else {
- item.display ="0";
- }
- return item;
- });
- console.log(list)
- addList(list).then(res=>{
- console.log(res.msg)
- })
-
- },
+ // save(){
+ // const list =current.map((item, index) => {
+ // item.name = item.label;
+ // item.sort = index + 1;
+ // item.columns = item.id;
+ // item.id = 0;
+ // if(item.slotName === undefined){
+ // item.slotName = null;
+ // }
+ // if(item.visible){
+ // item.display = "1";
+ // }else {
+ // item.display ="0";
+ // }
+ // return item;
+ // });
+ // console.log(list)
+ // addList(list).then(res=>{
+ // console.log(res.msg)
+ // })
+ //
+ // },
// 閲嶇疆鎺掑簭鐨勬柟娉�
handleResetSort() {
- this.hiddenList()
- // const projectPhase = this.$route.query.projectPhase;
- // this.defaultColumns= currentRest.map((item, index) => {
- // item.index = index + 1;
- // item.key = index;
- // item.serialNumber = index + 1
- // if(item.id ==='usedStatus' ){
- // if(projectPhase !== '6') {
- // item.visible = false
- // } else {
- // item.visible = true
- // }
- // }
- // return item;
- // });
-
-
- // this.columnsNew = currentRest.map((item, index) => {
- // item.index = index + 1;
- // item.key = index;
- // item.serialNumber = index + 1
- // if(item.id ==='usedStatus' ){
- // if(projectPhase !== '6') {
- // item.visible = false
- // } else {
- // item.visible = true
- // }
- // }
- // return item;
- // });
- //寮哄埗table娓叉煋
-
- // this.defaultColumns = this.resetColumns;
- //
- //
- // this.columnsNew = this.resetColumns;
-
+ this.hiddenColumnsList();
+ this.pageHiddenColumnsList();
this.tableKey = this.tableKey + 1;
},
// 鏇存柊鍒楃殑鏂规硶
handleUpdateColumns(row) {
- // this.currentColumns = row;
- row.key = Number(row.key)
+ //鏇挎崲鍏冪礌
this.columnsNew = this.columnsNew.map(item => {
- if (item.key === row.key) {
+ if (item.columns === row.columns) {
return row;
}
return item;
});
+
},
+ //鐐瑰嚮鎺掑簭鍔犲噺鏇存柊
handleUpdateSort(row) {
- console.log(this.columnsNew, '鎺掑簭鍓嶇殑鍒�');
+ //鏇挎崲琛ㄥご鍏冪礌
this.columnsNew = this.columnsNew.map(item => {
- if (item.key === row.key) {
+ if (item.id === row.id) {
return row;
}
return item;
});
- this.defaultColumns = this.columnsNew.sort((a, b) => a.index - b.index);
- this.columnsNew.sort((a, b) => a.serialNumber - b.serialNumber);
+ //鏇挎崲浼犲叆鏄鹃殣缁勪欢鏁版嵁
+ this.defaultColumns = this.defaultColumns.map(item => {
+ if (item.id === row.id) {
+ return row;
+ }
+ return item;
+ });
+ //鏄鹃殣鎺掑簭
+ this.defaultColumns.sort((a, b) => a.sort - b.sort);
+ //涓婚〉琛ㄥご鏁版嵁鎺掑簭
+ this.columnsNew.sort((a, b) => a.sort - b.sort);
+
//寮哄埗table娓叉煋
this.tableKey = this.tableKey + 1;
- console.log(this.columnsNew, '鎺掑簭鍚庣殑鍒�');
},
// 鍏抽棴鏂囦欢澶勭悊寮规鐨勬柟娉�
fileDialogCancel() {
--
Gitblit v1.8.0