From 84a14c24edf92f7072e50b51ee37143d658ecfd4 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 11 三月 2025 14:28:09 +0800
Subject: [PATCH] 项目库展示总年度投资金额
---
src/views/projectEngineering/projectLibrary/component/BasicInfo.vue | 239 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 153 insertions(+), 86 deletions(-)
diff --git a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
index 4bd25d8..350d4d6 100644
--- a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
+++ b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
@@ -5,7 +5,7 @@
<div style="font-size: small;margin-bottom: 10px">鍩虹淇℃伅锛�</div>
<div>
<el-row :gutter="20">
- <el-col :span="6">
+ <el-col :span="10">
<el-form-item class="item" label="椤圭洰鍚嶇О" label-width="100px" prop="projectName">
<el-input v-model.trim="projectForm.projectName" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�"/>
</el-form-item>
@@ -16,7 +16,7 @@
placeholder="璇疯緭鍏�"/>
</el-form-item>
</el-col>
- <el-col :span="5">
+ <el-col :span="3">
<el-form-item class="item" label="璧嬬爜" label-width="50px" prop="coding">
<template slot-scope="scope">
<!-- <div class="yellow-dot" v-if="scope.row.coding === 'yellow'"></div>-->
@@ -27,7 +27,7 @@
</el-form-item>
</el-col>
- <el-col :span="7">
+ <el-col :span="5">
<el-form-item label="鏍囩" label-width="50px" prop="tag">
<template slot-scope="scope">
<tag-list :tag-list="tagList" ref="tagList" @getTags="getTagList"></tag-list>
@@ -36,9 +36,9 @@
</el-col>
</el-row>
<el-row :gutter="20">
- <el-col :span="12">
+ <el-col :span="24">
<el-form-item class="item" label="寤鸿鍐呭" label-width="100px" prop="content">
- <el-input v-model.trim="projectForm.content" style="width: 100%;" clearable maxlength="255"
+ <el-input v-model.trim="projectForm.content" style="width: 100%;" :rows="4" maxlength="1000"
placeholder="璇疯緭鍏�" type="textarea"/>
</el-form-item>
</el-col>
@@ -48,14 +48,14 @@
<el-row :gutter="20">
<el-col :span="6">
- <el-form-item label="璧勯噾绫诲瀷" label-width="100px" style="width: 100%">
+ <el-form-item label="璧勯噾绫诲瀷" label-width="100px" prop="fundTypeList" style="width: 100%">
<el-select
v-model="projectForm.fundTypeList"
clearable
:multiple="true"
placeholder="璇烽�夋嫨"
style="width: 100%"
- collapse-tags>
+ >
<el-option v-for="item in dict.type.sys_funding_type" :key="item.value" :label="item.label"
:value="item.value"/>
</el-select>
@@ -119,8 +119,8 @@
<!-- </el-col>-->
<el-col :span="6">
- <el-form-item label="椤圭洰鐘舵��" label-width="100px" prop="projectstatus" style="width: 100%">
- <el-select v-model="projectForm.projectStatus" clearable placeholder="璇烽�夋嫨" @change="handleProjectStatusChange" style="width: 100%">
+ <el-form-item label="椤圭洰鐘舵��" label-width="100px" prop="projectStatus" style="width: 100%">
+ <el-select v-model="projectForm.projectStatus" clearable placeholder="璇烽�夋嫨" style="width: 100%">
<el-option v-for="item in dict.type.sys_project_status" :key="item.value" :label="item.label"
:value="item.value"/>
</el-select>
@@ -149,19 +149,18 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鑱旂郴鏂瑰紡" label-width="100px" prop="contact" style="width: 100%">
+ <el-form-item label="椤圭洰鑱旂郴鏂瑰紡" label-width="100px" prop="contact" style="width: 100%">
<el-input v-model.trim="projectForm.contact" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�"/>
</el-form-item>
</el-col>
<el-col :span="6">
- <!-- TODO锛氭殏鏃朵笉鍋� -->
- <el-form-item label="椤圭洰涓氫富鍗曚綅" label-width="100px" prop="engineering" style="width: 100%">
+ <el-form-item label="椤圭洰涓氫富鍗曚綅" label-width="100px" prop="projectOwnerUnit" style="width: 100%">
<!-- <el-input v-model.trim="getEngineeringName" class="item" clearable disabled maxlength="255" placeholder="璇峰湪宸ョ▼涓�夋嫨椤圭洰" />-->
<!-- <el-select v-model="projectForm.engineeringIdList" :multiple="true" collapse-tags placeholder="璇烽�夋嫨"-->
<!-- style="width: 100%">-->
<!-- <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="閫夋嫨涓婄骇閮ㄩ棬" />-->
- <treeselect v-model="projectForm.projectOwnerUnit" :options="selectOptions" :normalizer="normalizer" placeholder="閫夋嫨鍗曚綅" />
+ <treeselect v-model="projectForm.projectOwnerUnit" :disabled="disabled" :options="selectOptions" @input="getProjectOwnerUnit" noChildrenText="鏃犲尮閰嶆暟鎹�" :normalizer="normalizer" placeholder="閫夋嫨鍗曚綅" />
<!-- <RemoteSelect v-if="selectOptions.length" :hasMore="hasMore" :loading="loading" :page="page" @loadMore="handleLoadMore" />-->
<!-- </el-select>-->
</el-form-item>
@@ -169,24 +168,41 @@
</el-row>
<el-row :gutter="20">
<el-col :span="6">
- <el-form-item label="涓荤閮ㄩ棬" label-width="100px" prop="competentDepartmentList" style="width: 100%">
+ <el-form-item label="涓荤閮ㄩ棬" label-width="100px" prop="competentDepartment" style="width: 100%">
+ <treeselect v-model="competentDepartment" :disabled="disabled" @input="getCompetentDepartmentInfo" noChildrenText="鏃犲尮閰嶆暟鎹�" :options="approvalList" :normalizer="normalizer" placeholder="閫夋嫨鍗曚綅" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="涓荤閮ㄩ棬鑱旂郴浜�" prop="competentDepartmentPerson" label-width="140px" style="width: 100%">
<el-select
- v-model="projectForm.competentDepartmentList"
+ v-model="projectForm.competentDepartmentPerson"
clearable
- :multiple="true"
+ filterable
+ allow-create
placeholder="璇烽�夋嫨"
- style="width: 100%"
- collapse-tags
+ @change="handleDeptContactChange"
+ style="width: 100%;"
>
<el-option
- v-for="item in approvalList"
- :key="item.id"
- :value="item.id"
- :label="item.value"
+ v-for="person in deptPersonList"
+ :key="person.userId"
+ :value="person.userId"
+ :label="person.nickName"
/>
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="涓荤閮ㄩ棬鑱旂郴鏂瑰紡" prop="competentDepartmentPhone" label-width="140px" style="width: 100%">
+ <el-input
+ v-model="projectForm.competentDepartmentPhone"
+ clearable
+ placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
<el-col :span="6">
<el-form-item label="琛屾斂鍖哄垝" label-width="100px" prop="area" style="width: 100%">
<el-select
@@ -201,14 +217,13 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="绠$悊褰掑彛" label-width="100px" style="width: 100%">
+ <el-form-item label="绠$悊褰掑彛" prop="managementCentralizationList" label-width="100px" style="width: 100%">
<el-select
v-model="projectForm.managementCentralizationList"
clearable
:multiple="true"
placeholder="璇烽�夋嫨"
style="width: 100%"
- collapse-tags
>
<el-option v-for="item in dict.type.sys_centralized_management" :key="item.value" :label="item.label"
:value="item.value"/>
@@ -218,7 +233,7 @@
</el-row>
<el-row :gutter="20">
<el-col :span="6">
- <el-form-item label="椤圭洰瀹℃壒绫诲瀷" label-width="100px" style="width: 100%">
+ <el-form-item label="椤圭洰瀹℃壒绫诲瀷" prop="projectApprovalType" label-width="100px" style="width: 100%">
<el-select
v-model="projectForm.projectApprovalType"
clearable
@@ -231,29 +246,24 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鎶曡祫绫诲埆" label-width="100px" style="width: 100%">
+ <el-form-item label="鎶曡祫绫诲埆" prop="largeCategory" label-width="100px" style="width: 100%">
<el-input v-model="largeCategory" clearable disabled placeholder="璇烽�夋嫨澶х被" style="width: 49%"/>
<el-input v-model="subclass" clearable disabled placeholder="璇烽�夋嫨灏忕被" style="width: 49%;margin-left: 2%"/>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="閲嶇偣鍒嗙被" label-width="100px" style="width: 100%">
+ <el-form-item label="閲嶇偣鍒嗙被" prop="importanceTypeList" label-width="100px" style="width: 100%">
<el-select
v-model="projectForm.importanceTypeList"
- clearable
:multiple="true"
placeholder="璇烽�夋嫨"
style="width: 100%"
- collapse-tags
>
<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>
-
-
-
</el-row>
<el-row :gutter="20">
@@ -267,7 +277,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="璁″垝寮�宸ユ椂闂�" label-width="100px" style="width: 100%">
+ <el-form-item label="璁″垝寮�宸ユ椂闂�" prop="planStartTime" label-width="100px" style="width: 100%">
<el-date-picker v-model="projectForm.planStartTime "
placeholder="閫夋嫨鏃堕棿"
style="width: 100%"
@@ -276,7 +286,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="璁″垝绔e伐鏃堕棿" label-width="100px" style="width: 100%">
+ <el-form-item label="璁″垝绔e伐鏃堕棿" prop="planCompleteTime" label-width="100px" style="width: 100%">
<el-date-picker v-model="projectForm.planCompleteTime "
placeholder="閫夋嫨鏃堕棿"
style="width: 100%"
@@ -288,27 +298,16 @@
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="琛屼笟涓荤閮ㄩ棬" label-width="100px" prop="industryCompetentDepartment" style="width: 100%">
- <el-select
- v-model="projectForm.industryCompetentDepartment"
- clearable
- @change="handleDepartmentChange"
- placeholder="璇烽�夋嫨"
- style="width: 100%;"
- >
- <el-option
- v-for="item in approvalList"
- :key="item.id"
- :value="item.id"
- :label="item.value"
- />
- </el-select>
+ <treeselect v-model="industryCompetentDepartment" :disabled="disabled" noChildrenText="鏃犲尮閰嶆暟鎹�" @input="getIndustryCompetentDepartmentInfo" :options="approvalList" :normalizer="normalizer" placeholder="閫夋嫨鍗曚綅" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="琛屼笟涓荤閮ㄩ棬鑱旂郴浜�" label-width="160px" style="width: 100%">
+ <el-form-item label="琛屼笟涓荤閮ㄩ棬鑱旂郴浜�" prop="industryCompetentDepartmentPerson" label-width="160px" style="width: 100%">
<el-select
v-model="projectForm.industryCompetentDepartmentPerson"
clearable
+ filterable
+ allow-create
placeholder="璇烽�夋嫨"
@change="handleContactChange"
style="width: 100%;"
@@ -323,7 +322,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="琛屼笟涓荤閮ㄩ棬鑱旂郴鏂瑰紡" label-width="160px" style="width: 100%">
+ <el-form-item label="琛屼笟涓荤閮ㄩ棬鑱旂郴鏂瑰紡" prop="departmentPersonPhone" label-width="160px" style="width: 100%">
<el-input
v-model="projectForm.departmentPersonPhone"
clearable
@@ -337,20 +336,20 @@
<div class="label">
<div style="font-size: small;margin-bottom: 10px">涓爣鍗曚綅锛�</div>
<div>
- <el-row :gutter="20" v-for="(winUnit,index) in projectForm.winUnitList" :key="'zb' + index">
- <el-col :span="5">
- <el-form-item label="鍗曚綅鍚嶇О" label-width="100px" prop="setTime" style="width: 100%">
+ <el-row :gutter="10" v-for="(winUnit,index) in projectForm.winUnitList" :key="'zb' + index">
+ <el-col :span="7">
+ <el-form-item label="鍗曚綅鍚嶇О" label-width="80px" prop="setTime" style="width: 100%">
<el-input v-model.trim="winUnit.winUnit" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�"/>
</el-form-item>
</el-col>
<el-col :span="4">
- <el-form-item label="涓爣閲戦" label-width="100px" style="width: 100%">
+ <el-form-item label="涓爣閲戦" label-width="80px" style="width: 100%">
<el-input v-model.trim="winUnit.winAmount" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�"
type="number"/>
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="涓爣鏃堕棿" label-width="100px" style="width: 100%">
+ <el-form-item label="涓爣鏃堕棿" label-width="80px" style="width: 100%">
<el-date-picker v-model="winUnit.winTime"
placeholder="閫夋嫨鏃堕棿"
style="width: 100%"
@@ -364,7 +363,7 @@
</el-form-item>
</el-col>
<el-col :span="4">
- <el-form-item label="鑱旂郴鐢佃瘽" label-width="100px" style="width: 100%">
+ <el-form-item label="鑱旂郴鐢佃瘽" label-width="80px" style="width: 100%">
<el-input v-model.trim="winUnit.phone" class="item" clearable maxlength="20" placeholder="璇疯緭鍏�"/>
</el-form-item>
</el-col>
@@ -500,6 +499,8 @@
return {
tagList: [],
projectSubTypeList: [], // 椤圭洰瀛愮被鍨�
+ competentDepartment: '',
+ industryCompetentDepartment: '',
projectForm: {
id: '',
projectName: '',
@@ -511,9 +512,11 @@
fundTypeList: [], //璧勯噾绫诲瀷
investType: '',
importanceTypeList: [], //閲嶇偣鍒嗙被
- projectPhase: '鍌ㄥ瑙勫垝闃舵',
+ projectPhase: '1',
tag: '',
competentDepartment: '',
+ competentDepartmentPerson: '',
+ competentDepartmentPhone: '',
projectLocation: '',
longitude: '',
latitude: '',
@@ -549,7 +552,6 @@
projectContactPerson: '',
fileList: [],
engineeringInfos: [],
- competentDepartmentList: [],
managementCentralizationList: [],
remark: '',
industryCompetentDepartment: null,
@@ -557,6 +559,7 @@
departmentPersonPhone: null,
},
personList: [],
+ deptPersonList: [],
subclass: '',
largeCategory: '',
approvalList: [],
@@ -574,8 +577,32 @@
mapCreateInfo: {},
demoFormRef: null,
rules: {
- projectName: [{required: true, message: '璇疯緭鍏ラ」鐩悕绉�', trigger: 'blur'}]
- }
+ projectName: [{required: true, message: '璇疯緭鍏ラ」鐩悕绉�', trigger: 'blur'}],
+ content: [{required: true, message: '璇疯緭鍏ュ缓璁惧唴瀹�', trigger: 'blur'}],
+ fundTypeList: [{required: true, message: '璇烽�夋嫨璧勯噾绫诲瀷', trigger: 'change'}],
+ investType: [{required: true, message: '璇烽�夋嫨椤圭洰鎶曡祫绫诲埆', trigger: 'change'}],
+ constructionNature: [{required: true, message: '璇烽�夋嫨寤鸿鎬ц川', trigger: 'change'}],
+ attractInvestment: [{required: true, message: '璇烽�夋嫨鏄惁鎷涘晢寮曡祫椤圭洰', trigger: 'change'}],
+ projectType: [{required: true, message: '璇烽�夋嫨椤圭洰鎺ㄨ繘绫诲瀷', trigger: 'change'}],
+ projectStatus: [{required: true, message: '璇烽�夋嫨椤圭洰鐘舵��', trigger: 'change'}],
+ projectPhase: [{required: true, message: '璇烽�夋嫨椤圭洰闃舵', trigger: 'change'}],
+ projectContactPerson: [{required: true, message: '璇疯緭鍏ラ」鐩仈绯讳汉', trigger: 'blur'}],
+ contact: [{required: true, message: '璇疯緭鍏ラ」鐩仈绯绘柟寮�', trigger: 'blur'}],
+ projectOwnerUnit: [{required: true, message: '璇烽�夋嫨椤圭洰涓氫富鍗曚綅', trigger: 'change'}],
+ competentDepartment: [{required: true, message: '璇烽�夋嫨涓荤閮ㄩ棬', trigger: 'change'}],
+ competentDepartmentPerson: [{required: true, message: '璇烽�夋嫨涓荤閮ㄩ棬鑱旂郴浜�', trigger: 'change'}],
+ competentDepartmentPhone: [{required: true, message: '璇疯緭鍏ヤ富绠¢儴闂ㄨ仈绯绘柟寮�', trigger: 'blur'}],
+ area: [{required: true, message: '璇烽�夋嫨琛屾斂鍖哄垝', trigger: 'change'}],
+ managementCentralizationList: [{required: true, message: '璇烽�夋嫨绠$悊褰掑彛', trigger: 'change'}],
+ projectApprovalType: [{required: true, message: '璇烽�夋嫨椤圭洰瀹℃壒绫诲瀷', trigger: 'change'}],
+ importanceTypeList: [{required: true, message: '璇烽�夋嫨閲嶇偣鍒嗙被', trigger: 'change'}],
+ planStartTime: [{required: true, message: '璇烽�夋嫨璁″垝寮�宸ユ椂闂�', trigger: 'change'}],
+ planCompleteTime: [{required: true, message: '璇烽�夋嫨璁″垝绔e伐鏃堕棿', trigger: 'change'}],
+ industryCompetentDepartment: [{required: true, message: '璇烽�夋嫨琛屼笟涓荤閮ㄩ棬', trigger: 'change'}],
+ industryCompetentDepartmentPerson: [{required: true, message: '璇疯緭鍏ヨ涓氫富绠¢儴闂ㄨ仈绯讳汉', trigger: 'blur'}],
+ departmentPersonPhone: [{required: true, message: '璇疯緭鍏ヨ涓氫富绠¢儴闂ㄨ仈绯绘柟寮�', trigger: 'blur'}],
+ },
+ needClearPeople: true
};
},
computed: {
@@ -596,12 +623,6 @@
if (projectForm) {
this.projectForm = JSON.parse(projectForm);
- if (this.projectForm.industryCompetentDepartment) {
- // 鏍规嵁閫変腑鐨勯儴闂↖D鏌ヨ浜哄憳
- getByDept(this.projectForm.industryCompetentDepartment).then((res) => {
- this.personList = res.data;
- })
- }
if (this.projectForm.projectType) {
// 鏍规嵁椤圭洰绫诲瀷鏌ュ瓙绫诲瀷
getDicts("sys_project_type").then(res => {
@@ -614,6 +635,8 @@
})
}
this.$emit('updateIsShow', true);
+ this.competentDepartment = this.projectForm.competentDepartment
+ this.industryCompetentDepartment = this.projectForm.industryCompetentDepartment
} else {
this.projectForm.id = this.$route.query.projectId;
// 鍦ㄧ粍浠跺垱寤烘椂鑾峰彇椤圭洰淇℃伅锛屽鏋� projectId 瀛樺湪
@@ -625,17 +648,29 @@
}
// this.handleLoadMore(1);
}
- console.log(this.projectForm, "鍘熷鍊�")
+
this.$nextTick(() => {
- console.log("璁剧疆浜�")
this.tagList = this.projectForm.tag ? this.projectForm.tag.split(",") : []
- console.log(this.tagList)
})
},
beforeDestroy() {
localStorage.setItem("projectForm", JSON.stringify(this.projectForm));
},
methods: {
+ getIndustryCompetentDepartmentPeople(deptId) {
+ // 鏍规嵁閫変腑鐨勯儴闂↖D鏌ヨ浜哄憳
+ getByDept(deptId).then((res) => {
+ this.personList = res.data;
+ this.personList.forEach(item => item.userId += '')
+ })
+ },
+ getCompetentDepartmentPeople(deptId) {
+ // 鏍规嵁閫変腑鐨勯儴闂↖D鏌ヨ浜哄憳
+ getByDept(deptId).then((res) => {
+ this.deptPersonList = res.data;
+ this.deptPersonList.forEach(item => item.userId += '')
+ })
+ },
getTagList(list) {
console.log("鎷垮埌浜�")
if (!list || list.length < 1) {
@@ -668,24 +703,59 @@
if (userId) {
// 鏍规嵁閫変腑鐨剈serId鏌ユ壘瀵瑰簲鐨勮仈绯讳汉
const selectedPerson = this.personList.find(person => person.userId === userId);
- if (selectedPerson) {
+ if (selectedPerson && selectedPerson.phonenumber) {
// 灏嗚仈绯讳汉鐨刾hone瀛楁鍥炲~鍒拌仈绯荤數璇濊緭鍏ユ
this.projectForm.departmentPersonPhone = selectedPerson.phonenumber;
- } else {
- // 濡傛灉鏈壘鍒拌仈绯讳汉锛屾竻绌鸿仈绯荤數璇�
- this.projectForm.departmentPersonPhone = '';
}
+ }
+ },
+ handleDeptContactChange(userId) {
+ if (userId) {
+ // 鏍规嵁閫変腑鐨剈serId鏌ユ壘瀵瑰簲鐨勮仈绯讳汉
+ const selectedPerson = this.deptPersonList.find(person => person.userId === userId);
+ if (selectedPerson && selectedPerson.phonenumber) {
+ // 灏嗚仈绯讳汉鐨刾hone瀛楁鍥炲~鍒拌仈绯荤數璇濊緭鍏ユ
+ this.projectForm.competentDepartmentPhone = selectedPerson.phonenumber;
+ }
+ }
+ },
+ getIndustryCompetentDepartmentInfo(deptId) {
+ if (deptId) {
+ if (this.projectForm.industryCompetentDepartment != deptId) {
+ this.projectForm.industryCompetentDepartmentPerson = ""
+ this.projectForm.departmentPersonPhone = ""
+ }
+ this.projectForm.industryCompetentDepartment = deptId
+ this.getIndustryCompetentDepartmentPeople(deptId)
} else {
- // 濡傛灉userId涓虹┖锛屾竻绌鸿仈绯荤數璇�
- this.projectForm.departmentPersonPhone = '';
+ this.projectForm.industryCompetentDepartment = ''
+ this.personList = [];
+ }
+ },
+ getProjectOwnerUnit(deptId) {
+ if (deptId) {
+ this.projectForm.projectOwnerUnit = deptId
+ } else {
+ this.projectForm.projectOwnerUnit = ''
+ }
+ },
+ getCompetentDepartmentInfo(deptId) {
+ if (deptId) {
+ if (this.projectForm.competentDepartment != deptId) {
+ this.projectForm.competentDepartmentPerson = ""
+ this.projectForm.competentDepartmentPhone = ""
+ }
+ this.projectForm.competentDepartment = deptId
+ this.getCompetentDepartmentPeople(deptId)
+ } else {
+ this.projectForm.competentDepartment = ''
+ this.deptPersonList = [];
}
},
handleDepartmentChange(departmentId) {
if (departmentId) {
// 鏍规嵁閫変腑鐨勯儴闂↖D鏌ヨ浜哄憳
- getByDept(departmentId).then((res) => {
- this.personList = res.data;
- })
+ this.getIndustryCompetentDepartmentPeople(departmentId)
} else {
// 濡傛灉鏈�夋嫨閮ㄩ棬锛屾竻绌轰汉鍛樺垪琛�
this.personList = [];
@@ -752,18 +822,21 @@
this.tagList = this.projectForm.tag ? this.projectForm.tag.split(",") : []
console.log(this.tagList)
})
+ this.competentDepartment = this.projectForm.competentDepartment
+ this.industryCompetentDepartment = this.projectForm.industryCompetentDepartment
});
},
getApprovalList() {
approvalList().then(res => {
- this.approvalList = res.data;
+ this.approvalList = this.handleTree(res.data, "deptId");
+ this.approvalList.push({deptId: '', deptName: '鏃�', children: []})
});
},
getDeptList(){
listDept().then(response => {
console.log(response.data)
-
this.selectOptions = this.handleTree(response.data, "deptId");
+ this.selectOptions.push({deptId: '', deptName: '鏃�', children: []})
});
},
@@ -864,12 +937,6 @@
.filter(item => newVal.managementCentralizationList.includes(item.value))
.map(item => item.label);
this.subclass = labels.join(',');
- }
- if (newVal.competentDepartmentList) {
- const labels = this.approvalList
- .filter(item => newVal.competentDepartmentList.includes(item.id))
- .map(item => item.value);
- this.largeCategory = labels.join(',');
}
}, 1000);
this.$emit('basicInfoForm', newVal)
--
Gitblit v1.8.0