From 7adbf0551f6a6b307e66cdd6537ab45fc5a2bf11 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 29 十一月 2024 04:00:10 +0800
Subject: [PATCH] bug修复和页面查询
---
src/views/projectEngineering/projectLibrary/index.vue | 98 +++++++++++++++++++++++--------------------------
1 files changed, 46 insertions(+), 52 deletions(-)
diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index 7584bc8..5bf5bf6 100644
--- a/src/views/projectEngineering/projectLibrary/index.vue
+++ b/src/views/projectEngineering/projectLibrary/index.vue
@@ -29,10 +29,10 @@
<el-date-picker
style="width: 270px"
size="small"
- v-model="queryParams[timeRange]"
+ v-model="timeRange"
type="daterange"
range-separator="-"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
@change="handleQuery"
@@ -192,7 +192,6 @@
<!-- 鍔ㄦ�佸垪 -->
<el-table-column
v-for="item in columns"
- :key="item.id"
v-if="item.visible"
:prop="item.id"
:label="item.label"
@@ -203,23 +202,23 @@
<template v-if="item.slotName">
<!-- projectStatus鎻掓Ы -->
<template v-if="item.slotName === 'projectStatus'">
- <div class="mx-1">{{ '鑷畾涔夋牱寮�' }}</div>
+ <dict-tag :options="dict.type.sys_project_status" :value="scope.row.projectStatus"/>
</template>
<!-- projectColorCode鎻掓Ы -->
<template v-if="item.slotName === 'projectColorCode'">
- <div class="mx-1 has-dot">{{ '鑷畾涔夋牱寮�' }}<span class="dot" style="margin-left: 5px"></span></div>
+ <dict-tag :options="dict.type.sys_project_code" :value="scope.row.projectColorCode"/>
</template>
<!-- projectType鎻掓Ы -->
<template v-if="item.slotName === 'projectType'">
- <div class="mx-1">{{ '鑷畾涔夋牱寮�' }}</div>
+ <dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/>
</template>
<!-- investType鎻掓Ы -->
<template v-if="item.slotName === 'investType'">
- <div class="mx-1">{{ '鑷畾涔夋牱寮�' }}</div>
+ <dict-tag :options="dict.type.sys_investment_type" :value="scope.row.investType"/>
</template>
- <!-- planStartTime鎻掓Ы -->
+ <!-- planStartTime -->
<template v-if="item.slotName === 'planStartTime'">
- {{ '鑷畾涔夋牱寮�' }}
+ {{ scope.row.planStartTime ? scope.row.planStartTime.split('-')[0] + '骞�' : '' }}
</template>
</template>
<!-- 榛樿鏄剧ず -->
@@ -275,15 +274,15 @@
</template>
<script>
-import {listInfo, getInfo, delInfo, addInfo, updateInfo} from "@/api/projectInfo";
+import {listProject, getProject, delProject, addProject, updateProject} from "@/api/projectEngineering/projectInfo";
import {current, currentRest} from '@/views/projectEngineering/projectLibrary/list';
-import FileDialog from '@/views/projectEngineering/component/FileDialog';
-
+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",
+ name: "ProjectInfo",
components: {
FileDialog
},
@@ -326,6 +325,8 @@
pageSize: 10,
projectName: null,
projectCode: null,
+ projectStartTime: null,
+ projectEndTime: null,
},
moreQueryParams: {
projectType: '', // 椤圭洰绫诲瀷
@@ -370,10 +371,32 @@
this.defaultColumns = JSON.parse(JSON.stringify(columns));
this.getList();
},
+ beforeDestroy() {
+ this.removeStore();
+ },
methods: {
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate(row) {
+ this.removeStore();
+ this.$router.push({ path: '/projectEngineering/project/ProjectDetails', query: { projectId: row.id }});
+ },
+ handleDetail(row) {
+ this.removeStore();
+ this.$router.push({ path: '/projectEngineering/project/ProjectDetails', query: { projectId: row.id }});
+ },
// 鏂板椤甸潰
add() {
- this.$router.push({ path: '/projectEngineering/project/projectDetails' });
+ this.removeStore();
+ this.$router.push({ path: '/projectEngineering/project/ProjectDetails' });
+ },
+ //娓呯悊缂撳瓨
+ removeStore() {
+ localStorage.removeItem("projectForm")
+ localStorage.removeItem("investmentForm")
+ localStorage.removeItem("investmentFundsForm")
+ localStorage.removeItem("legalPersonForm")
+ localStorage.removeItem("policyInfoForm")
+ localStorage.removeItem("documentsInfoForm")
},
// 閲嶇疆鎺掑簭鐨勬柟娉�
handleResetSort() {
@@ -432,11 +455,16 @@
/** 鏌ヨ椤圭洰绠＄悊鍩虹淇℃伅鍒楄〃 */
getList() {
this.loading = true;
- listInfo(this.queryParams).then(response => {
+ this.queryParams.projectCategory = this.$route.query.projectCategory;
+ if(this.timeRange){
+ this.queryParams.projectStartTime = this.timeRange[0]
+ this.queryParams.projectEndTime = this.timeRange[1]
+ }
+ listProject(this.queryParams).then(response => {
this.projectInfoList = response.data;
this.total = response.total;
+ this.loading = false;
});
- this.loading = false;
},
// 鍙栨秷鎸夐挳
cancel() {
@@ -500,42 +528,8 @@
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;
--
Gitblit v1.8.0