From 39b926f58718ba6e27d7ca27b9f0623ff78318e1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 22 二月 2025 17:23:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectEngineering/projectLibrary/index.vue | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index 6528a10..b4b9fc1 100644
--- a/src/views/projectEngineering/projectLibrary/index.vue
+++ b/src/views/projectEngineering/projectLibrary/index.vue
@@ -224,6 +224,14 @@
<template v-if="item.slotName === 'projectType'">
<dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/>
</template>
+ <!-- projectSubType鎻掓Ы -->
+ <template v-if="item.slotName === 'attractInvestment'">
+ <dict-tag :options="dict.type.sys_project_type" :value="scope.row.attractInvestment"/>
+ </template>
+ <!-- constructionNature鎻掓Ы -->
+ <template v-if="item.slotName === 'constructionNature'">
+ <dict-tag :options="dict.type.construction_nature" :value="scope.row.constructionNature"/>
+ </template>
<!-- investType鎻掓Ы -->
<template v-if="item.slotName === 'investType'">
<dict-tag :options="dict.type.sys_investment_type" :value="scope.row.investType"/>
@@ -251,7 +259,7 @@
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="瀹℃牳" placement="top">
<el-button
- v-if="scope.row.auditRole && $route.query.projectCategory==='6'"
+ v-if="scope.row.auditRole && $route.query.projectCategory==='6' && scope.row.usedStatus === 1"
size="medium"
type="text"
icon="el-icon-circle-check"
@@ -317,11 +325,12 @@
import {current, currentRest} from '@/views/projectEngineering/projectLibrary/list';
import FileDialog from '@/views/projectEngineering/projectLibrary/component/FileDialog';
import Cookies from "js-cookie";
+import {getChildList} from "@/api/system/dict/data";
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_used_status'],
+ 'sys_project_tags', 'sys_key_categories', 'sys_project_type','sys_used_status', 'construction_nature', 'attract_investment'],
name: "ProjectInfo",
components: {
FileDialog
@@ -423,6 +432,24 @@
this.removeStore();
},
methods: {
+ // async getProjectSubType(projectType, projectSubType) {
+ // if (!projectType || !projectSubType) {
+ // return ''
+ // }
+ // let value = '';
+ // // 鏍规嵁椤圭洰绫诲瀷鏌ュ瓙绫诲瀷
+ // const projectTypeItem = this.dict.type.sys_project_type.find(item => item.raw.dictValue === projectType);
+ // if (projectTypeItem) {
+ // const res = await getChildList(projectTypeItem.raw.dictCode);
+ // const target = res.data.filter(item => item.dictValue === projectSubType);
+ // if (target && target.length > 0) {
+ // value = target[0].dictLabel;
+ // console.log(value);
+ // }
+ // }
+ // console.log("鎷垮埌鍊间簡", value);
+ // return value;
+ // },
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.removeStore();
--
Gitblit v1.8.0