From 03783a4d36c939a76c57046b2dc23a4f1553953d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 26 十一月 2024 22:25:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectEngineering/projectLibrary/component/investmentFunds.vue | 252 ++++++++++++
src/views/projectPlan/planInfoCheck.vue | 84 +++
src/views/projectEngineering/projectLibrary/component/BasicInfo.vue | 221 ++++------
src/views/projectEngineering/projectLibrary/component/legalPerson.vue | 224 +++++++++++
src/views/projectPlan/planInfo.vue | 2
src/views/projectEngineering/projectLibrary/component/InvestInfo.vue | 294 ++++++++++++++
src/views/projectPlan/planRecord.vue | 18
src/views/components/Map/index.vue | 28
src/views/projectEngineering/projectLibrary/projectDetails.vue | 69 ++
src/components/FileUpload/index.vue | 2
10 files changed, 1,023 insertions(+), 171 deletions(-)
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index c7f6b0a..e396687 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -15,7 +15,7 @@
ref="fileUpload"
>
<!-- 涓婁紶鎸夐挳 -->
- <el-button size="mini" type="primary">閫夊彇鏂囦欢</el-button>
+ <el-button icon="el-icon-upload2" size="small" type="primary">涓婁紶</el-button>
<!-- 涓婁紶鎻愮ず -->
<div class="el-upload__tip" slot="tip" v-if="showTip">
璇蜂笂浼�
diff --git a/src/views/components/Map/index.vue b/src/views/components/Map/index.vue
index 38f61f6..a9fee43 100644
--- a/src/views/components/Map/index.vue
+++ b/src/views/components/Map/index.vue
@@ -198,7 +198,7 @@
offset: [-35, -45],
labelBg: "#3369FF",
labelColor: "#fff",
- labelClick,
+ labelClick: this.labelClick,
};
// 娓呴櫎涔嬪墠鐨勬爣璁�
this.map && this.map.clearOverLays();
@@ -213,13 +213,16 @@
const { lat, lng: lon } = e.lnglat;
this.makeDefaultMask({
- ...defaultMaskInfo,
+ ...this.defaultMaskInfo,
lon: String(lon),
lat: String(lat),
});
- this.getReverseGeocode(e).then((addr) => {
- this.$emit("mapClick", { e, addr });
+ this.getReverseGeocode(e).then((addr) => {
+ this.$emit("mapClick", {
+ e,
+ addr,
});
+ });
console.log("鐐瑰嚮浜嬩欢", e);
},
@@ -360,9 +363,9 @@
}
this.addEvent(marker, "mouseover", (e) =>
- markerMouseover(e, infoWin, labelOptions, getUniqueId())
+ this.markerMouseover(e, infoWin, labelOptions, this.getUniqueId())
);
- this.addEvent(marker, "mouseout", (e) => markerMouseout(e, infoWin));
+ this.addEvent(marker, "mouseout", (e) => this.markerMouseout(e, infoWin));
},
// 鏍囪鎵�鏈夌偣
@@ -401,7 +404,7 @@
//鏍囪鐐瑰嚮浜嬩欢
markerClick(currentLabel, e) {
const id = e.target.options.id;
- currentLabelStyleChange(currentLabel);
+ this.currentLabelStyleChange(currentLabel);
console.log("鐐瑰嚮浜嬩欢", e, currentLabel);
this.getReverseGeocode(e).then((addr) => {
this.$emit(
@@ -415,9 +418,10 @@
// label鐐瑰嚮浜嬩欢
labelClick(currentLabel, e) {
+ console.log("瑙﹀彂鐐瑰嚮浜嬩欢")
const id = e.target.options.id;
- currentLabelStyleChange(currentLabel);
- getReverseGeocode(e).then((addr) => {
+ this.currentLabelStyleChange(currentLabel);
+ this.getReverseGeocode(e).then((addr) => {
this.$emit(
"labelClick",
id
@@ -449,9 +453,9 @@
},
},
},
- beforeUnmount() {
- this.map = null;
- },
+ beforeDestroy() {
+ this.map = null;
+ }
};
// const emits = defineEmits<{
diff --git a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
index c649a96..54d9aca 100644
--- a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
+++ b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
@@ -1,6 +1,6 @@
<template>
<div class="basic-info">
- <el-form ref="demoFormRef" :disabled="disabled" :model="projectForm" :rules="rules" class="dialog_form" :inline = "true">
+ <el-form ref="demoFormRef" :disabled="disabled" :model="projectForm" :rules="rules" class="dialog_form">
<el-row :gutter="20">
<el-col :span="6">
<el-form-item class="item" label="椤圭洰鍚嶇О" label-width="100px" prop="projectName">
@@ -8,7 +8,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item class="item" label="椤圭洰浠ｇ爜" label-width="100px" prop="code">
+ <el-form-item class="item" label="椤圭洰浠ｇ爜" label-width="100px" prop="projectCode">
<el-input v-model.trim="projectForm.projectCode" class="item" clearable disabled maxlength="255" placeholder="璇疯緭鍏�" />
</el-form-item>
</el-col>
@@ -25,29 +25,19 @@
</el-row>
<el-row :gutter="20">
<el-col :span="6">
- <el-form-item label="璧勯噾绫诲瀷" label-width="100px" prop="fundsType" style="width: 100%">
- <el-tree-select
- v-model="projectForm.fundType"
- :data="sys_funding_type"
- :props="{ dictLabel: 'label', dictValue: 'id' }"
- :render-after-expand="false"
- clearable
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- />
+ <el-form-item label="璧勯噾绫诲瀷" label-width="100px" prop="fundType" style="width: 100%">
+ <el-select v-model="projectForm.fundType" clearable placeholder="璇烽�夋嫨" style="width: 100%">
+ <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="6">
- <el-form-item label="椤圭洰鎶曡祫绫诲埆" label-width="100px" prop="investmentType" style="width: 100%">
- <el-tree-select
- v-model="projectForm.investType"
- :data="sys_investment_type"
- :props="{ dictLabel: 'label', dictValue: 'id' }"
- :render-after-expand="false"
- clearable
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- />
+ <el-form-item label="椤圭洰鎶曡祫绫诲埆" label-width="100px" prop="investType" style="width: 100%">
+ <el-select v-model="projectForm.investType" clearable placeholder="璇烽�夋嫨" style="width: 100%">
+ <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="6">
@@ -59,135 +49,125 @@
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="椤圭洰绫诲瀷" label-width="100px" prop="projectType" style="width: 100%">
- <el-tree-select
- v-model="projectForm.projectType"
- :data="sys_project_type"
- :props="{ dictLabel: 'label', dictValue: 'id' }"
- :render-after-expand="false"
- clearable
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- />
+ <el-select v-model="projectForm.projectType" 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="projectstatus" style="width: 100%">
- <el-tree-select
- v-model="projectForm.projectStatus"
- :data="sys_project_status"
- :props="{ dictLabel: 'label', dictValue: 'id' }"
- :render-after-expand="false"
- clearable
- placeholder="璇烽�夋嫨"
- 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>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="椤圭洰涓氫富鍗曚綅" label-width="100px" prop="company" style="width: 100%">
+ <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">
- <el-form-item label="椤圭洰鑱旂郴浜�" label-width="100px" style="width: 100%">
+ <el-form-item label="椤圭洰鑱旂郴浜�" label-width="100px" prop="projectContactPerson" style="width: 100%">
<el-input v-model.trim="projectForm.projectContactPerson" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鑱旂郴鏂瑰紡" label-width="100px" prop="projectPhone" 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-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%">
<el-option v-for="item in selectOptions" :key="item.id" :label="item.engineeringName" :value="item.id" />
- <RemoteSelect v-if="selectOptions.length" :hasMore="hasMore" :loading="loading" :page="page" @loadMore="handleLoadMore" />
+<!-- <RemoteSelect v-if="selectOptions.length" :hasMore="hasMore" :loading="loading" :page="page" @loadMore="handleLoadMore" />-->
</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="department" style="width: 100%">
- <el-tree-select
+ <el-form-item label="涓荤閮ㄩ棬" label-width="100px" prop="competentDepartmentList" style="width: 100%">
+ <el-select
v-model="projectForm.competentDepartmentList"
- :data="sys_competent_department"
- :multiple="true"
- :props="{ dictLabel: 'label', dictValue: 'id' }"
- :render-after-expand="false"
clearable
- collapse-tags
+ :multiple="true"
placeholder="璇烽�夋嫨"
style="width: 100%"
- @change="changeDepartment"
- />
+ collapse-tags
+ @change="changeDepartment">
+ <el-option v-for="item in dict.type.sys_competent_department" :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" style="width: 100%">
- <el-tree-select
+ <el-form-item label="琛屾斂鍖哄垝" label-width="100px" prop="area" style="width: 100%">
+ <el-select
v-model="projectForm.area"
- :data="sys_administrative_divisions"
- :props="{ dictLabel: 'label', dictValue: 'id' }"
- :render-after-expand="false"
clearable
placeholder="璇烽�夋嫨"
style="width: 100%"
- />
+ >
+ <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-col :span="6">
<el-form-item label="绠＄悊褰掑彛" label-width="100px" style="width: 100%">
- <el-tree-select
+ <el-select
v-model="projectForm.managementCentralizationList"
- :data="sys_centralized_management"
- :multiple="true"
- :props="{ dictLabel: 'label', dictValue: 'id' }"
- :render-after-expand="false"
clearable
- collapse-tags
+ :multiple="true"
placeholder="璇烽�夋嫨"
style="width: 100%"
+ collapse-tags
@change="changePutUnder"
- />
+ >
+ <el-option v-for="item in dict.type.sys_centralized_management" :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" style="width: 100%">
- <el-tree-select
+ <el-select
v-model="projectForm.projectApprovalType"
- :data="sys_approval_type"
- :props="{ dictLabel: 'label', dictValue: 'id' }"
- :render-after-expand="false"
clearable
placeholder="璇烽�夋嫨"
style="width: 100%"
- />
+ >
+ <el-option v-for="item in dict.type.sys_approval_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" style="width: 100%">
<el-input v-model="largeCategory" clearable disabled placeholder="璇烽�夋嫨澶х被" style="width: 49%" />
- <el-input v-model="subclass" class="ml-[2%]" 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-tree-select
+ <el-select
v-model="projectForm.importanceType"
- :data="sys_key_categories"
- :props="{ dictLabel: 'label', dictValue: 'id' }"
- :render-after-expand="false"
clearable
placeholder="璇烽�夋嫨"
style="width: 100%"
- />
+ >
+ <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>
@@ -228,19 +208,19 @@
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="骞村害鎶曡祫璁″垝" label-width="100px" prop="year" style="width: 100%">
- <el-tree-select
+ <el-select
v-model="projectForm.year"
- :data="sys_annual_plan"
- :props="{ dictLabel: 'label', dictValue: 'id' }"
- :render-after-expand="false"
clearable
placeholder="璇烽�夋嫨"
style="width: 100%"
- />
+ >
+ <el-option v-for="item in dict.type.sys_annual_plan" :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="company" style="width: 100%; display: flex; min-width: 260px">
+ <el-form-item label="骞村害鎶曡祫閲戦" label-width="100px" prop="company" style="width: 100%; min-width: 260px">
<el-input v-model.trim="projectForm.yearInvestAmount" clearable maxlength="255" placeholder="璇疯緭鍏�" style="width: 90%" type="number" />
<span style="margin-left: 2px">鍏�</span>
</el-form-item>
@@ -261,38 +241,32 @@
<el-row :gutter="0">
<el-col :span="18">
<el-form-item label="瀹℃壒璁″垝涔�:" label-width="100px" prop="medicalAddr" style="width: 100%">
- <div class="flex">
- <upload-standard
- :file-list.sync="projectList"
- :accept="accept"
- listType="text"
- @fileListAdd="handleAdd"
- @fileListRemove="handleRemove"
- >
- <el-button :icon="Upload" type="primary">涓婁紶</el-button>
- </upload-standard>
- </div>
+ <file-upload v-model="projectList"
+ :fileType="accept"
+ :isShowTip="false"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
- <el-dialog :visible.sync="dialogMap" width="900">
- <map-component
- v-if="dialogMap"
- id="dialogMapId"
- :mapList="dialogMapList"
- class="w-full h-[643px]"
- @map-click="mapClick"
- @label-click="mapCreateClick"
- />
+ <el-dialog :visible.sync="dialogMap" width="900px">
+ <div class="map_div">
+ <Map
+ id="dialogMapId"
+ :mapList="dialogMapList"
+ @mapClick="mapClick"
+ @labelClick="mapCreateClick"
+ />
+ </div>
</el-dialog>
+
</div>
</template>
<script>
// import Upload from '@element-plus/icons-vue/dist/Upload.vue';
-// import MapComponent from '@/components/Map/index.vue';
+import Map from '@/views/components/Map/index.vue';
+// import MapMouseEvent from '@/views/components/Map/types';
// import UploadStandard from '@/components/uploadStandard.vue';
// import { usePlanLibrary } from '@/hooks/detailsInformation';
// import { getList } from '@/api/engineeringLibrary/index';
@@ -300,8 +274,10 @@
import { formatDate } from '@/utils';
export default {
+ dicts: ['sys_funding_type', 'sys_investment_type', 'sys_project_type', 'sys_project_status','sys_competent_department'
+ ,'sys_administrative_divisions','sys_centralized_management','sys_approval_type','sys_key_categories','sys_annual_plan'],
components: {
- // MapComponent,
+ Map,
// UploadStandard,
// RemoteSelect
},
@@ -317,7 +293,7 @@
projectName: '',
projectCode: '',
projectType: '',
- projectStatus: '1',
+ projectStatus: 'working',
fundType: '',
investType: '',
importanceType: '',
@@ -355,13 +331,17 @@
competentDepartmentList: [],
managementCentralizationList: []
},
+ setTime: '',
+ planStartTime: '',
+ planCompleteTime: '',
+ winTime: '',
projectList: [],
dialogMap: false,
page: 1,
loading: false,
hasMore: true,
selectOptions: [],
- accept: `'pdf', 'docx', 'xlsx', 'jpg','jpeg'`,
+ accept: ['pdf', 'docx', 'xlsx', 'jpg','jpeg'],
largeCategory: '',
subclass: '',
mapCreateInfo: {},
@@ -372,20 +352,12 @@
};
},
computed: {
- dialogMapList() {
+ dialogMapList () {
return [{
addr: this.projectForm.address,
name: '鍒涘缓'
}];
},
- // // 鍦╒ue 2涓娇鐢� computed 鏇夸唬 sys_* 鐨勫搷搴斿紡瀛楀吀
- // sysFundingType() {
- // return this.$dict.get('sys_funding_type');
- // },
- // sysInvestmentType() {
- // return this.$dict.get('sys_investment_type');
- // // 鍏朵粬瀛楀吀鍚岀悊
- // }
},
created() {
this.handleLoadMore(1);
@@ -438,14 +410,16 @@
handleLoadMore(newPage) {
this.loadDataList(newPage);
},
- mapClick({ e, addr }) {
+ mapClick(e) {
+ console.log(e)
this.mapCreateInfo = {
- lon: e.lnglat.lng,
- lat: e.lnglat.lat,
- addr
+ lon: e.e.lnglat.lng,
+ lat: e.e.lnglat.lat,
+ addr: e.addr
};
},
mapCreateClick() {
+ console.log("鍒涘缓")
const { lon, lat, addr } = this.mapCreateInfo;
if (lon && lat && addr) {
this.projectForm.longitude = lon;
@@ -500,9 +474,12 @@
<style lang="scss" scoped>
.item {
- width: 130%;
+ width: 100%;
}
-
+.map_div {
+ width: 100%;
+ height: 643px;
+}
.input-row {
display: flex;
width: 100%;
diff --git a/src/views/projectEngineering/projectLibrary/component/InvestInfo.vue b/src/views/projectEngineering/projectLibrary/component/InvestInfo.vue
new file mode 100644
index 0000000..7b22b12
--- /dev/null
+++ b/src/views/projectEngineering/projectLibrary/component/InvestInfo.vue
@@ -0,0 +1,294 @@
+<template>
+ <div class="basic-info">
+ <el-form ref="demoFormRef" :disabled="disabled" :model="investment" class="dialog_form">
+ <el-row :gutter="20">
+ <el-col :span="6">
+ <el-form-item label="寤鸿鍦扮偣鏄惁璺ㄥ煙" label-width="120px" prop="fundsType" style="width: 100%">
+ <el-select
+ v-model="investment.beCrossRegion"
+ clearable
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option v-for="item in dict.type.sys_cross_domain" :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="120px" prop="investmentType" style="width: 100%">
+ <el-select
+ v-model="investment.constructionLocation"
+ clearable
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <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-col :span="6">
+ <el-form-item label="寤鸿璇︾粏鍦板潃" label-width="120px" prop="fundsType" style="width: 100%">
+ <el-input v-model.trim="investment.detailedAddress" class="item" clearable disabled maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="6">
+ <el-form-item label="鏄惁鏄ˉ鐮侀」鐩�" label-width="120px" prop="projectType" style="width: 100%">
+ <el-select
+ v-model="investment.beCompensationProject"
+ clearable
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option v-for="item in dict.type.sys_whether_project" :key="item.value" :label="item.label"
+ :value="item.value"/>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="琛ョ爜鍘熷洜" label-width="120px" prop="projectstatus" style="width: 100%">
+ <el-input v-model.trim="investment.compensationReason" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="6">
+ <el-form-item label="璁″垝寮�宸ユ椂闂�" label-width="120px" prop="plannedStartDate" style="width: 100%">
+ <!-- <el-date-picker v-model="plannedStartDate" placeholder="閫夋嫨鏃堕棿" style="width: 100%" type="date" @change="chaneStartWork" />-->
+ <el-input v-model.trim="plannedStartDate" class="item" clearable disabled maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎷熷缓鎴愭椂闂�" label-width="120px" prop="expectedCompletionDate" style="width: 100%">
+ <!-- <el-date-picker v-model="expectedCompletionDate" placeholder="閫夋嫨鏃堕棿" style="width: 100%" type="date" @change="chaneCompleted" />-->
+ <el-input v-model.trim="expectedCompletionDate" class="item" clearable disabled maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍥介檯琛屼笟鍒嗙被" label-width="120px" prop="engineering" style="width: 100%">
+ <el-select
+ v-model="investment.nationalIndustryClassification"
+ clearable
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option v-for="item in dict.type.sys_whether_project" :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="120px" prop="department" style="width: 100%">
+ <el-input v-model.trim="investment.industryClassification" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="椤圭洰寤烘垚鎬ц川" label-width="120px" prop="design" style="width: 100%">
+ <el-select
+ v-model="investment.projectNature"
+ clearable
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option v-for="item in dict.type.sys_industry_belong" :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="120px" prop="putUnder" style="width: 100%">
+ <el-select
+ v-model="investment.projectAttribute"
+ clearable
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option v-for="item in dict.type.sys_project_attributes" :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="18">
+ <el-form-item label="鏄惁浣跨敤鍦熷湴" label-width="120px" prop="approvalType" style="width: 100%">
+ <el-select
+ v-model="investment.useEarth"
+ clearable
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option v-for="item in dict.type.sys_whether_project" :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="18">
+ <el-form-item class="item" label="涓昏寤鸿鍐呭鍙婅妯�" label-width="120px" prop="content">
+ <el-input v-model.trim="investment.contentScale" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" type="textarea" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="18">
+ <el-form-item class="item" label="寤虹骞冲彴浠ｇ爜" label-width="120px" prop="content">
+ <el-input v-model.trim="investment.code" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" type="textarea" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
+</template>
+
+<script>
+import { formatDate } from '@/utils';
+
+export default {
+ dicts: ['sys_cross_domain','sys_administrative_divisions','sys_whether_project','sys_industry_belong','sys_project_attributes'],
+ name: 'InvestmentForm',
+ props: {
+ disabled: {
+ type: Boolean,
+ default: false,
+ required: true
+ }
+ },
+ data() {
+ return {
+ investment: {
+ beCrossRegion: '',
+ constructionLocation: '',
+ detailedAddress: '',
+ beCompensationProject: '',
+ compensationReason: '',
+ plannedStartDate: '',
+ expectedCompletionDate: '',
+ nationalIndustryClassification: '',
+ industryClassification: '',
+ projectNature: '',
+ projectAttribute: '',
+ useEarth: '',
+ contentScale: '',
+ code: '',
+ projectId: ''
+ },
+ projectForm: {
+ projectName: '',
+ projectCode: '',
+ projectType: '',
+ projectStatus: '1',
+ fundType: '',
+ investType: '',
+ importanceType: '',
+ projectPhase: '鍌ㄥ瑙勫垝闃舵',
+ tag: '',
+ competentDepartment: '',
+ projectLocation: '',
+ longitude: '',
+ latitude: '',
+ managementCentralization: '',
+ projectApplicationPhase: '',
+ projectApprovalType: '',
+ investmentCatalogue: '',
+ approvalPlan: '',
+ isSetProject: '',
+ setTime: '',
+ assignmentStatus: '',
+ area: '',
+ winTime: '',
+ winUnit: '',
+ winAmount: '',
+ address: '',
+ engineeringIdList: [],
+ content: '',
+ contact: '',
+ projectOwnerUnit: '',
+ planStartTime: '',
+ planCompleteTime: '',
+ projectContactPerson: '',
+ fileIdList: [],
+ sysOssVos: [],
+ engineeringInfos: [],
+ year: '',
+ yearInvestAmount: '',
+ competentDepartmentList: [],
+ managementCentralizationList: []
+ },
+ plannedStartDate: '',
+ expectedCompletionDate: '',
+ sys_cross_domain: [],
+ sys_industry_classification: [],
+ sys_industry_belong: [],
+ sys_project_attributes: [],
+ sys_whether_project: [],
+ sys_administrative_divisions: []
+ };
+ },
+ mounted() {
+ this.updateFormData();
+ },
+ methods: {
+ chaneCompleted(val) {
+ if (!val) return;
+ this.investment.expectedCompletionDate = formatDate(val);
+ },
+ chaneStartWork(val) {
+ if (!val) return;
+ this.investment.plannedStartDate = formatDate(val);
+ },
+ updateFormData() {
+ if(this.projectForm) {
+ this.plannedStartDate = this.projectForm.planStartTime.slice(0, 10);
+ this.expectedCompletionDate = this.projectForm.planCompleteTime.slice(0, 10);
+ this.investment.constructionLocation = this.projectForm.area;
+ this.investment.detailedAddress = this.projectForm.address;
+ }
+ }
+ },
+ watch: {
+ projectForm: {
+ deep: true,
+ handler() {
+ this.updateFormData();
+ }
+ }
+ }
+};
+</script>
+
+<style lang="scss" scoped>
+.item {
+ width: 100%;
+}
+
+.input-row {
+ display: flex;
+ width: 100%;
+
+ .input-item {
+ width: 100%;
+ }
+}
+
+.map-btn {
+ width: 32px;
+ height: 32px;
+ background: #c6d6ff;
+ border: 1px solid #3369ff;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ cursor: pointer;
+
+ img {
+ width: 20px;
+ }
+}
+</style>
diff --git a/src/views/projectEngineering/projectLibrary/component/investmentFunds.vue b/src/views/projectEngineering/projectLibrary/component/investmentFunds.vue
new file mode 100644
index 0000000..c0ae3d7
--- /dev/null
+++ b/src/views/projectEngineering/projectLibrary/component/investmentFunds.vue
@@ -0,0 +1,252 @@
+<template>
+ <div class="basic-info">
+ <el-form ref="demoFormRef" :disabled="disabled" :model="investmentFunds" class="dialog_form">
+ <!-- 淇濇寔鍘熸湁妯℃澘鍐呭涓嶅彉 -->
+ <el-row :gutter="20">
+ <el-col :span="6">
+ <el-form-item label="椤圭洰鎬绘姇璧勯" label-width="130px" prop="fundsType" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.totalInvestment" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="椤圭洰鏈噾" label-width="130px" prop="investmentType" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.principal" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="18">
+ <el-form-item label="涓�銆佹斂搴滄姇璧�" label-width="130px" prop="projectType" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.governmentInvestmentTotal" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="18">
+ <el-form-item label="锛堜竴锛変腑澶姇璧�" label-width="130px" prop="projectType" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.centralInvestmentTotal" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="6">
+ <el-form-item label="1.涓ぎ棰勭畻鎶曡祫" label-width="130px" prop="fundsType" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.centralBudgetInvestment" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="2.涓ぎ璐㈡斂" label-width="130px" prop="investmentType" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.centralFiscalInvestment" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item class="items" label="3.涓ぎ涓撻」鍊哄埜绛归泦鐨勪笓椤瑰缓璁捐祫閲�" label-width="130px" prop="investmentType" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.centralSpecialBondInvestment" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="18">
+ <el-form-item label="4.涓ぎ涓撻」寤鸿鍩洪噾" label-width="130px" prop="engineering" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.centralSpecialFundInvestment" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="18">
+ <el-form-item label="锛堜簩锛夌渷绾ф姇璧�" label-width="130px" prop="engineering" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.provincialInvestmentTotal" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="6">
+ <el-form-item label="1.鐪侀绠楀唴鎶曡祫" label-width="130px" prop="fundsType" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.provincialBudgetInvestment" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="2.鐪佽储鏀挎�у缓璁炬姇璧�" label-width="130px" prop="investmentType" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.provincialFiscalInvestment" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="3.鐪佷笓椤瑰缓璁捐祫閲�" label-width="130px" prop="investmentType" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.provincialSpecialFundInvestment" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="18">
+ <el-form-item label="锛堜笁锛夊競(宸�)鎶曡祫" label-width="130px" prop="engineering" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.cityInvestmentTotal" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="6">
+ <el-form-item label="1.甯�(宸�)棰勭畻鍐呮姇璧�" label-width="130px" prop="fundsType" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.cityBudgetInvestment" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="2.甯�(宸�)璐㈡斂鎬ф姇璧�" label-width="130px" prop="investmentType" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.cityFiscalInvestment" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="3.甯�(宸�)涓撻」璧勯噾" label-width="130px" prop="investmentType" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.citySpecialFundInvestment" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="18">
+ <el-form-item label="锛堝洓锛夊幙(甯傘�佸尯)鎶曡祫" label-width="130px" prop="engineering" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.countyInvestmentTotal" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="6">
+ <el-form-item label="1.鍖�(鍘�)棰勭畻鍐呮姇璧�" label-width="130px" prop="fundsType" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.countyBudgetInvestment" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item class="items" label="2.鍖猴紙鍘匡級璐㈡斂鎬у缓璁捐祫閲�" label-width="130px" prop="investmentType" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.countyFiscalInvestment" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="3.鍖�(鍘�)涓撻」璧勯噾" label-width="130px" prop="investmentType" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.countySpecialFundInvestment" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="18">
+ <el-form-item label="浜屻�佸浗鍐呰捶娆�" label-width="130px" prop="engineering" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.domesticLoanTotal" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="18">
+ <el-form-item label="閾惰璐锋" label-width="130px" prop="engineering" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.bankLoan" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="18">
+ <el-form-item label="涓夈�佸鍟嗘姇璧�" label-width="130px" prop="engineering" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.foreignInvestmentTotal" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="18">
+ <el-form-item label="鍥涖�佷紒涓氳嚜绛�" label-width="130px" prop="engineering" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.enterpriseSelfRaisedTotal" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="18">
+ <el-form-item label="浜斻�佸叾浠栨姇璧�" label-width="130px" prop="engineering" style="width: 100%">
+ <el-input v-model.trim="investmentFunds.otherInvestmentTotal" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'InvestmentFundsForm',
+ props: {
+ disabled: {
+ type: Boolean,
+ default: false,
+ required: true
+ }
+ },
+ data() {
+ return {
+ investmentFunds: {
+ totalInvestment: '',
+ principal: '',
+ governmentInvestmentTotal: '',
+ centralInvestmentTotal: '',
+ centralBudgetInvestment: '',
+ centralFiscalInvestment: '',
+ centralSpecialBondInvestment: '',
+ centralSpecialFundInvestment: '',
+ provincialInvestmentTotal: '',
+ provincialBudgetInvestment: '',
+ provincialFiscalInvestment: '',
+ provincialSpecialFundInvestment: '',
+ cityInvestmentTotal: '',
+ cityBudgetInvestment: '',
+ cityFiscalInvestment: '',
+ citySpecialFundInvestment: '',
+ countyInvestmentTotal: '',
+ countyBudgetInvestment: '',
+ countyFiscalInvestment: '',
+ countySpecialFundInvestment: '',
+ domesticLoanTotal: '',
+ bankLoan: '',
+ foreignInvestmentTotal: '',
+ enterpriseSelfRaisedTotal: '',
+ otherInvestmentTotal: ''
+ }
+ };
+ },
+ methods: {
+
+ },
+ created() {
+
+ },
+
+}
+</script>
+
+<style lang="scss" scoped>
+.item {
+ width: 100%;
+}
+
+.input-row {
+ display: flex;
+ width: 100%;
+
+ .input-item {
+ width: 100%;
+ }
+}
+
+.map-btn {
+ width: 32px;
+ height: 32px;
+ background: #c6d6ff;
+ border: 1px solid #3369ff;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ cursor: pointer;
+
+ img {
+ width: 20px;
+ }
+}
+
+.items {
+ ::v-deep .el-form-item__label {
+ line-height: 16px;
+ text-align: right;
+ }
+}
+</style>
diff --git a/src/views/projectEngineering/projectLibrary/component/legalPerson.vue b/src/views/projectEngineering/projectLibrary/component/legalPerson.vue
new file mode 100644
index 0000000..d50cc21
--- /dev/null
+++ b/src/views/projectEngineering/projectLibrary/component/legalPerson.vue
@@ -0,0 +1,224 @@
+<template>
+ <div class="basic-info">
+ <el-form ref="demoFormRef" :disabled="disabled" :model="legalPerson" class="dialog_form">
+ <el-row :gutter="20">
+ <el-col :span="6">
+ <el-form-item label="椤圭洰鎬绘姇棰�" label-width="120px" prop="investmentType" style="width: 100%">
+ <el-input v-model="legalPerson.totalInvestment" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="椤圭洰鍗曚綅" label-width="120px" prop="investmentType" style="width: 100%">
+ <el-input v-model="legalPerson.projectUnit" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="椤圭洰鍗曚綅绫诲瀷" label-width="120px" prop="projectType" style="width: 100%">
+ <el-select
+ v-model="legalPerson.projectUnitType"
+ clearable
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option v-for="item in dict.type.sys_unit_type" :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="120px" prop="projectType" style="width: 100%">
+ <el-select
+ v-model="legalPerson.registrationType"
+ clearable
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option v-for="item in dict.type.sys_registration_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="120px" prop="projectType" style="width: 100%">
+ <el-select
+ v-model="legalPerson.holdingSituation"
+ clearable
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option v-for="item in dict.type.sys_holding_situation" :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="120px" prop="projectstatus" style="width: 100%">
+ <el-select
+ v-model="legalPerson.certificateType"
+ clearable
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option v-for="item in dict.type.sys_license_type" :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="120px" prop="investmentType" style="width: 100%">
+ <el-input v-model.trim="legalPerson.certificateNumber" class="item" clearable disabled maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="娉ㄥ唽鍦板潃" label-width="120px" prop="investmentType" style="width: 100%">
+ <el-input v-model.trim="legalPerson.registeredAddress" class="item" clearable disabled maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="娉ㄥ唽璧勯噾" label-width="120px" prop="projectType" style="width: 100%">
+ <el-input v-model.trim="legalPerson.registeredCapital" class="item" clearable disabled maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="6">
+ <el-form-item label="娉曚汉浠ｈ〃" label-width="120px" prop="investmentType" style="width: 100%">
+ <el-input v-model.trim="legalPerson.legal_representative" class="item" clearable disabled maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍥哄畾鐢佃瘽" label-width="120px" prop="investmentType" style="width: 100%">
+ <el-input v-model.trim="legalPerson.fixedPhone" class="item" clearable disabled maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="娉曚汉韬唤璇佸彿" label-width="120px" prop="projectType" style="width: 100%">
+ <el-input v-model.trim="legalPerson.legalPersonIdcard" class="item" clearable disabled maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="6">
+ <el-form-item label="椤圭洰鑱旂郴浜�" label-width="120px" prop="investmentType" style="width: 100%">
+ <el-input v-model.trim="legalPerson.projectContactPerson" class="item" clearable disabled maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="绉诲姩鐢佃瘽" label-width="120px" prop="investmentType" style="width: 100%">
+ <el-input v-model.trim="legalPerson.phone" class="item" clearable disabled maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鑱旂郴浜鸿韩浠借瘉鍙�" label-width="120px" prop="projectType" style="width: 100%">
+ <el-input v-model.trim="legalPerson.contactIdcard" class="item" clearable disabled maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="6">
+ <el-form-item label="寰俊鍙�" label-width="120px" prop="investmentType" style="width: 100%">
+ <el-input v-model.trim="legalPerson.wechat" class="item" clearable disabled maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鑱旂郴浜洪�氳鍦板潃" label-width="120px" prop="investmentType" style="width: 100%">
+ <el-input v-model.trim="legalPerson.contactAddress" class="item" clearable disabled maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="閭斂缂栫爜" label-width="120px" prop="projectType" style="width: 100%">
+ <el-input v-model.trim="legalPerson.postCode" class="item" clearable disabled maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="6">
+ <el-form-item label="鐢靛瓙閭" label-width="120px" prop="investmentType" style="width: 100%">
+ <el-input v-model="legalPerson.email" class="item" clearable disabled maxlength="255" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
+</template>
+
+<script>
+
+export default {
+ dicts: ['sys_unit_type','sys_registration_type','sys_holding_situation','sys_license_type'],
+ name: 'LegalPersonForm',
+ props: {
+ disabled: {
+ type: Boolean,
+ default: false,
+ required: true
+ }
+ },
+ data() {
+ return {
+ legalPerson: {
+ totalInvestment: '',
+ projectUnit: '',
+ projectUnitType: '',
+ registrationType: '',
+ holdingSituation: '',
+ certificateType: '',
+ certificateNumber: '',
+ registeredAddress: '',
+ registeredCapital: '',
+ projectId: '',
+ legal_representative: '',
+ fixedPhone: '',
+ legalPersonIdcard: '',
+ projectContactPerson: '',
+ phone: '',
+ contactIdcard: '',
+ wechat: '',
+ contactAddress: '',
+ postCode: '',
+ email: ''
+ },
+ }
+ },
+ created() {
+
+ },
+ methods: {
+
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+.item {
+ width: 100%;
+}
+
+.input-row {
+ display: flex;
+ width: 100%;
+
+ .input-item {
+ width: 100%;
+ }
+}
+
+.map-btn {
+ width: 32px;
+ height: 32px;
+ background: #c6d6ff;
+ border: 1px solid #3369ff;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ cursor: pointer;
+
+ img {
+ width: 20px;
+ }
+}
+</style>
diff --git a/src/views/projectEngineering/projectLibrary/projectDetails.vue b/src/views/projectEngineering/projectLibrary/projectDetails.vue
index 0cd0d7e..a1e5bf2 100644
--- a/src/views/projectEngineering/projectLibrary/projectDetails.vue
+++ b/src/views/projectEngineering/projectLibrary/projectDetails.vue
@@ -1,6 +1,6 @@
<template>
<el-card class="card-container">
- <div class="flex justify-between mb-4">
+ <div class="flex-container mb-4">
<el-tabs v-model="currentTab" @tab-click="handleClick">
<el-tab-pane
v-for="item in TABS_DATA"
@@ -8,26 +8,31 @@
:label="item.label"
:name="item.value"
>
- <template slot="label">
- <div class="text-sm">{{ item.label }}</div>
+ <template slot-scope="item">
+ <div class="tab-label">{{ item.label }}</div>
</template>
</el-tab-pane>
</el-tabs>
</div>
- <component :is="componentName" ref="childRef" :disabled="disabled" class="w-full h-[calc(100%-55px)]" />
- <div v-if="!disabled" class="mt-[3%] ml-[3%] flex">
- <el-button class="w-[72px]" type="primary" @click="submit">淇濆瓨</el-button>
- <el-button class="w-[72px]" @click="reset">閲嶇疆</el-button>
- <!-- <el-button v-else class="w-[72px]" @click="cancel">鍙栨秷</el-button> -->
+ <component
+ :is="componentName"
+ ref="childRef"
+ :disabled="disabled"
+ class="full-width custom-height"
+ />
+ <div v-if="!disabled" class="button-container">
+ <el-button class="save-button" type="primary" @click="submit">淇濆瓨</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>
</template>
<script>
import BasicInfo from '@/views/projectEngineering/projectLibrary/component/BasicInfo';
-// import InvestInfo from '@/components/InvestInfo.vue';
-// import InvestmentFunds from '@/components/investmentFunds.vue';
-// import LegalPerson from '@/components/legalPerson.vue';
+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 '@/components/PolicyInfo.vue';
// import DocumentsInfo from '@/components/DocumentsInfo.vue';
import { addProject, getProject, updateProject, getProjectCode } from '@/api/projectInfo';
@@ -38,7 +43,7 @@
currentTab: '椤圭洰绠＄悊鍩虹淇℃伅',
id: this.$route.query.id || '',
disabled: false,
- componentName: 'BasicInfo',
+ componentName: BasicInfo,
TABS_DATA: [
{
label: '椤圭洰绠＄悊鍩虹淇℃伅',
@@ -48,17 +53,17 @@
{
label: '鎶曡祫绠＄悊鍩虹淇℃伅',
value: '浠诲姟涓嬪彂',
- componentName: 'InvestInfo'
+ componentName: InvestInfo
},
{
label: ' 椤圭洰鎶曡祫鍙婅祫閲戞潵婧�',
value: '椤圭洰鎶曡祫鍙婅祫閲戞潵婧�',
- componentName: 'InvestmentFunds'
+ componentName: InvestmentFunds
},
{
label: '椤圭洰(娉曚汉)鍗曚綅鐧昏淇℃伅',
value: '椤圭洰(娉曚汉)鍗曚綅鐧昏淇℃伅',
- componentName: 'LegalPerson'
+ componentName: LegalPerson
},
{
label: '鎶曡祫椤圭洰浜т笟鏀跨瓥绗﹀悎鎯呭喌',
@@ -165,7 +170,6 @@
this.getProjectInfo(this.id);
} else {
this.getProjectCodeApi();
- // 鍋囪 resetPlanLibrary 鏄竴涓柟娉曪紝鐢ㄤ簬閲嶇疆鐘舵��
this.resetPlanLibrary();
this.fileList = [];
this.fileIdList = [];
@@ -202,5 +206,36 @@
</script>
<style scoped>
-/* 浣犵殑鏍峰紡 */
+
+::v-deep .el-tabs__nav-wrap::after {
+ background-color: rgba(0, 0, 0, 0) !important;
+}
+.flex-container {
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 16px;
+}
+
+.tab-label {
+ font-size: 14px;
+}
+
+.full-width {
+ width: 100%;
+}
+
+.custom-height {
+ height: calc(100% - 55px);
+}
+
+.button-container {
+ margin-top: 3%;
+ margin-left: 3%;
+ display: flex;
+}
+
+.save-button,
+.reset-button {
+ width: 72px;
+}
</style>
diff --git a/src/views/projectPlan/planInfo.vue b/src/views/projectPlan/planInfo.vue
index f99ec7c..7e0b7cc 100644
--- a/src/views/projectPlan/planInfo.vue
+++ b/src/views/projectPlan/planInfo.vue
@@ -132,7 +132,7 @@
// 涓婃姤鏁版嵁
handleSubmit() {
// 閬嶅巻tableData锛岃幏寰楀�间笉涓虹┖瀛楃涓茬殑琛�
- const validList = this.tableData.filter(item => item.title !== '' && item.startTime !== '' && item.endTime !== '');
+ const validList = this.tableData.filter(item => item.title !== '' || item.startTime !== '' || item.endTime !== '');
this.addData = {
projectPlanRecordId: this.planRecordData.id,
actualInvest: this.actualInvest,
diff --git a/src/views/projectPlan/planInfoCheck.vue b/src/views/projectPlan/planInfoCheck.vue
index 4121112..a3476cf 100644
--- a/src/views/projectPlan/planInfoCheck.vue
+++ b/src/views/projectPlan/planInfoCheck.vue
@@ -7,6 +7,7 @@
<el-card shadow="hover">
<el-row :gutter="20">
<el-col :span="24" class="mb-4">
+ <!--椤圭洰璁″垝椤�-->
<el-table :data="tableData" border stripe style="width: 100%; margin-bottom: 20px">
<el-table-column prop="index" label="搴忓彿" width="50" align="center">
<template #default="scope">
@@ -20,12 +21,12 @@
</el-table-column>
<el-table-column prop="startTime" label="璁″垝寮�濮嬫椂闂�" width="160" align="center">
<template #default="scope">
- <el-date-picker v-model="scope.row.startTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" />
+ <el-date-picker v-model="scope.row.startTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" disabled/>
</template>
</el-table-column>
<el-table-column prop="endTime" label="璁″垝瀹屾垚鏃堕棿" width="160" align="center">
<template #default="scope">
- <el-date-picker v-model="scope.row.endTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" />
+ <el-date-picker v-model="scope.row.endTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" disabled/>
</template>
</el-table-column>
<el-table-column :label="planRecordData.planTimeFlag === 0 ? '鏈堝害' : planRecordData.planTimeFlag === 1 ? '瀛ｅ害' : '骞村害' " width="100" align="center">
@@ -37,7 +38,6 @@
<template #default="scope">
<el-button size="small" @click="handleDelay(scope.$index)">寤舵湡</el-button>
<el-button size="small" type="danger" @click="handleReset(scope.$index)">閲嶇疆</el-button>
- <el-button size="small" type="danger" @click="handleDelete(scope.$index)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -54,6 +54,60 @@
@input="handleInput">
</el-input>
</div>
+
+ <!--涓婄骇鎵瑰-->
+ <div style="margin-bottom: 10px; margin-top: 40px;">
+ <span style="font-size: 20px; font-weight: bold;">涓婄骇鎵瑰</span>
+ </div>
+ <el-table :data="tableData" border stripe style="width: 100%; margin-bottom: 20px">
+ <el-table-column prop="index" label="搴忓彿" width="50" align="center">
+ <template #default="scope">
+ {{ scope.$index + 1 }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="taskName" label="浜嬮」鍚嶇О" width="200" align="center" />
+ <el-table-column prop="startTime" label="涓婄骇瀹℃牳" width="100" align="center" />
+ <el-table-column prop="startTime" label="鎵瑰鍐呭" width="160" align="center" />
+ <el-table-column prop="endTime" label="鎵瑰鍥炲" width="160" align="center">
+ <template #default="scope">
+ <el-input type="textarea" v-model="scope.row.title" placeholder="璇疯緭鍏�" rows="3" />
+ </template>
+ </el-table-column>
+ <el-table-column prop="startTime" label="涓荤閮ㄩ棬瀹℃牳" width="100" align="center" />
+ <el-table-column prop="startTime" label="鎵瑰鍐呭" width="160" align="center" />
+ <el-table-column prop="endTime" label="鎵瑰鍥炲" width="160" align="center">
+ <template #default="scope">
+ <el-input type="textarea" v-model="scope.row.title" placeholder="璇疯緭鍏�" rows="3" />
+ </template>
+ </el-table-column>
+ <el-table-column fixed="right" label="鎿嶄綔" align="center">
+ <template #default="scope">
+ <el-button size="small" @click="handleDelay(scope.$index)">鍥炲</el-button>
+ <el-button size="small" type="danger" @click="handleReset(scope.$index)">閲嶇疆</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+
+ <!--璁″垝鏃ュ織-->
+ <div style="margin-bottom: 10px; margin-top: 40px;">
+ <span style="font-size: 20px; font-weight: bold;">璁″垝鏃ュ織</span>
+ </div>
+ <el-table :data="tableData" border stripe style="width: 100%; margin-bottom: 20px">
+ <el-table-column prop="index" label="搴忓彿" width="50" align="center">
+ <template #default="scope">
+ {{ scope.$index + 1 }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="taskName" label="浜嬮」鍚嶇О" width="200" align="center" />
+ <el-table-column prop="startTime" label="涓婄骇瀹℃牳" width="100" align="center" />
+ <el-table-column prop="startTime" label="鎵瑰鍐呭" width="160" align="center" />
+ <el-table-column prop="endTime" label="鎵瑰鍥炲" width="160" align="center" />
+ <el-table-column prop="startTime" label="涓荤閮ㄩ棬瀹℃牳" width="100" align="center" />
+ <el-table-column prop="startTime" label="鎵瑰鍐呭" width="160" align="center" />
+ <el-table-column prop="endTime" label="鎵瑰鍥炲" width="160" align="center" />
+ <el-table-column fixed="right" label="鏃堕棿" align="center" />
+ </el-table>
</el-col>
</el-row>
</el-card>
@@ -86,7 +140,7 @@
addData: {
projectPlanRecordId: '',
actualInvest: '',
- addList:[]
+ addList: []
}
}
},
@@ -94,7 +148,9 @@
methods: {
// 椤甸潰鍔犺浇
search() {
- this.getPlanInfoData(this.planRecordData.id);
+ this.getPlanInfoData(this.planRecordData.id); // 鑾峰彇椤圭洰璁″垝椤�
+ this.getDepartmentApproval(this.planRecordData.id); // 鑾峰彇涓婄骇鎵瑰
+ //this.getPlanLog(); // 鑾峰彇璁″垝鏃ュ織
},
// 鑾峰彇浼犻�掕繃鏉ョ殑椤圭洰璁″垝璇︽儏
getPlanRecordData() {
@@ -109,17 +165,21 @@
getPlanInfoData(id) {
getPlanInfoData(id).then(response => {
this.actualInvest = response.data.actualInvest;
- if (response.data.list.length === 0){
- this.tableData = [{ title: '', startTime: '', endTime: '' }];
- }else {
+ if (response.data.list.length === 0) {
+ this.tableData = [{title: '', startTime: '', endTime: ''}];
+ } else {
this.tableData = response.data.list;
}
});
},
- // 鍒犻櫎涓�琛屾暟鎹�
- handleDelete(index) {
- this.tableData.splice(index, 1);
+ // 鑾峰彇涓婄骇鎵瑰
+ getDepartmentApproval(projectPlanRecordId) {
+ getExamineRecord(projectPlanRecordId).then(response => {
+ console.log(response.data)
+ });
},
+ // 鑾峰彇璁″垝鏃ュ織
+
// 閲嶇疆褰撳墠琛屾暟鎹�
handleReset(index) {
this.tableData[index].title = '';
@@ -134,7 +194,7 @@
data: JSON.stringify(planInfoData)
}
})
- }
+ },
},
created() {
this.getPlanRecordData();
diff --git a/src/views/projectPlan/planRecord.vue b/src/views/projectPlan/planRecord.vue
index 3f4c1da..9ec2764 100644
--- a/src/views/projectPlan/planRecord.vue
+++ b/src/views/projectPlan/planRecord.vue
@@ -7,8 +7,10 @@
<el-card shadow="hover">
<el-row :gutter="20">
<el-col :span="24" class="mb-4">
- <span>鏈堝害璁″垝</span>
- <el-button type="primary" size="small" style="float: right" @click="handleAddMonthPlan">鏂板</el-button>
+ <div style="margin-bottom: 10px">
+ <span style="font-size: 20px; font-weight: bold;">鏈堝害璁″垝</span>
+ <el-button type="primary" size="small" style="float: right" @click="handleAddMonthPlan">鏂板</el-button>
+ </div>
<el-table :data="monthRecords" style="width: 100%">
<!-- 琛ㄥご -->
<el-table-column prop="id" label="搴忓彿" align="center"></el-table-column>
@@ -32,8 +34,10 @@
</el-table>
</el-col>
<el-col :span="24" class="mb-4" style="margin-top: 20px">
- <span>瀛ｅ害璁″垝</span>
- <el-button type="primary" size="small" style="float: right" @click="handleAddSeasonPlan">鏂板</el-button>
+ <div style="margin-bottom: 10px">
+ <span style="font-size: 20px; font-weight: bold;">瀛ｅ害璁″垝</span>
+ <el-button type="primary" size="small" style="float: right" @click="handleAddSeasonPlan">鏂板</el-button>
+ </div>
<el-table :data="seasonRecords" style="width: 100%">
<!-- 琛ㄥご -->
<el-table-column prop="id" label="搴忓彿" align="center"></el-table-column>
@@ -57,8 +61,10 @@
</el-table>
</el-col>
<el-col :span="24" class="mb-4" style="margin-top: 20px">
- <span>骞村害璁″垝</span>
- <el-button type="primary" size="small" style="float: right" @click="handleAddYearPlan">鏂板</el-button>
+ <div style="margin-bottom: 10px">
+ <span style="font-size: 20px; font-weight: bold;">骞村害璁″垝</span>
+ <el-button type="primary" size="small" style="float: right" @click="handleAddYearPlan">鏂板</el-button>
+ </div>
<el-table :data="yearRecords" style="width: 100%">
<!-- 琛ㄥご -->
<el-table-column prop="id" label="搴忓彿" align="center"></el-table-column>
--
Gitblit v1.8.0