From 2fe7eb79670f8d9a64a501596b18c4e098278c89 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 17 三月 2025 11:50:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectEngineering/projectLibrary/projectDetails.vue | 350 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 204 insertions(+), 146 deletions(-)
diff --git a/src/views/projectEngineering/projectLibrary/projectDetails.vue b/src/views/projectEngineering/projectLibrary/projectDetails.vue
index c319965..446ece8 100644
--- a/src/views/projectEngineering/projectLibrary/projectDetails.vue
+++ b/src/views/projectEngineering/projectLibrary/projectDetails.vue
@@ -1,7 +1,8 @@
<template>
+ <div>
<el-card class="card-container">
<div class="flex-container mb-4">
- <el-tabs v-model="currentTab" @tab-click="handleClick">
+ <el-tabs v-model="currentTab" @tab-click="handleClick" v-show="isShow">
<el-tab-pane
v-for="item in TABS_DATA"
:key="item.value"
@@ -18,195 +19,252 @@
:is="componentName"
ref="childRef"
:disabled="disabled"
+ @toNext="changeTable"
+ @updateIsShow="updateIsShow"
+ @basicInfoForm="basicInfoForm"
+ @investInfoForm="investInfoForm"
+ @investmentFundsForm="investmentFundsForm"
+ @legalPersonForm="legalPersonForm"
+ @policyInfoForm="policyInfoForm"
+ @documentsInfoForm="documentsInfoForm"
+ :isShow="isShow"
class="full-width custom-height"
/>
+ <div v-if="audit" class="button-container">
+ <el-button
+ class="save-button"
+ type="primary"
+ @click="saveProject(2)"
+ >閫氳繃</el-button>
+ <el-button
+ class="save-button"
+ type="danger"
+ @click="showDialog"
+ >椹冲洖</el-button>
+ </div>
+
<div v-if="!disabled" class="button-container">
- <el-button class="save-button" type="primary" @click="submit">淇濆瓨</el-button>
+ <el-button
+ class="save-button"
+ type="primary"
+ @click="saveProject(0)"
+ >鑽夌</el-button
+ >
+<!-- <el-button class="save-button" type="primary" @click="submit(1)"-->
+<!-- >淇濆瓨</el-button>-->
+ <el-button class="save-button" type="primary" @click="saveProject(1)"
+ >淇濆瓨</el-button>
<el-button class="reset-button" @click="reset">閲嶇疆</el-button>
<!-- <el-button v-else class="cancel-button" @click="cancel">鍙栨秷</el-button> -->
</div>
</el-card>
+ <el-dialog :visible.sync="remarkShow" width="1000px" title="椹冲洖淇℃伅" append-to-body>
+ <el-form ref="form" label-width="80px">
+ <el-form-item label="椹冲洖鍘熷洜">
+ <el-input type="textarea" v-model="remark"></el-input>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="cancelAuditing">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitAuditing">纭� 瀹�</el-button>
+ </div>
+ </el-dialog>
+</div>
</template>
<script>
-import BasicInfo from '@/views/projectEngineering/projectLibrary/component/BasicInfo';
-import InvestInfo from '@/views/projectEngineering/projectLibrary/component/InvestInfo';
-import InvestmentFunds from '@/views/projectEngineering/projectLibrary/component/investmentFunds';
-import LegalPerson from '@/views/projectEngineering/projectLibrary/component/legalPerson';
-import PolicyInfo from '@/views/projectEngineering/projectLibrary/component/PolicyInfo';
-// import DocumentsInfo from '@/components/DocumentsInfo.vue';
-import { addProject, getProject, updateProject, getProjectCode } from '@/api/projectInfo';
+import BasicInfo from "@/views/projectEngineering/projectLibrary/component/BasicInfo";
+import InvestInfo from "@/views/projectEngineering/projectLibrary/component/InvestInfo";
+import InvestmentFunds from "@/views/projectEngineering/projectLibrary/component/investmentFunds";
+import LegalPerson from "@/views/projectEngineering/projectLibrary/component/legalPerson";
+import PolicyInfo from "@/views/projectEngineering/projectLibrary/component/PolicyInfo";
+import DocumentsInfo from "@/views/projectEngineering/projectLibrary/component/DocumentsInfo";
+import { editProject } from "@/api/projectEngineering/projectInfo";
export default {
+ name: "ProjectDetails",
data() {
return {
- currentTab: '椤圭洰绠＄悊鍩虹淇℃伅',
- id: this.$route.query.id || '',
+ isShow: false,
+ currentTab: "椤圭洰绠＄悊鍩虹淇℃伅",
disabled: false,
+ remarkShow: false,
+ audit: false,
+ remark: '',
+ projectForm: {},
componentName: BasicInfo,
+ projectId: null,
TABS_DATA: [
{
- label: '椤圭洰绠＄悊鍩虹淇℃伅',
- value: '椤圭洰绠＄悊鍩虹淇℃伅',
- componentName: BasicInfo
+ label: "椤圭洰绠＄悊鍩虹淇℃伅",
+ value: "椤圭洰绠＄悊鍩虹淇℃伅",
+ componentName: BasicInfo,
+ },
+ // {
+ // label: "鎶曡祫绠＄悊鍩虹淇℃伅",
+ // value: "鎶曡祫绠＄悊鍩虹淇℃伅",
+ // componentName: InvestInfo,
+ // },
+ {
+ label: "椤圭洰鎶曡祫鍙婅祫閲戞潵婧�",
+ value: "椤圭洰鎶曡祫鍙婅祫閲戞潵婧�",
+ componentName: InvestmentFunds,
},
{
- label: '鎶曡祫绠＄悊鍩虹淇℃伅',
- value: '浠诲姟涓嬪彂',
- componentName: InvestInfo
+ label: "椤圭洰(娉曚汉)鍗曚綅鐧昏淇℃伅",
+ value: "椤圭洰(娉曚汉)鍗曚綅鐧昏淇℃伅",
+ componentName: LegalPerson,
},
- {
- label: ' 椤圭洰鎶曡祫鍙婅祫閲戞潵婧�',
- value: '椤圭洰鎶曡祫鍙婅祫閲戞潵婧�',
- componentName: InvestmentFunds
- },
- {
- label: '椤圭洰(娉曚汉)鍗曚綅鐧昏淇℃伅',
- value: '椤圭洰(娉曚汉)鍗曚綅鐧昏淇℃伅',
- componentName: LegalPerson
- },
- {
- label: '鎶曡祫椤圭洰浜т笟鏀跨瓥绗﹀悎鎯呭喌',
- value: '鎶曡祫椤圭洰浜т笟鏀跨瓥绗﹀悎鎯呭喌',
- componentName: PolicyInfo
- },
- {
- label: '鐩稿叧鏂囦功',
- value: '鐩稿叧鏂囦功',
- componentName: 'DocumentsInfo'
- }
+ // {
+ // label: "鎶曡祫椤圭洰浜т笟鏀跨瓥绗﹀悎鎯呭喌",
+ // value: "鎶曡祫椤圭洰浜т笟鏀跨瓥绗﹀悎鎯呭喌",
+ // componentName: PolicyInfo,
+ // },
+ // {
+ // label: "鐩稿叧鏂囦功",
+ // value: "鐩稿叧鏂囦功",
+ // componentName: DocumentsInfo,
+ // },
],
childRef: null,
- // 鍋囪杩欎簺鐘舵�佹槸浠� Vuex 涓幏鍙栫殑锛屾垨鑰呬綘鍙互鐩存帴鍦� data 涓畾涔夊畠浠�
- // projectForm, investment, investmentFunds, legalPerson, resetPlanLibrary, investmentProjectPolicyComplianceDTO, fileIdList, documentsInfoList, projectList, fileList
+ baseInfoRules: [
+ {name: 'projectName', message: '璇疯緭鍏ラ」鐩悕绉�'},
+ {name: 'content', message: '璇疯緭鍏ュ缓璁惧唴瀹�'},
+ {name: 'fundTypeList', message: '璇烽�夋嫨璧勯噾绫诲瀷'},
+ {name: 'investType', message: '璇烽�夋嫨椤圭洰鎶曡祫绫诲埆'},
+ {name: 'constructionNature', message: '璇烽�夋嫨寤鸿鎬ц川'},
+ {name: 'attractInvestment', message: '璇烽�夋嫨鏄惁鎷涘晢寮曡祫椤圭洰'},
+ {name: 'projectType', message: '璇烽�夋嫨椤圭洰鎺ㄨ繘绫诲瀷'},
+ {name: 'projectStatus', message: '璇烽�夋嫨椤圭洰鐘舵��'},
+ {name: 'projectPhase', message: '璇烽�夋嫨椤圭洰闃舵'},
+ {name: 'projectContactPerson', message: '璇疯緭鍏ラ」鐩仈绯讳汉'},
+ {name: 'contact', message: '璇疯緭鍏ラ」鐩仈绯绘柟寮�'},
+ {name: 'projectOwnerUnit', message: '璇烽�夋嫨椤圭洰涓氫富鍗曚綅'},
+ {name: 'competentDepartment', message: '璇烽�夋嫨涓荤閮ㄩ棬'},
+ {name: 'competentDepartmentPerson', message: '璇烽�夋嫨涓荤閮ㄩ棬鑱旂郴浜�'},
+ {name: 'competentDepartmentPhone', message: '璇疯緭鍏ヤ富绠￠儴闂ㄨ仈绯绘柟寮�'},
+ {name: 'area', message: '璇烽�夋嫨琛屾斂鍖哄垝'},
+ {name: 'managementCentralizationList', message: '璇烽�夋嫨绠＄悊褰掑彛'},
+ {name: 'projectApprovalType', message: '璇烽�夋嫨椤圭洰瀹℃壒绫诲瀷'},
+ {name: 'importanceTypeList', message: '璇烽�夋嫨閲嶇偣鍒嗙被'},
+ {name: 'planStartTime', message: '璇烽�夋嫨璁″垝寮�宸ユ椂闂�'},
+ {name: 'planCompleteTime', message: '璇烽�夋嫨璁″垝绔ｅ伐鏃堕棿'},
+ {name: 'industryCompetentDepartment', message: '璇烽�夋嫨琛屼笟涓荤閮ㄩ棬'},
+ {name: 'industryCompetentDepartmentPerson', message: '璇疯緭鍏ヨ涓氫富绠￠儴闂ㄨ仈绯讳汉'},
+ {name: 'departmentPersonPhone', message: '璇疯緭鍏ヨ涓氫富绠￠儴闂ㄨ仈绯绘柟寮�'},
+ ],
+ investmentFundsFormRules: [
+ {name: 'totalInvestment', message: '椤圭洰鎬绘姇璧勯涓嶈兘涓虹┖(涓斿ぇ浜�0)'},
+ ]
};
},
methods: {
+ showDialog(){
+ this.remark = null;
+ this.remarkShow = true;
+ },
+ cancelAuditing(){
+ this.remark = null;
+ this.remarkShow = false;
+ },
+ submitAuditing(){
+ this.projectForm.projectInfoForm.remark = this.remark
+ this.saveProject(3)
+ this.remark = null
+ this.remarkShow = false;
+ },
+ updateIsShow(newValue) {
+ this.isShow = newValue;
+ },
+ basicInfoForm(data) {
+ this.projectForm.projectInfoForm = data;
+ this.projectId = data.id;
+ this.audit = this.$route.query.audit == 1 && this.projectForm.projectInfoForm.auditRole;
+ },
+ investInfoForm(data) {
+ this.projectForm.projectInvestmentInfoForm = data;
+ this.projectForm.projectInvestmentInfoForm.projectId = this.projectId;
+ },
+ investmentFundsForm(data) {
+ this.projectForm.projectInvestmentFundingForm = data;
+ this.projectForm.projectInvestmentFundingForm.projectId = this.projectId;
+ },
+ documentsInfoForm(data){
+ this.projectForm.documentInfoForm = data;
+ this.projectForm.documentInfoForm.projectId = this.projectId;
+ },
+ legalPersonForm(data) {
+ this.projectForm.projectUnitRegistrationInfoForm = data;
+ this.projectForm.projectUnitRegistrationInfoForm.projectId = this.projectId;
+ },
+ policyInfoForm(data) {
+ this.projectForm.projectInvestmentPolicyComplianceForm = data;
+ this.projectForm.projectInvestmentPolicyComplianceForm.projectId = this.projectId;
+ },
handleClick(tabTarget) {
this.componentName = this.TABS_DATA[tabTarget.index].componentName;
},
- submit() {
- if (!this.projectForm.projectName) {
- this.$message.error('璇疯緭鍏ラ」鐩悕绉�');
- return;
- }
- if (this.projectForm.contact) {
- const phoneRegex = /^1[3-9]\d{9}$/;
- if (!phoneRegex.test(this.projectForm.contact)) {
- this.$message.error('璇疯緭鍏ユ纭殑鎵嬫満鍙风爜');
- return;
- }
- }
- if (this.$refs.childRef) {
- this.$refs.childRef.$refs.demoFormRef.validate((valid) => {
- if (valid) {
- const payload = {
- projectInfoInsertDTO: this.projectForm,
- projectInvestmentInfo: this.investment,
- projectInvestmentFunding: this.investmentFunds,
- projectUnitRegistrationInfo: this.legalPerson,
- investmentProjectPolicyComplianceDTO: this.investmentProjectPolicyComplianceDTO,
- fileIdList: this.fileIdList
- };
- if (this.id) {
- updateProject(payload).then(res => {
- if (res.code === 200) {
- this.$message.success(res.msg);
- this.$router.push({ path: '/projectEngineering/project/projectLibrary' });
- } else {
- this.$message.error(res.msg);
- }
- });
- } else {
- addProject(payload).then(res => {
- if (res.code === 200) {
- this.$message.success(res.msg);
- this.$router.push({ path: '/projectEngineering/project/projectLibrary' });
- } else {
- this.$message.error(res.msg);
- }
- });
- }
- }
- });
- }
+ changeTable(index) {
+ this.componentName = this.TABS_DATA[index].componentName;
+ this.currentTab = this.TABS_DATA[index].value;
},
- getProjectInfo(id) {
- getProject(id, 0).then(res => {
- if (res.data) {
- this.investment = res.data.projectInvestmentInfo || {};
- this.investmentFunds = res.data.projectInvestmentFunding || {};
- this.legalPerson = res.data.projectUnitRegistrationInfo || {};
- this.investmentProjectPolicyComplianceDTO = res.data.investmentProjectPolicyComplianceDTO || {};
- if (res.data.investmentProjectPolicyComplianceDTO && res.data.investmentProjectPolicyComplianceDTO.sysOssVos.length > 0) {
- this.fileList = res.data.investmentProjectPolicyComplianceDTO.sysOssVos.map(item => ({
- fileId: item.ossId,
- name: item.originalName,
- url: item.url
- }));
- } else {
- this.fileList = [];
- }
-
- if (res.data.fileIdList) {
- this.fileIdList = res.data.fileIdList;
- this.documentsInfoList = res.data.sysOssVos.map(item => ({
- fileId: item.ossId,
- name: item.originalName,
- url: item.url
- }));
- }
- this.projectForm = res.data.projectInfoInsertDTO || {};
- this.projectList = res.data.projectInfoInsertDTO.sysOssVos.map(item => ({
- fileId: item.ossId,
- name: item.originalName,
- url: item.url
- }));
- }
- });
+ submit(usedStatus) {
+ this.$refs.childRef.submit(usedStatus);
},
reset() {
- if (this.id) {
- this.getProjectInfo(this.id);
+ this.$refs.childRef.reset();
+ },
+ saveProject(num) {
+ this.projectForm.projectInfoForm.usedStatus = num;
+
+ const msg = this.formValidate()
+ if (msg && num != 0) { // 鑽夌涓嶆牎楠�
+ this.$message.error(msg)
} else {
- this.getProjectCodeApi();
- this.resetPlanLibrary();
- this.fileList = [];
- this.fileIdList = [];
- this.projectList = [];
- this.documentsInfoList = [];
+ editProject(this.projectForm).then((res) => {
+ this.$message.success("淇濆瓨鎴愬姛");
+ this.$store.dispatch("tagsView/delView", this.$route);
+ this.$router.push('/projectEngineering/project/projectLibrary')
+ })
}
},
- cancel() {
- this.$router.push({ path: '/projectEngineering/project/reserveProjects', query: { projectCategory: '1' } });
- localStorage.removeItem('fileIdList');
- },
- getProjectCodeApi() {
- getProjectCode().then(res => {
- if (res.code === 200) {
- this.projectForm.projectCode = res.msg;
+ /**
+ * 涓存椂浣跨敤杩欑鏂瑰紡鏍￠獙
+ */
+ formValidate() {
+ let msg = "";
+ for (let i = 0; i < this.baseInfoRules.length; i++) {
+ if (! this.projectForm.projectInfoForm[this.baseInfoRules[i].name]) {
+ msg = this.baseInfoRules[i].message
+ return msg
}
- });
+ }
+ console.log(this.projectForm, "椤圭洰淇℃伅")
+ if (this.projectForm.projectInvestmentFundingForm) {
+ for (let i = 0; i < this.investmentFundsFormRules.length; i++) {
+ const name = this.investmentFundsFormRules[i].name
+ if (! this.projectForm.projectInvestmentFundingForm[name]) {
+ msg = this.investmentFundsFormRules[i].message
+ return msg
+ } else if (name == 'totalInvestment' && parseFloat(this.projectForm.projectInvestmentFundingForm[name]) <= 0) {
+ // 濡傛灉鏄�绘姇璧勯锛屼笉浠呬笉鑳戒负绌鸿繕蹇呴』澶т簬0
+ msg = this.investmentFundsFormRules[i].message
+ return msg
+ }
+ }
+ }
+ return msg;
},
- // 鍋囪 resetPlanLibrary 鏄粠鏌愪釜鍦版柟寮曞叆鎴栧畾涔夌殑锛屼綘闇�瑕佺‘淇濆畠鍦ㄤ綘鐨勭粍浠朵腑鍙敤
- // resetPlanLibrary() { ... }
},
- created() {
- // 鍦ㄧ粍浠跺垱寤烘椂鑾峰彇椤圭洰淇℃伅锛屽鏋� id 瀛樺湪
- if (this.id) {
- this.getProjectInfo(this.id);
- } else {
- this.getProjectCodeApi();
- // 鍒濆鍖栨垨閲嶇疆鐘舵��
- // this.resetPlanLibrary();
+ mounted() {
+ if (this.$route.query.disabled) {
+ this.disabled = true;
}
},
-
};
</script>
<style scoped>
-
::v-deep .el-tabs__nav-wrap::after {
background-color: rgba(0, 0, 0, 0) !important;
}
--
Gitblit v1.8.0