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 | 375 +++++++++++++++++++++++++++++++--------------------- 1 files changed, 222 insertions(+), 153 deletions(-) diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue index 96a5ae0..8979528 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" @@ -44,34 +44,26 @@ <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="queryParams"> <el-row> <el-col :span="12"> <el-form-item label="椤圭洰绫诲瀷"> <el-select v-model="queryParams.projectType" clearable placeholder="璇烽�夋嫨" class="select-option" + @change="handleQuery" size="small"> - <el-option v-for="items in sys_project_type" :key="items.value" :label="items.label" - :value="items.value"/> + <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="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 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> @@ -79,18 +71,20 @@ <el-row> <el-col :span="12"> <el-form-item label="椤圭洰鏍囩"> - <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 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" placeholder="璇烽�夋嫨" class="select-option"> - <el-option v-for="items in sys_project_status" :key="items.value" :label="items.label" - :value="items.value"/> + <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> @@ -98,17 +92,19 @@ <el-row> <el-col :span="12"> <el-form-item label="椤圭洰鐮�"> - <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 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> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="鍏宠仈鐘舵��"> - <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 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> @@ -116,17 +112,19 @@ <el-row> <el-col :span="12"> <el-form-item label="璧勯噾绫诲瀷"> - <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 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="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 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> @@ -134,30 +132,33 @@ <el-row> <el-col :span="12"> <el-form-item label="鎶曡祫绫诲埆"> - <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 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="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 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="handleQuery">纭� 璁�</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"> @@ -166,78 +167,87 @@ <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="columns" + :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="projectInfoList" @selection-change="handleSelectionChange" - height="60vh" - :show-overflow-tooltip="true"> + height="100%" + sortable="custom" + > <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"> - <!-- 浣跨敤鍏峰悕鎻掓Ы --> - <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> + <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"> + <!-- 浣跨敤鍏峰悕鎻掓Ы --> + <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> - <!-- 榛樿鏄剧ず --> - <span v-else>{{ scope.row[item.id] }}</span> + <!-- 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'"> + <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> + <!-- 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> - </el-table-column> - </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" @@ -247,6 +257,8 @@ > </el-button> <el-button + v-if="isReserve" + v-hasRole="['user']" size="medium" type="text" icon="el-icon-edit" @@ -254,6 +266,7 @@ > </el-button> <el-button + v-if="isReserve" size="medium" type="text" icon="el-icon-delete" @@ -267,7 +280,7 @@ <pagination v-show="total>0" :total="total" - :page.sync="queryParams.pageNum" + :page.sync="queryParams.currentPage" :limit.sync="queryParams.pageSize" @pagination="getList" /> @@ -277,17 +290,22 @@ :isImportOrExport="isImportOrExport" @fileDialogCancel="fileDialogCancel" :currentColumns="columns" + :dataIdList="ids" /> </div> </template> <script> -import {listInfo, getInfo, delInfo, addInfo, updateInfo} from "@/api/projectInfo"; -import {current} from './list'; -import FileDialog from '../component/FileDialog'; +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 { - name: "projectInfo", + 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_used_status'], + name: "ProjectInfo", components: { FileDialog }, @@ -297,8 +315,11 @@ fileDialogVisible: false, //鏄惁闇�瑕佹柊澧炴寜閽�(鍌ㄨ搫椤圭洰闇�瑕�) isReserve: false, + //椤圭洰鐘舵�佺瓫閫夋潯浠� + isProjectCategory: false, //琛ㄥご columns: [], + defaultColumns: [], //鎺у埗鏇村绛涢�夋樉闅� popoverValue: false, // 閬僵灞� @@ -318,20 +339,23 @@ // 寮瑰嚭灞傛爣棰� title: "", // 鏄惁鏄剧ず寮瑰嚭灞� + tableKey: 0, open: false, timeRange: [], // 鏌ヨ鍙傛暟 queryParams: { - pageNum: 1, + currentPage: 1, pageSize: 10, projectName: null, projectCode: null, + projectStartTime: null, + projectEndTime: null, }, moreQueryParams: { projectType: '', // 椤圭洰绫诲瀷 importanceType: '', // 閲嶇偣鍒嗙被 projectStatus: '', // 椤圭洰鐘舵�� - projectColorCode: '', // 椤圭洰鐮� + coding: '', // 椤圭洰鐮� investmentType: '', // 璧勯噾绫诲瀷 projectPhase: '', // 椤圭洰闃舵 investType: '', // 鎶曡祫绫诲埆 @@ -347,21 +371,99 @@ {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) => { + this.queryParams.importanceType = this.$route.query.importanceType; + const projectCategory = this.$route.query.projectCategory; + if (!projectCategory || projectCategory === '1' || projectCategory === '6') { + 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.columns = columns; + 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(); + 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'}); + }, + //娓呯悊缂撳瓨 + removeStore() { + localStorage.removeItem("projectForm") + localStorage.removeItem("investmentForm") + localStorage.removeItem("investmentFundsForm") + localStorage.removeItem("legalPersonForm") + localStorage.removeItem("policyInfoForm") + localStorage.removeItem("documentsInfoForm") + }, + // 閲嶇疆鎺掑簭鐨勬柟娉� + 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; @@ -370,21 +472,24 @@ this.tableLoading = false; }, handlePopover() { - this.popoverValue.value = !this.popoverValue.value; + this.popoverValue = true; }, closePopover() { - - this.popoverValue.value = false; + this.popoverValue = false; }, /** 鏌ヨ椤圭洰绠$悊鍩虹淇℃伅鍒楄〃 */ getList() { this.loading = true; - console.log("鏌ヨ") - 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() { @@ -434,7 +539,7 @@ }, /** 鎼滅储鎸夐挳鎿嶄綔 */ handleQuery() { - this.queryParams.pageNum = 1; + this.queryParams.currentPage = 1; this.getList(); }, /** 閲嶇疆鎸夐挳鎿嶄綔 */ @@ -448,47 +553,12 @@ 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 () { - return delInfo(ids); + this.$modal.confirm('鏄惁纭鍒犻櫎椤圭洰:"' + row.projectName + '"鐨勬暟鎹」锛�').then(function () { + return delProject(ids); }).then(() => { this.getList(); this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); @@ -502,16 +572,15 @@ }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { - this.download('code/info/export', { - ...this.queryParams - }, `info_${new Date().getTime()}.xlsx`) + this.isImportOrExport = true; + this.fileDialogVisible = true; } } }; </script> <style lang="scss" scoped> .select-option { - width: 140px; + width: 100%; } .slot { -- Gitblit v1.8.0