From 66bc37c7b134e10bb64830e56c3add71731fea33 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 20 二月 2025 16:55:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectEngineering/projectLibrary/component/BasicInfo.vue | 173 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 149 insertions(+), 24 deletions(-)
diff --git a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
index 463e144..f4b3578 100644
--- a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
+++ b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
@@ -58,30 +58,38 @@
</el-col>
<el-col :span="6">
- <el-col :span="6">
- <el-form-item label="寤鸿鎬ц川" label-width="100px" prop="constructionNature" style="width: 100%; min-width: 260px">
- <el-select
- v-model="projectForm.constructionNature"
- clearable
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
- <el-option v-for="item in dict.type.construction_nature" :key="item.value" :label="item.label"
- :value="item.value"/>
- </el-select>
- </el-form-item>
- </el-col>
+ <el-form-item label="寤鸿鎬ц川" label-width="100px" prop="constructionNature"
+ style="width: 100%; min-width: 260px">
+ <el-select
+ v-model="projectForm.constructionNature"
+ clearable
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option v-for="item in dict.type.construction_nature" :key="item.value" :label="item.label"
+ :value="item.value"/>
+ </el-select>
+ </el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="椤圭洰绫诲瀷" label-width="100px" prop="projectType" style="width: 100%">
- <el-select v-model="projectForm.projectType" clearable placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-select v-model="projectForm.projectType" @change="getChildSelect" clearable placeholder="璇烽�夋嫨" style="width: 100%">
<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="6">
+ <el-form-item label="椤圭洰瀛愮被鍨�" label-width="100px" prop="projectSubType" style="width: 100%">
+ <el-select v-model="projectForm.projectSubType" :disabled="projectForm.projectType === ''" clearable placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-option v-for="item in projectSubTypeList" :key="item.dictCode + 'zd'" :label="item.dictLabel"
+ :value="item.dictValue"/>
+ </el-select>
+ </el-form-item>
+ </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%">
@@ -96,12 +104,12 @@
placeholder="璇疯緭鍏�"/>
</el-form-item>
</el-col>
- <!-- <el-col :span="6">-->
- <!-- <el-form-item label="椤圭洰涓氫富鍗曚綅" label-width="100px" prop="projectOwnerUnit" style="width: 100%">-->
- <!-- <el-input v-model.trim="projectForm.projectOwnerUnit" class="item" clearable maxlength="255"-->
- <!-- placeholder="璇疯緭鍏�"/>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
+<!-- <el-col :span="6">-->
+<!-- <el-form-item label="椤圭洰涓氫富鍗曚綅" label-width="100px" prop="projectOwnerUnit" style="width: 100%">-->
+<!-- <el-input v-model.trim="projectForm.projectOwnerUnit" class="item" clearable maxlength="255"-->
+<!-- placeholder="璇疯緭鍏�"/>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
</el-row>
<el-row :gutter="20">
<el-col :span="6">
@@ -239,6 +247,53 @@
</el-form-item>
</el-col>
</el-row>
+ <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>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鑱旂郴浜�" label-width="100px" style="width: 100%">
+ <el-select
+ v-model="projectForm.industryCompetentDepartmentPerson"
+ clearable
+ placeholder="璇烽�夋嫨"
+ @change="handleContactChange"
+ style="width: 100%;"
+ >
+ <el-option
+ v-for="person in personList"
+ :key="person.userId"
+ :value="person.userId"
+ :label="person.nickName"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鑱旂郴浜鸿仈绯绘柟寮�" label-width="100px" style="width: 100%">
+ <el-input
+ v-model="projectForm.departmentPersonPhone"
+ clearable
+ placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
</div>
</div>
<div class="label">
@@ -372,8 +427,10 @@
// import { getList } from '@/api/engineeringLibrary/index';
// import RemoteSelect from '@/components/RemoteSelect/index.vue';
import Cookies from "js-cookie";
-import {addProject, getProject, updateProject, getProjectCode} from '@/api/projectEngineering/projectInfo';
+import {addProject, getProject, updateProject, getProjectCode, editProject} from '@/api/projectEngineering/projectInfo';
import {approvalList} from "@/api/system/dept";
+import {getByDept} from "@/api/system/user";
+import {getChildList} from "@/api/system/dict/data";
export default {
name: 'BasicInfo',
@@ -397,11 +454,13 @@
},
data() {
return {
+ projectSubTypeList: [], // 椤圭洰瀛愮被鍨�
projectForm: {
id: '',
projectName: '',
projectCode: '',
projectType: '',
+ projectSubType: '',
projectStatus: 'pendding',
fundType: '',
investType: '',
@@ -446,8 +505,12 @@
engineeringInfos: [],
competentDepartmentList: [],
managementCentralizationList: [],
- remark: ''
+ remark: '',
+ industryCompetentDepartment: null,
+ industryCompetentDepartmentPerson: null,
+ departmentPersonPhone: null,
},
+ personList: [],
subclass: '',
largeCategory: '',
approvalList: [],
@@ -481,8 +544,21 @@
const projectForm = localStorage.getItem("projectForm");
//鍒濆鍖栦富绠￠儴闂ㄤ笅鎷夋
this.getApprovalList();
+
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) {
+ // 鏍规嵁椤圭洰绫诲瀷鏌ュ瓙绫诲瀷
+ getChildList(this.dict.type.sys_project_type.filter(item => item.raw.dictValue === this.projectForm.projectType)[0].raw.dictCode).then(res => {
+ this.projectSubTypeList = res.data
+ })
+ }
this.$emit('updateIsShow', true);
} else {
this.projectForm.id = this.$route.query.projectId;
@@ -497,9 +573,47 @@
}
},
beforeDestroy() {
- // localStorage.setItem("projectForm", JSON.stringify(this.projectForm));
+ localStorage.setItem("projectForm", JSON.stringify(this.projectForm));
},
methods: {
+ getChildSelect(select) {
+ this.projectForm.projectSubType = ''
+ if (select) {
+ getChildList(this.dict.type.sys_project_type.filter(item => item.raw.dictValue === select)[0].raw.dictCode).then(res => {
+ this.projectSubTypeList = res.data
+ })
+ }
+ },
+ // 鐩戝惉鑱旂郴浜洪�夋嫨浜嬩欢
+ handleContactChange(userId) {
+ if (userId) {
+ // 鏍规嵁閫変腑鐨剈serId鏌ユ壘瀵瑰簲鐨勮仈绯讳汉
+ const selectedPerson = this.personList.find(person => person.userId === userId);
+ if (selectedPerson) {
+ // 灏嗚仈绯讳汉鐨刾hone瀛楁鍥炲～鍒拌仈绯荤數璇濊緭鍏ユ
+ this.projectForm.departmentPersonPhone = selectedPerson.phonenumber;
+ } else {
+ // 濡傛灉鏈壘鍒拌仈绯讳汉锛屾竻绌鸿仈绯荤數璇�
+ this.projectForm.departmentPersonPhone = '';
+ }
+ } else {
+ // 濡傛灉userId涓虹┖锛屾竻绌鸿仈绯荤數璇�
+ this.projectForm.departmentPersonPhone = '';
+ }
+ },
+ handleDepartmentChange(departmentId) {
+ if (departmentId) {
+ // 鏍规嵁閫変腑鐨勯儴闂↖D鏌ヨ浜哄憳
+ getByDept(departmentId).then((res) => {
+ this.personList = res.data;
+ })
+ } else {
+ // 濡傛灉鏈�夋嫨閮ㄩ棬锛屾竻绌轰汉鍛樺垪琛�
+ this.personList = [];
+ }
+ this.$set(this.projectForm, 'industryCompetentDepartmentPerson', null);
+ this.$set(this.projectForm, 'departmentPersonPhone', '');
+ },
addWinUnit() {
this.projectForm.winUnitList.push({
winUnit: '',
@@ -535,8 +649,19 @@
getProjectInfo(id) {
getProject(id).then(res => {
this.projectForm = res.data;
+ if (this.projectForm.industryCompetentDepartment) {
+ // 鏍规嵁閫変腑鐨勯儴闂↖D鏌ヨ浜哄憳
+ getByDept(this.projectForm.industryCompetentDepartment).then((res) => {
+ this.personList = res.data;
+ })
+ }
+ if (this.projectForm.projectType) {
+ // 鏍规嵁椤圭洰绫诲瀷鏌ュ瓙绫诲瀷
+ getChildList(this.dict.type.sys_project_type.filter(item => item.raw.dictValue === this.projectForm.projectType)[0].raw.dictCode).then(res => {
+ this.projectSubTypeList = res.data
+ })
+ }
this.$emit('updateIsShow', true);
-
});
},
getApprovalList() {
--
Gitblit v1.8.0