From 0ead7315c0e6076aded0dac7a6ff0b89c632287b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 28 十一月 2024 01:32:41 +0800
Subject: [PATCH] 项目基本信息、投资基本信息
---
src/views/projectEngineering/projectLibrary/index.vue | 394 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 236 insertions(+), 158 deletions(-)
diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index 3d16906..8a6c287 100644
--- a/src/views/projectEngineering/projectLibrary/index.vue
+++ b/src/views/projectEngineering/projectLibrary/index.vue
@@ -1,6 +1,7 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryParamsRef" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryParamsRef" size="small" :inline="true" v-show="showSearch"
+ label-width="68px">
<div class="slot">
<div class="left-section">
<el-form-item label="椤圭洰鍚嶇О" prop="projectName">
@@ -43,30 +44,24 @@
<el-button icon="el-icon-search" size="small" @click="handleQuery">鏌ヨ</el-button>
<el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
- <el-popover :visible="popoverValue" :width="500" placement="bottom">
- <template #reference>
- <el-button style="margin-right: 16px; margin-top: 1px; color: #3369ff" @click="handlePopover" size="small">
- 鏇村绛涙煡鏉′欢
- <span style="margin-left: 5px">
- <el-icon v-if="!popoverValue" class="el-icon-arrow-down"></el-icon>
- <el-icon v-else-if="popoverValue" class="el-icon-arrow-up"></el-icon>
- </span>
- </el-button>
- </template>
+ <el-popover :value="popoverValue" trigger="click" :width="700" placement="bottom">
<span>绛涢�夋潯浠�</span>
- <el-form ref="moreQueryParamsRef" label-width="68px" label-position="right" :model="moreQueryParams">
+ <el-form ref="moreQueryParamsRef" label-width="68px" label-position="right" :model="queryParams">
<el-row>
<el-col :span="12">
<el-form-item label="椤圭洰绫诲瀷">
- <el-select v-model="moreQueryParams.projectType" clearable placeholder="璇烽�夋嫨" class="select-option" size="small">
- <el-option v-for="items in sys_project_type" :key="items.value" :label="items.label" :value="items.value" />
+ <el-select v-model="queryParams.projectType" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery"
+ size="small">
+ <el-option v-for="item in dict.type.sys_project_type" :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="moreQueryParams.importanceType" clearable placeholder="璇烽�夋嫨" class="select-option">
- <el-option v-for="items in sys_key_categories" :key="items.value" :label="items.label" :value="items.value" />
+ <el-select v-model="queryParams.importanceType" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <el-option v-for="item in dict.type.sys_key_categories" :key="item.value" :label="item.label"
+ :value="item.value"/>
</el-select>
</el-form-item>
</el-col>
@@ -74,15 +69,18 @@
<el-row>
<el-col :span="12">
<el-form-item label="椤圭洰鏍囩">
- <el-select v-model="moreQueryParams.tag" clearable placeholder="璇烽�夋嫨" class="select-option">
- <el-option v-for="items in sys_project_tags" :key="items.value" :label="items.label" :value="items.value" />
+ <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="moreQueryParams.projectStatus" :disabled="isProjectCategory" clearable placeholder="璇烽�夋嫨" class="select-option">
- <el-option v-for="items in sys_project_status" :key="items.value" :label="items.label" :value="items.value" />
+ <el-select v-model="queryParams.projectStatus" :disabled="isProjectCategory" clearable @change="handleQuery"
+ placeholder="璇烽�夋嫨" class="select-option">
+ <el-option v-for="item in dict.type.sys_project_status" :key="item.value" :label="item.label"
+ :value="item.value"/>
</el-select>
</el-form-item>
</el-col>
@@ -90,15 +88,17 @@
<el-row>
<el-col :span="12">
<el-form-item label="椤圭洰鐮�">
- <el-select v-model="moreQueryParams.projectColorCode" clearable placeholder="璇烽�夋嫨" class="select-option">
- <el-option v-for="items in sys_project_code" :key="items.value" :label="items.label" :value="items.value" />
+ <el-select v-model="queryParams.projectColorCode" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <el-option v-for="item in dict.type.sys_project_code" :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="moreQueryParams.assignmentStatus" clearable placeholder="璇烽�夋嫨" class="select-option">
- <el-option v-for="items in sys_association_status" :key="items.value" :label="items.label" :value="items.value" />
+ <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>
@@ -106,15 +106,17 @@
<el-row>
<el-col :span="12">
<el-form-item label="璧勯噾绫诲瀷">
- <el-select v-model="moreQueryParams.investmentType" clearable placeholder="璇烽�夋嫨" class="select-option">
- <el-option v-for="items in sys_funding_type" :key="items.value" :label="items.label" :value="items.value" />
+ <el-select v-model="queryParams.investmentType" 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"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="椤圭洰闃舵">
- <el-select v-model="moreQueryParams.projectPhase" clearable placeholder="璇烽�夋嫨" class="select-option">
- <el-option v-for="items in sys_project_phases" :key="items.value" :label="items.label" :value="items.value" />
+ <el-select v-model="queryParams.projectPhase" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <el-option v-for="item in dict.type.sys_project_phases" :key="item.value" :label="item.label"
+ :value="item.value"/>
</el-select>
</el-form-item>
</el-col>
@@ -122,113 +124,133 @@
<el-row>
<el-col :span="12">
<el-form-item label="鎶曡祫绫诲埆">
- <el-select v-model="moreQueryParams.investType" clearable placeholder="璇烽�夋嫨" class="select-option">
- <el-option v-for="items in sys_investment_type" :key="items.value" :label="items.label" :value="items.value" />
+ <el-select v-model="queryParams.investType" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <el-option v-for="item in dict.type.sys_investment_type" :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="moreQueryParams.area" clearable placeholder="璇烽�夋嫨" class="select-option">
- <el-option v-for="items in sys_administrative_divisions" :key="items.value" :label="items.label" :value="items.value" />
+ <el-select v-model="queryParams.area" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <el-option v-for="item in dict.type.sys_administrative_divisions" :key="item.value" :label="item.label"
+ :value="item.value"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
- <el-row style="text-align: center">
- <el-col :span="24">
- <el-form-item label-width="0">
- <el-button type="primary" @click="handleQueryFrom">纭� 璁�</el-button>
- <el-button @click="closePopover">鍙� 娑�</el-button>
- </el-form-item>
- </el-col>
- </el-row>
</el-form>
+ <el-button style="margin-right: 16px; margin-top: 1px; color: #3369ff" slot="reference"
+ size="small">
+ 鏇村绛涙煡鏉′欢
+ <span style="margin-left: 5px">
+ <el-icon v-if="!popoverValue" class="el-icon-arrow-down"></el-icon>
+ <el-icon v-else-if="popoverValue" class="el-icon-arrow-up"></el-icon>
+ </span>
+ </el-button>
</el-popover>
</div>
<div class="right-section">
<div>
- <el-button @click="handleExport" size="small" >
+ <el-button @click="handleExport" size="small">
<svg-icon icon-class="exportIcon" style="margin-right: 8px"/>
瀵煎嚭鏁版嵁
</el-button>
- <el-button :disabled="isReserve" @click="handleImport" size="small" >
+ <el-button :disabled="!isReserve" @click="handleImport" size="small">
<svg-icon icon-class="importIcon" style="margin-right: 8px"/>
瀵煎叆鏁版嵁
</el-button>
</div>
<div class="add-btn">
<el-tooltip content="鏂板" effect="dark" placement="top">
- <el-button :disabled="isReserve" circle icon="el-icon-plus" @click="add()" size="small"/>
+ <el-button :disabled="!isReserve" circle icon="el-icon-plus" @click="add()" size="small"/>
</el-tooltip>
</div>
<VisibilityToolbar
v-model:showSearch="showSearch"
- :columns="columnList"
+ :columns="defaultColumns"
@queryTable="handleQuery"
+ @update:sort="handleUpdateSort"
+ @update:columns="handleUpdateColumns"
+ @update:resetSort="handleResetSort"
></VisibilityToolbar>
-<!-- @update:columns="handleUpdateColumns"-->
-<!-- @update:sort="handleUpdateSort"-->
-<!-- @update:resetSort="handleResetSort"-->
</div>
</div>
</el-form>
<el-table
+ :key="tableKey"
+ ref="elTable"
style="margin-top: 20px"
v-loading="loading"
- :data="infoList"
+ :data="projectInfoList"
@selection-change="handleSelectionChange"
height="60vh"
- :show-overflow-tooltip = "true">
- <el-table-column type="selection" width="55" align="center" />
- <template v-for="item in columns">
- <el-table-column
- v-if="item.visible"
- :prop="item.id"
- :label="item.label"
- v-bind="item"
- :min-width="item.minWidth"
- >
- <template slot-scope="scope" v-if="item.slotName">
- <slot :name="item.slotName" :scope="scope"></slot>
- </template>
- </el-table-column>
- </template>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ sortable="custom"
+ :show-overflow-tooltip="true">
+ <el-table-column type="selection" width="55" align="center"/>
+ <!-- 鍔ㄦ�佸垪 -->
+ <el-table-column
+ v-for="item in columns"
+ :key="item.id"
+ v-if="item.visible"
+ :prop="item.id"
+ :label="item.label"
+ :min-width="item.minWidth"
+ >
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['code:info:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['code:info:remove']"
- >鍒犻櫎</el-button>
+ <!-- 浣跨敤鍏峰悕鎻掓Ы -->
+ <template v-if="item.slotName">
+ <!-- projectStatus鎻掓Ы -->
+ <template v-if="item.slotName === 'projectStatus'">
+ <dict-tag :options="dict.type.sys_project_status" :value="scope.row.projectStatus"/>
+ </template>
+ <!-- projectColorCode鎻掓Ы -->
+ <template v-if="item.slotName === 'projectColorCode'">
+ <dict-tag :options="dict.type.sys_project_code" :value="scope.row.projectColorCode"/>
+ </template>
+ <!-- projectType鎻掓Ы -->
+ <template v-if="item.slotName === 'projectType'">
+ <dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/>
+ </template>
+ <!-- investType鎻掓Ы -->
+ <template v-if="item.slotName === 'investType'">
+ <dict-tag :options="dict.type.sys_investment_type" :value="scope.row.investType"/>
+ </template>
+ </template>
+ <!-- 榛樿鏄剧ず -->
+ <span v-else>{{ scope.row[item.id] }}</span>
</template>
</el-table-column>
- <template #projectStatus="{ scope }">
- <el-text class="mx-1">{{ getProjectStatus(scope.row) }}</el-text>
- </template>
- <template #projectColorCode="{ scope }">
- <el-text class="mx-1 has-dot">{{ '缁�' }}<span class="dot" style="margin-left: 5px"></span></el-text>
- </template>
- <template #projectType="{ scope }">
- <el-text class="mx-1">{{ getProjectType(scope.row) }}</el-text>
- </template>
- <template #investType="{ scope }">
- <el-text class="mx-1">{{ getInvesType(scope.row) }}</el-text>
- </template>
- <template #planStartTime="{ scope }">
- {{ scope.row.planStartTime ? scope.row.planStartTime.split('-')[0] + '骞�' : '' }}
- </template>
+ <!-- 鎿嶄綔鍒� -->
+ <el-table-column label="鎿嶄綔" width="140" align="center" >
+ <template slot-scope="scope">
+ <el-button
+ size="medium"
+ type="text"
+ icon="el-icon-view"
+ @click="handleDetail(scope.row)"
+ >
+ </el-button>
+ <el-button
+ v-if="isReserve"
+ size="medium"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ >
+ </el-button>
+ <el-button
+ v-if="isReserve"
+ size="medium"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ >
+ </el-button>
+ </template>
+ </el-table-column>
</el-table>
<pagination
@@ -239,31 +261,39 @@
@pagination="getList"
/>
-<!-- <FileDialog-->
-<!-- v-model:fileDialogVisible="fileDialogVisible"-->
-<!-- :isImportOrExport="isImportOrExport"-->
-<!-- @fileDialogCancel="fileDialogCancel"-->
-<!-- :currentColumns="currentColumns"-->
-<!-- />-->
+ <FileDialog
+ :fileDialogVisible.sync="fileDialogVisible"
+ :isImportOrExport="isImportOrExport"
+ @fileDialogCancel="fileDialogCancel"
+ :currentColumns="columns"
+ />
</div>
</template>
<script>
-import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/projectInfo";
-import { current } from './list';
-
+import {listProject, getProject, delProject, addProject, updateProject} 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";
export default {
+ dicts: ['sys_administrative_divisions', 'sys_investment_type', 'sys_project_phases',
+ 'sys_funding_type', 'sys_association_status', 'sys_project_status', 'sys_project_code',
+ 'sys_project_tags', 'sys_key_categories', 'sys_project_type'],
name: "projectInfo",
+ components: {
+ FileDialog
+ },
data() {
return {
isImportOrExport: false,
fileDialogVisible: false,
- //鎺у埗鏄鹃殣鐨勮〃鍗�
- columnList: [],
//鏄惁闇�瑕佹柊澧炴寜閽�(鍌ㄨ搫椤圭洰闇�瑕�)
isReserve: false,
+ //椤圭洰鐘舵�佺瓫閫夋潯浠�
+ isProjectCategory: false,
//琛ㄥご
columns: [],
+ defaultColumns: [],
//鎺у埗鏇村绛涢�夋樉闅�
popoverValue: false,
// 閬僵灞�
@@ -279,12 +309,13 @@
// 鎬绘潯鏁�
total: 0,
// 椤圭洰绠＄悊鍩虹淇℃伅琛ㄦ牸鏁版嵁
- infoList: [],
+ projectInfoList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
+ tableKey: 0,
open: false,
- timeRange:[],
+ timeRange: [],
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -309,36 +340,114 @@
// 琛ㄥ崟鏍￠獙
rules: {
projectName: [
- { required: true, message: "椤圭洰鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
+ {required: true, message: "椤圭洰鍚嶇О涓嶈兘涓虹┖", trigger: "blur"}
],
projectStatus: [
- { required: true, message: "椤圭洰鐘舵�� (0鏈紑宸ワ紝1宸插紑宸ワ紝2宸茬宸ワ紝3鏆傚仠)涓嶈兘涓虹┖", trigger: "change" }
+ {required: true, message: "椤圭洰鐘舵�佷笉鑳戒负绌�", trigger: "change"}
],
}
};
},
created() {
- this.columns = current.map((item, index) => {
+ const projectCategory = this.$route.query.projectCategory;
+ if(!projectCategory || projectCategory === '1'){
+ this.isReserve = true;
+ }
+ if(projectCategory){
+ this.isProjectCategory = true;
+ }
+ const columns = current.map((item, index) => {
item.index = index + 1;
item.key = index;
item.serialNumber = index + 1;
return item;
});
- this.getList();
+ this.columns = columns;
+ this.defaultColumns = JSON.parse(JSON.stringify(columns));
+ this.getList();
},
methods: {
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate(row) {
+ this.removeCookie();
+ this.$router.push({ path: '/projectEngineering/project/ProjectDetails', query: { projectId: row.id }});
+ },
+ handleDetail(row) {
+ this.removeCookie();
+ this.$router.push({ path: '/projectEngineering/project/ProjectDetails', query: { projectId: row.id }});
+ },
+ // 鏂板椤甸潰
+ add() {
+ this.removeCookie();
+ this.$router.push({ path: '/projectEngineering/project/ProjectDetails' });
+ },
+ //娓呯悊缂撳瓨
+ removeCookie() {
+ Cookies.remove("projectForm")
+ Cookies.remove("investmentForm")
+ },
+ // 閲嶇疆鎺掑簭鐨勬柟娉�
+ handleResetSort() {
+ this.defaultColumns = currentRest.map((item, index) => {
+ item.index = index + 1;
+ item.key = index;
+ item.serialNumber = index + 1
+ return item;
+ });
+ this.columns = currentRest.map((item, index) => {
+ item.index = index + 1;
+ item.key = index;
+ item.serialNumber = index + 1
+ return item;
+ });
+ //寮哄埗table娓叉煋
+ this.tableKey = this.tableKey +1;
+ },
+ // 鏇存柊鍒楃殑鏂规硶
+ handleUpdateColumns(row) {
+ // this.currentColumns = row;
+ this.columns = this.columns.map(item => {
+ if (item.key === row.key) {
+ return row;
+ }
+ return item;
+ });
+ },
+ handleUpdateSort(row) {
+ console.log( this.columns, '鎺掑簭鍓嶇殑鍒�');
+ this.columns = this.columns.map(item => {
+ if (item.key === row.key) {
+ return row;
+ }
+ return item;
+ });
+ this.defaultColumns = JSON.parse(JSON.stringify(this.columns)).sort((a, b) => a.index - b.index);
+ this.columns.sort((a, b) => a.serialNumber - b.serialNumber);
+ //寮哄埗table娓叉煋
+ this.tableKey = this.tableKey +1;
+ console.log( this.columns, '鎺掑簭鍚庣殑鍒�');
+ },
+ // 鍏抽棴鏂囦欢澶勭悊寮规鐨勬柟娉�
+ fileDialogCancel() {
+ this.tableLoading = true;
+ this.fileDialogVisible = false;
+ // this.getList();
+ this.tableLoading = false;
+ },
handlePopover() {
- this.popoverValue.value = !this.popoverValue.value;
+ this.popoverValue = true;
+ },
+ closePopover() {
+ this.popoverValue = false;
},
/** 鏌ヨ椤圭洰绠＄悊鍩虹淇℃伅鍒楄〃 */
getList() {
this.loading = true;
- console.log("鏌ヨ")
- // listInfo(this.queryParams).then(response => {
- // this.infoList = response.rows;
- // this.total = response.total;
- // });
- this.loading = false;
+ listProject(this.queryParams).then(response => {
+ this.projectInfoList = response.data;
+ this.total = response.total;
+ });
+ this.loading = false;
},
// 鍙栨秷鎸夐挳
cancel() {
@@ -399,54 +508,21 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
+ this.single = selection.length !== 1
this.multiple = !selection.length
},
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞椤圭洰绠＄悊鍩虹淇℃伅";
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- const id = row.id || this.ids
- getInfo(id).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼椤圭洰绠＄悊鍩虹淇℃伅";
- });
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updateInfo(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addInfo(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- },
+
+
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎椤圭洰绠＄悊鍩虹淇℃伅缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎椤圭洰绠＄悊鍩虹淇℃伅缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
return delInfo(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ }).catch(() => {
+ });
},
/** 瀵煎叆鎸夐挳鎿嶄綔 */
handleImport() {
@@ -463,9 +539,10 @@
};
</script>
<style lang="scss" scoped>
- .select-option {
- width: 140px;
+.select-option {
+ width: 100%;
}
+
.slot {
display: flex;
}
@@ -477,6 +554,7 @@
.right-section {
display: flex;
margin-left: auto;
+
.add-btn {
margin: 0 10px;
}
--
Gitblit v1.8.0