From 1b6b793c2576bf92ba589b821bd160d8386fe91a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 25 十一月 2024 15:41:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectEngineering/projectLibrary/index.vue | 187 +++++++++------
src/api/projectInfo.js | 10
src/views/project/plan/index.vue | 391 ++++++++++++++++++++++++++++++++
src/assets/styles/sidebar.scss | 39 +-
src/layout/index.vue | 1
src/layout/components/Sidebar/index.vue | 7
src/api/project/plan/index.js | 44 +++
src/router/index.js | 14 +
src/components/Pagination/index.vue | 4
9 files changed, 592 insertions(+), 105 deletions(-)
diff --git a/src/api/project/plan/index.js b/src/api/project/plan/index.js
new file mode 100644
index 0000000..fc3bb10
--- /dev/null
+++ b/src/api/project/plan/index.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 鏌ヨ椤圭洰璁″垝璁板綍鍒楄〃
+export function getList(query) {
+ return request({
+ url: '/api/plan/page',
+ method: 'get',
+ params: query
+ })
+}
+
+// 鏌ヨ椤圭洰璁″垝璁板綍璇︾粏
+export function getRecord(id) {
+ return request({
+ url: '/plan/record/' + id,
+ method: 'get'
+ })
+}
+
+// 鏂板椤圭洰璁″垝璁板綍
+export function addRecord(data) {
+ return request({
+ url: '/plan/record',
+ method: 'post',
+ data: data
+ })
+}
+
+// 淇敼椤圭洰璁″垝璁板綍
+export function updateRecord(data) {
+ return request({
+ url: '/plan/record',
+ method: 'put',
+ data: data
+ })
+}
+
+// 鍒犻櫎椤圭洰璁″垝璁板綍
+export function delRecord(id) {
+ return request({
+ url: '/plan/record/' + id,
+ method: 'delete'
+ })
+}
diff --git a/src/api/projectInfo.js b/src/api/projectInfo.js
index 52bb876..59c3fe8 100644
--- a/src/api/projectInfo.js
+++ b/src/api/projectInfo.js
@@ -3,7 +3,7 @@
// 鏌ヨ椤圭洰绠＄悊鍩虹淇℃伅鍒楄〃
export function listInfo(query) {
return request({
- url: '/code/info/list',
+ url: '/project/info/page',
method: 'get',
params: query
})
@@ -12,7 +12,7 @@
// 鏌ヨ椤圭洰绠＄悊鍩虹淇℃伅璇︾粏
export function getInfo(id) {
return request({
- url: '/code/info/' + id,
+ url: '/project/info/' + id,
method: 'get'
})
}
@@ -20,7 +20,7 @@
// 鏂板椤圭洰绠＄悊鍩虹淇℃伅
export function addInfo(data) {
return request({
- url: '/code/info',
+ url: '/project/info',
method: 'post',
data: data
})
@@ -29,7 +29,7 @@
// 淇敼椤圭洰绠＄悊鍩虹淇℃伅
export function updateInfo(data) {
return request({
- url: '/code/info',
+ url: '/project/info',
method: 'put',
data: data
})
@@ -38,7 +38,7 @@
// 鍒犻櫎椤圭洰绠＄悊鍩虹淇℃伅
export function delInfo(id) {
return request({
- url: '/code/info/' + id,
+ url: '/project/info/' + id,
method: 'delete'
})
}
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index 2db4a1e..57e3b43 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -81,33 +81,33 @@
}
// menu hover
- .theme-dark .sub-menu-title-noDropdown,
- .theme-dark .el-sub-menu__title {
+ .theme-dark .submenu-title-noDropdown,
+ .theme-dark .el-submenu__title {
&:hover {
background-color: $base-sub-menu-title-hover !important;
}
}
- .sub-menu-title-noDropdown,
- .el-sub-menu__title {
+ .submenu-title-noDropdown,
+ .el-submenu__title {
&:hover {
background-color: rgba(0, 0, 0, 0.05) !important;
}
}
- & .theme-dark .is-active > .el-sub-menu__title {
+ & .theme-dark .is-active > .el-submenu__title {
color: $base-menu-color-active !important;
}
- & .nest-menu .el-sub-menu > .el-sub-menu__title,
- & .el-sub-menu .el-menu-item {
+ & .nest-menu .el-submenu > .el-submenu__title,
+ & .el-submenu .el-menu-item {
min-width: $base-sidebar-width !important;
&:hover {
background-color: rgba(0, 0, 0, 0.1) !important;
}
}
- & .theme-dark .nest-menu .el-sub-menu > .el-sub-menu__title,
- & .theme-dark .el-sub-menu .el-menu-item {
+ & .theme-dark .nest-menu .el-submenu > .el-submenu__title,
+ & .theme-dark .el-submenu .el-menu-item {
background-color: $base-sub-menu-background !important;
&:hover {
@@ -115,17 +115,17 @@
}
}
- & .theme-dark .nest-menu .el-sub-menu > .el-sub-menu__title,
+ & .theme-dark .nest-menu .el-submenu > .el-submenu__title,
& .theme-dark .el-menu-item {
&:hover {
- // you can use $sub-menuHover
+ // you can use $submenuHover
background-color: $base-menu-hover !important;
}
}
- & .nest-menu .el-sub-menu > .el-sub-menu__title,
+ & .nest-menu .el-submenu > .el-submenu__title,
& .el-menu-item {
&:hover {
- // you can use $sub-menuHover
+ // you can use $submenuHover
background-color: rgba(0, 0, 0, 0.04) !important;
}
}
@@ -140,7 +140,7 @@
padding-left: 54px;
}
- .sub-menu-title-noDropdown {
+ .submenu-title-noDropdown {
padding: 0 !important;
position: relative;
@@ -153,10 +153,11 @@
}
}
- .el-sub-menu {
+ .el-submenu {
+ background: red;
overflow: hidden;
- & > .el-sub-menu__title {
+ & > .el-submenu__title {
padding: 0 !important;
.svg-icon {
@@ -166,8 +167,8 @@
}
.el-menu--collapse {
- .el-sub-menu {
- & > .el-sub-menu__title {
+ .el-submenu {
+ & > .el-submenu__title {
& > span {
height: 0;
width: 0;
@@ -187,7 +188,7 @@
}
}
- .el-menu--collapse .el-menu .el-sub-menu {
+ .el-menu--collapse .el-menu .el-submenu {
min-width: $base-sidebar-width !important;
}
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 56f5a6b..a10941c 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -46,7 +46,7 @@
},
layout: {
type: String,
- default: 'total, sizes, prev, pager, next, jumper'
+ default: '->,total, sizes, prev, pager, next, jumper'
},
background: {
type: Boolean,
@@ -105,7 +105,7 @@
<style scoped>
.pagination-container {
- background: #fff;
+ background: #F3F7FC;
padding: 32px 16px;
}
.pagination-container.hidden {
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 8ee9d82..af96eeb 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,8 +1,5 @@
<template>
- <div
- :class="{ 'has-logo': showLogo }"
- :style="{ backgroundColor: variables.menuLightBackground }"
- >
+ <div :class="{ 'has-logo': showLogo }">
<!-- <logo v-if="showLogo" :collapse="isCollapse" /> -->
<div class="hamburger-container">
<div class="border">
@@ -22,7 +19,7 @@
<el-menu
:default-active="activeMenu"
:collapse="isCollapse"
- :background-color="variables.menuLightBackground"
+ background-color="#F3F7FC"
:text-color="variables.menuLightColor"
:unique-opened="true"
:active-text-color="settings.theme"
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 3d5c4ef..a4542d5 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -80,6 +80,7 @@
},
handleClickOutside() {
this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
+
}
}
}
diff --git a/src/router/index.js b/src/router/index.js
index caf7b3c..e0917a0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -100,7 +100,19 @@
meta: { title: '澶勭悊寰呭姙' }
}
]
- }
+ },
+ {
+ path: '/project',
+ component: Layout,
+ children: [
+ {
+ path: '/plan/index',
+ component: () => import('@/views/project/plan/index'),
+ name: 'Index',
+ meta: { title: '椤圭洰璁″垝' }
+ }
+ ]
+ },
]
// 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
diff --git a/src/views/project/plan/index.vue b/src/views/project/plan/index.vue
new file mode 100644
index 0000000..4093878
--- /dev/null
+++ b/src/views/project/plan/index.vue
@@ -0,0 +1,391 @@
+<template>
+ <div class="app-container">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form-item label="椤圭洰鍚嶇О" prop="projectName">
+ <el-input
+ v-model="queryParams.projectName"
+ placeholder="鏀寔妯＄硦鏌ヨ"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="椤圭洰浠ｇ爜" prop="projectCode">
+ <el-input
+ v-model="queryParams.projectCode"
+ placeholder="鏀寔妯＄硦鏌ヨ"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="涓婃姤鐘舵��" prop="reportStatus">
+ <el-select v-model="queryParams.reportStatus" @change="handleQuery" placeholder="璇烽�夋嫨鐘舵��" clearable>
+ <el-option label="宸蹭笂鎶�" value="0"></el-option>
+ <el-option label="鏈笂鎶�" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="瀹℃壒鐘舵��" prop="reportStatus">
+ <el-select placeholder="璇烽�夋嫨鐘舵��" clearable>
+ <el-option label="宸插鎵�" value="0"></el-option>
+ <el-option label="鏈鎵�" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="椤圭洰骞撮檺" prop="reportStatus">
+ <el-select placeholder="涓嬫媺閫夋嫨" clearable>
+ <el-option label="2024" value="2024"></el-option>
+ <el-option label="2025" value="2025"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="椤圭洰鏈堝害" prop="reportStatus">
+ <el-select placeholder="涓嬫媺閫夋嫨" clearable>
+ <el-option label="1鏈堝害" value="1"></el-option>
+ <el-option label="2鏈堝害" value="2"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="椤圭洰瀛ｅ害" prop="reportStatus">
+ <el-select placeholder="涓嬫媺閫夋嫨" clearable>
+ <el-option label="1瀛ｅ害" value="1"></el-option>
+ <el-option label="2瀛ｅ害" value="2"></el-option>
+ <el-option label="3瀛ｅ害" value="3"></el-option>
+ <el-option label="4瀛ｅ害" value="4"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ >鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleQuery"
+ >鏌ヨ</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleReset"
+ >閲嶇疆</el-button>
+ </el-col>
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="success"-->
+<!-- plain-->
+<!-- icon="el-icon-edit"-->
+<!-- size="mini"-->
+<!-- :disabled="single"-->
+<!-- @click="handleUpdate"-->
+<!-- v-hasPermi="['plan:record:edit']"-->
+<!-- >淇敼</el-button>-->
+<!-- </el-col>-->
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="danger"-->
+<!-- plain-->
+<!-- icon="el-icon-delete"-->
+<!-- size="mini"-->
+<!-- :disabled="multiple"-->
+<!-- @click="handleDelete"-->
+<!-- v-hasPermi="['plan:record:remove']"-->
+<!-- >鍒犻櫎</el-button>-->
+<!-- </el-col>-->
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="warning"-->
+<!-- plain-->
+<!-- icon="el-icon-download"-->
+<!-- size="mini"-->
+<!-- @click="handleExport"-->
+<!-- v-hasPermi="['plan:record:export']"-->
+<!-- >瀵煎嚭</el-button>-->
+<!-- </el-col>-->
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
+
+ <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column label="ID" align="center" prop="id" />
+ <el-table-column label="椤圭洰鍚嶇О" align="center" prop="projectName" />
+ <el-table-column label="涓婃姤鐘舵��" align="center" prop="reportStatus" >
+ <template slot-scope="scope">
+ {{ scope.row.reportStatus === 0 ? '宸蹭笂鎶�' : '鏈笂鎶�' }}
+ </template>
+ </el-table-column>
+ <el-table-column label="椤圭洰鐮�" align="center" prop="" />
+ <el-table-column label="椤圭洰浠ｇ爜" align="center" prop="projectCode" />
+ <el-table-column label="椤圭洰绫诲瀷" align="center" prop="projectType" >
+ <template slot-scope="scope">
+ {{
+ scope.row.projectType === 0 ? '鎴垮眿寤虹瓚' :
+ scope.row.projectType === 1 ? '鍩庡競鍩虹璁炬柦' :
+ scope.row.projectType === 2 ? '浜ら�氳繍杈�' :
+ scope.row.projectType === 3 ? '姘村埄' :
+ scope.row.projectType === 4 ? '鑳芥簮' :
+ scope.row.projectType === 5 ? '闈炵叅鐭垮北' :
+ scope.row.projectType === 6 ? '鍏朵粬' : '鏈煡'
+ }}
+ </template>
+ </el-table-column>
+ <el-table-column label="椤圭洰闃舵" align="center" prop="projectPhase" >
+ <template slot-scope="scope">
+ {{
+ scope.row.projectPhase === 0 ? '鍌ㄥ瑙勫垝闃舵' :
+ scope.row.projectPhase === 1 ? '椤圭洰鍓嶆湡闃舵' :
+ scope.row.projectPhase === 2 ? '瀹炴柦闃舵' :
+ scope.row.projectPhase === 3 ? '绔ｅ伐鎶曠敤闃舵' :
+ '鏈煡'
+ }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鏈堝害" align="center" prop="monthStatus" >
+ <template slot-scope="scope">
+ {{ scope.row.monthStatus === 0 ? '宸蹭笂鎶�' : '鏈笂鎶�' }}
+ </template>
+ </el-table-column>
+ <el-table-column label="瀛ｅ害" align="center" prop="seasonStatus" >
+ <template slot-scope="scope">
+ {{ scope.row.seasonStatus === 0 ? '宸蹭笂鎶�' : '鏈笂鎶�' }}
+ </template>
+ </el-table-column>
+ <el-table-column label="骞村害" align="center" prop="yearStatus" >
+ <template slot-scope="scope">
+ {{ scope.row.yearStatus === 0 ? '宸蹭笂鎶�' : '鏈笂鎶�' }}
+ </template>
+ </el-table-column>
+ <el-table-column label="椤圭洰鐘舵��" align="center" prop="projectStatus" >
+ <template slot-scope="scope">
+ {{
+ scope.row.projectStatus === 0 ? '鏈紑宸�' :
+ scope.row.projectStatus === 1 ? '宸插紑宸�' :
+ scope.row.projectStatus === 2 ? '宸茬宸�' :
+ scope.row.projectStatus === 3 ? '鏆傚仠' :
+ '鏈煡鐘舵��'
+ }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鎶曡祫绫诲埆" align="center" prop="investType" >
+ <template slot-scope="scope">
+ {{
+ scope.row.investType === 0 ? '浼佷笟鎶曡祫' :
+ scope.row.investType === 1 ? '鏀垮簻鎶曡祫' :
+ scope.row.investType === 2 ? '澶栧晢鎶曡祫' :
+ scope.row.investType === 3 ? '澧冨鎶曡祫' :
+ '鏈煡绫诲瀷'
+ }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ >鏌ョ湅</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ >淇敼</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ >鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
+ />
+
+<!-- <!– 娣诲姞鎴栦慨鏀归」鐩鍒掕褰曞璇濇 –>-->
+<!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>-->
+<!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">-->
+<!-- <el-form-item label="椤圭洰淇℃伅id" prop="projectInfoId">-->
+<!-- <el-input v-model="form.projectInfoId" placeholder="璇疯緭鍏ラ」鐩俊鎭痠d" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="椤圭洰璁″垝id" prop="planId">-->
+<!-- <el-input v-model="form.planId" placeholder="璇疯緭鍏ラ」鐩鍒抜d" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="宸ョ▼id" prop="engineeringInfoId">-->
+<!-- <el-input v-model="form.engineeringInfoId" placeholder="璇疯緭鍏ュ伐绋媔d" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="璁″垝鏈�" prop="planTime">-->
+<!-- <el-input v-model="form.planTime" placeholder="璇疯緭鍏ヨ鍒掓湡" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鏈堝害/瀛ｅ害/骞村害 0/1/2" prop="planTimeFlag">-->
+<!-- <el-input v-model="form.planTimeFlag" placeholder="璇疯緭鍏ユ湀搴�/瀛ｅ害/骞村害 0/1/2" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鎶曡祫" prop="actualInvest">-->
+<!-- <el-input v-model="form.actualInvest" placeholder="璇疯緭鍏ユ姇璧�" />-->
+<!-- </el-form-item>-->
+<!-- </el-form>-->
+<!-- <div slot="footer" class="dialog-footer">-->
+<!-- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>-->
+<!-- <el-button @click="cancel">鍙� 娑�</el-button>-->
+<!-- </div>-->
+<!-- </el-dialog>-->
+ </div>
+</template>
+
+<script>
+import { getList, getRecord, delRecord, addRecord, updateRecord } from "@/api/project/plan/index";
+
+export default {
+ name: "Record",
+ data() {
+ return {
+ // 閬僵灞�
+ loading: true,
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 鎬绘潯鏁�
+ total: 0,
+ // 椤圭洰璁″垝璁板綍琛ㄦ牸鏁版嵁
+ recordList: [],
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ },
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ }
+ };
+ },
+ created() {
+ this.getList();
+ },
+ methods: {
+ /** 鏌ヨ椤圭洰璁″垝璁板綍鍒楄〃 */
+ getList() {
+ this.loading = true;
+ getList(this.queryParams).then(response => {
+ this.recordList = response.data;
+ this.total = response.total;
+ this.loading = false;
+ });
+ },
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.open = false;
+ this.reset();
+ },
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ this.form = {
+ id: null,
+ projectInfoId: null,
+ planId: null,
+ engineeringInfoId: null,
+ planTime: null,
+ planTimeFlag: null,
+ createTime: null,
+ reportStatus: null,
+ actualInvest: null
+ };
+ this.resetForm("form");
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.getList();
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ this.ids = selection.map(item => item.id)
+ 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
+ getRecord(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) {
+ updateRecord(this.form).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ } else {
+ addRecord(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() {
+ return delRecord(ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ handleExport() {
+ this.download('plan/record/export', {
+ ...this.queryParams
+ }, `record_${new Date().getTime()}.xlsx`)
+ }
+ }
+};
+</script>
diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index 9abbf0d..96a5ae0 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">
@@ -45,7 +46,8 @@
</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">
+ <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>
@@ -54,19 +56,22 @@
</el-button>
</template>
<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"
+ size="small">
+ <el-option v-for="items in sys_project_type" :key="items.value" :label="items.label"
+ :value="items.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">
+ <el-option v-for="items in sys_key_categories" :key="items.value" :label="items.label"
+ :value="items.value"/>
</el-select>
</el-form-item>
</el-col>
@@ -74,15 +79,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">
+ <el-option v-for="items in sys_project_tags" :key="items.value" :label="items.label"
+ :value="items.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
+ placeholder="璇烽�夋嫨" class="select-option">
+ <el-option v-for="items in sys_project_status" :key="items.value" :label="items.label"
+ :value="items.value"/>
</el-select>
</el-form-item>
</el-col>
@@ -90,15 +98,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">
+ <el-option v-for="items in sys_project_code" :key="items.value" :label="items.label"
+ :value="items.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">
+ <el-option v-for="items in sys_association_status" :key="items.value" :label="items.label"
+ :value="items.value"/>
</el-select>
</el-form-item>
</el-col>
@@ -106,15 +116,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">
+ <el-option v-for="items in sys_funding_type" :key="items.value" :label="items.label"
+ :value="items.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">
+ <el-option v-for="items in sys_project_phases" :key="items.value" :label="items.label"
+ :value="items.value"/>
</el-select>
</el-form-item>
</el-col>
@@ -122,15 +134,17 @@
<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">
+ <el-option v-for="items in sys_investment_type" :key="items.value" :label="items.label"
+ :value="items.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">
+ <el-option v-for="items in sys_administrative_divisions" :key="items.value" :label="items.label"
+ :value="items.value"/>
</el-select>
</el-form-item>
</el-col>
@@ -138,7 +152,7 @@
<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 type="primary" @click="handleQuery">纭� 璁�</el-button>
<el-button @click="closePopover">鍙� 娑�</el-button>
</el-form-item>
</el-col>
@@ -148,11 +162,11 @@
</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>
@@ -167,9 +181,9 @@
:columns="columns"
@queryTable="handleQuery"
></VisibilityToolbar>
-<!-- @update:columns="handleUpdateColumns"-->
-<!-- @update:sort="handleUpdateSort"-->
-<!-- @update:resetSort="handleResetSort"-->
+ <!-- @update:columns="handleUpdateColumns"-->
+ <!-- @update:sort="handleUpdateSort"-->
+ <!-- @update:resetSort="handleResetSort"-->
</div>
</div>
</el-form>
@@ -177,11 +191,13 @@
<el-table
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" />
+ :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"
@@ -190,45 +206,62 @@
v-bind="item"
:min-width="item.minWidth"
>
- <template slot-scope="scope" v-if="item.slotName">
- <slot :name="item.slotName" :scope="scope"></slot>
+ <template slot-scope="scope">
+ <!-- 浣跨敤鍏峰悕鎻掓Ы -->
+ <template v-if="item.slotName">
+ <!-- projectStatus鎻掓Ы -->
+ <template v-if="item.slotName === 'projectStatus'">
+ <el-text class="mx-1">{{ '鑷畾涔夋牱寮�' }}</el-text>
+ </template>
+ <!-- projectColorCode鎻掓Ы -->
+ <template v-if="item.slotName === 'projectColorCode'">
+ <el-text class="mx-1 has-dot">{{ '鑷畾涔夋牱寮�' }}<span class="dot" style="margin-left: 5px"></span></el-text>
+ </template>
+ <!-- projectType鎻掓Ы -->
+ <template v-if="item.slotName === 'projectType'">
+ <el-text class="mx-1">{{ '鑷畾涔夋牱寮�' }}</el-text>
+ </template>
+ <!-- investType鎻掓Ы -->
+ <template v-if="item.slotName === 'investType'">
+ <el-text class="mx-1">{{ '鑷畾涔夋牱寮�' }}</el-text>
+ </template>
+ <!-- planStartTime鎻掓Ы -->
+ <template v-if="item.slotName === 'planStartTime'">
+ {{ '鑷畾涔夋牱寮�' }}
+ </template>
+ </template>
+ <!-- 榛樿鏄剧ず -->
+ <span v-else>{{ scope.row[item.id] }}</span>
</template>
</el-table-column>
</template>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+
+ <!-- 鎿嶄綔鍒� -->
+ <el-table-column label="鎿嶄綔" width="140" align="center" >
<template slot-scope="scope">
<el-button
- size="mini"
+ size="medium"
+ type="text"
+ icon="el-icon-view"
+ @click="handleDetail(scope.row)"
+ >
+ </el-button>
+ <el-button
+ size="medium"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['code:info:edit']"
- >淇敼</el-button>
+ >
+ </el-button>
<el-button
- size="mini"
+ size="medium"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['code:info:remove']"
- >鍒犻櫎</el-button>
+ >
+ </el-button>
</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>
<pagination
@@ -249,9 +282,10 @@
</template>
<script>
-import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/projectInfo";
-import { current } from './list';
+import {listInfo, getInfo, delInfo, addInfo, updateInfo} from "@/api/projectInfo";
+import {current} from './list';
import FileDialog from '../component/FileDialog';
+
export default {
name: "projectInfo",
components: {
@@ -280,12 +314,12 @@
// 鎬绘潯鏁�
total: 0,
// 椤圭洰绠＄悊鍩虹淇℃伅琛ㄦ牸鏁版嵁
- infoList: [],
+ projectInfoList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
- timeRange:[],
+ timeRange: [],
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -310,10 +344,10 @@
// 琛ㄥ崟鏍￠獙
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: "椤圭洰鐘舵�� (0鏈紑宸ワ紝1宸插紑宸ワ紝2宸茬宸ワ紝3鏆傚仠)涓嶈兘涓虹┖", trigger: "change"}
],
}
};
@@ -325,7 +359,7 @@
item.serialNumber = index + 1;
return item;
});
- this.getList();
+ this.getList();
},
methods: {
// 鍏抽棴鏂囦欢澶勭悊寮规鐨勬柟娉�
@@ -338,15 +372,19 @@
handlePopover() {
this.popoverValue.value = !this.popoverValue.value;
},
+ closePopover() {
+
+ this.popoverValue.value = false;
+ },
/** 鏌ヨ椤圭洰绠＄悊鍩虹淇℃伅鍒楄〃 */
getList() {
this.loading = true;
console.log("鏌ヨ")
- // listInfo(this.queryParams).then(response => {
- // this.infoList = response.rows;
- // this.total = response.total;
- // });
- this.loading = false;
+ listInfo(this.queryParams).then(response => {
+ this.projectInfoList = response.data;
+ this.total = response.total;
+ });
+ this.loading = false;
},
// 鍙栨秷鎸夐挳
cancel() {
@@ -407,7 +445,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
+ this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 鏂板鎸夐挳鎿嶄綔 */
@@ -449,12 +487,13 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
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() {
@@ -471,9 +510,10 @@
};
</script>
<style lang="scss" scoped>
- .select-option {
+.select-option {
width: 140px;
}
+
.slot {
display: flex;
}
@@ -485,6 +525,7 @@
.right-section {
display: flex;
margin-left: auto;
+
.add-btn {
margin: 0 10px;
}
--
Gitblit v1.8.0