From e57e645d24a89adb3391be16f6948b292183fa04 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 11 二月 2025 14:02:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectEngineering/projectLibrary/index.vue | 102 +++++++++++++++++++++++++++++++-------------------
1 files changed, 63 insertions(+), 39 deletions(-)
diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index 46f2d62..8979528 100644
--- a/src/views/projectEngineering/projectLibrary/index.vue
+++ b/src/views/projectEngineering/projectLibrary/index.vue
@@ -50,7 +50,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="椤圭洰绫诲瀷">
- <el-select v-model="queryParams.projectType" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery"
+ <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"/>
@@ -59,7 +60,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="閲嶇偣鍒嗙被">
- <el-select v-model="queryParams.importanceType" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <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>
@@ -69,7 +71,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="椤圭洰鏍囩">
- <el-select v-model="queryParams.tag" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <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>
@@ -77,7 +80,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="椤圭洰鐘舵��">
- <el-select v-model="queryParams.projectStatus" :disabled="isProjectCategory" clearable @change="handleQuery"
+ <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"/>
@@ -88,7 +92,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="椤圭洰鐮�">
- <el-select v-model="queryParams.projectColorCode" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <el-select v-model="queryParams.coding" 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>
@@ -96,7 +101,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="鍏宠仈鐘舵��">
- <el-select v-model="queryParams.assignmentStatus" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <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>
@@ -106,7 +112,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="璧勯噾绫诲瀷">
- <el-select v-model="queryParams.investmentType" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <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>
@@ -114,7 +121,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="椤圭洰闃舵">
- <el-select v-model="queryParams.projectPhase" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <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>
@@ -124,7 +132,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="鎶曡祫绫诲埆">
- <el-select v-model="queryParams.investType" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <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>
@@ -132,15 +141,17 @@
</el-col>
<el-col :span="12">
<el-form-item label="琛屾斂鍖哄垝">
- <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"
+ <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-form>
- <el-button style="margin-right: 16px; margin-top: 1px; color: #3369ff" slot="reference"
+ <el-button style="margin-right: 16px; margin-top: 1px; color: #3369ff" slot="reference"
size="small">
鏇村绛涙煡鏉′欢
<span style="margin-left: 5px">
@@ -185,13 +196,14 @@
v-loading="loading"
:data="projectInfoList"
@selection-change="handleSelectionChange"
- height="60vh"
+ height="100%"
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"
@@ -204,9 +216,9 @@
<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"/>
+ <!-- coding鎻掓Ы -->
+ <template v-if="item.slotName === 'coding'">
+ <dict-tag :options="dict.type.sys_project_code" :value="scope.row.coding"/>
</template>
<!-- projectType鎻掓Ы -->
<template v-if="item.slotName === 'projectType'">
@@ -216,18 +228,26 @@
<template v-if="item.slotName === 'investType'">
<dict-tag :options="dict.type.sys_investment_type" :value="scope.row.investType"/>
</template>
+ <!-- investType鎻掓Ы -->
+ <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] + '骞�' : '' }}
+ </template>
+ <!-- usedStatus鎻掓Ы -->
+ <template v-if="item.slotName === 'usedStatus'">
+ <dict-tag :options="dict.type.sys_used_status" :value="scope.row.usedStatus"/>
</template>
</template>
<!-- 榛樿鏄剧ず -->
<span v-else>{{ scope.row[item.id] }}</span>
</template>
</el-table-column>
-
+ <el-table-column v-if="this.$route.query.projectCategory==6" label="瀹℃牳澶囨敞" width="140" align="center" prop="remark"/>
<!-- 鎿嶄綔鍒� -->
- <el-table-column label="鎿嶄綔" width="140" align="center" >
+ <el-table-column label="鎿嶄綔" width="140" align="center">
<template slot-scope="scope">
<el-button
size="medium"
@@ -238,6 +258,7 @@
</el-button>
<el-button
v-if="isReserve"
+ v-hasRole="['user']"
size="medium"
type="text"
icon="el-icon-edit"
@@ -259,7 +280,7 @@
<pagination
v-show="total>0"
:total="total"
- :page.sync="queryParams.pageNum"
+ :page.sync="queryParams.currentPage"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
@@ -269,6 +290,7 @@
:isImportOrExport="isImportOrExport"
@fileDialogCancel="fileDialogCancel"
:currentColumns="columns"
+ :dataIdList="ids"
/>
</div>
</template>
@@ -278,10 +300,11 @@
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'],
+ 'sys_project_tags', 'sys_key_categories', 'sys_project_type','sys_used_status'],
name: "ProjectInfo",
components: {
FileDialog
@@ -321,7 +344,7 @@
timeRange: [],
// 鏌ヨ鍙傛暟
queryParams: {
- pageNum: 1,
+ currentPage: 1,
pageSize: 10,
projectName: null,
projectCode: null,
@@ -332,7 +355,7 @@
projectType: '', // 椤圭洰绫诲瀷
importanceType: '', // 閲嶇偣鍒嗙被
projectStatus: '', // 椤圭洰鐘舵��
- projectColorCode: '', // 椤圭洰鐮�
+ coding: '', // 椤圭洰鐮�
investmentType: '', // 璧勯噾绫诲瀷
projectPhase: '', // 椤圭洰闃舵
investType: '', // 鎶曡祫绫诲埆
@@ -354,11 +377,12 @@
};
},
created() {
+ this.queryParams.importanceType = this.$route.query.importanceType;
const projectCategory = this.$route.query.projectCategory;
- if(!projectCategory || projectCategory === '1'){
+ if (!projectCategory || projectCategory === '1' || projectCategory === '6') {
this.isReserve = true;
}
- if(projectCategory){
+ if (projectCategory) {
this.isProjectCategory = true;
}
const columns = current.map((item, index) => {
@@ -378,16 +402,17 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.removeStore();
- this.$router.push({ path: '/projectEngineering/project/ProjectDetails', query: { projectId: row.id }});
+ 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 }});
+ const audit = this.$route.query.projectCategory==='6'? 1:0
+ this.$router.push({path: '/projectEngineering/project/ProjectDetails', query: {projectId: row.id,disabled: 'true',audit: audit }});
},
// 鏂板椤甸潰
add() {
this.removeStore();
- this.$router.push({ path: '/projectEngineering/project/ProjectDetails' });
+ this.$router.push({path: '/projectEngineering/project/ProjectDetails'});
},
//娓呯悊缂撳瓨
removeStore() {
@@ -413,7 +438,7 @@
return item;
});
//寮哄埗table娓叉煋
- this.tableKey = this.tableKey +1;
+ this.tableKey = this.tableKey + 1;
},
// 鏇存柊鍒楃殑鏂规硶
handleUpdateColumns(row) {
@@ -426,7 +451,7 @@
});
},
handleUpdateSort(row) {
- console.log( this.columns, '鎺掑簭鍓嶇殑鍒�');
+ console.log(this.columns, '鎺掑簭鍓嶇殑鍒�');
this.columns = this.columns.map(item => {
if (item.key === row.key) {
return row;
@@ -436,8 +461,8 @@
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, '鎺掑簭鍚庣殑鍒�');
+ this.tableKey = this.tableKey + 1;
+ console.log(this.columns, '鎺掑簭鍚庣殑鍒�');
},
// 鍏抽棴鏂囦欢澶勭悊寮规鐨勬柟娉�
fileDialogCancel() {
@@ -456,7 +481,7 @@
getList() {
this.loading = true;
this.queryParams.projectCategory = this.$route.query.projectCategory;
- if(this.timeRange){
+ if (this.timeRange) {
this.queryParams.projectStartTime = this.timeRange[0]
this.queryParams.projectEndTime = this.timeRange[1]
}
@@ -514,7 +539,7 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
- this.queryParams.pageNum = 1;
+ this.queryParams.currentPage = 1;
this.getList();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
@@ -532,8 +557,8 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎椤圭洰绠＄悊鍩虹淇℃伅缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
- return delInfo(ids);
+ this.$modal.confirm('鏄惁纭鍒犻櫎椤圭洰:"' + row.projectName + '"鐨勬暟鎹」锛�').then(function () {
+ return delProject(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
@@ -547,9 +572,8 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- this.download('code/info/export', {
- ...this.queryParams
- }, `info_${new Date().getTime()}.xlsx`)
+ this.isImportOrExport = true;
+ this.fileDialogVisible = true;
}
}
};
--
Gitblit v1.8.0