From acf78f6ef785df7f5fa15d1ee0fc62c0bbbe74f6 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期五, 29 十一月 2024 02:37:42 +0800
Subject: [PATCH] 项目计划审批
---
src/views/projectEngineering/projectLibrary/component/BasicInfo.vue | 421 ++++++++++++++++++++++++++++------------------------
1 files changed, 227 insertions(+), 194 deletions(-)
diff --git a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
index c649a96..1319e34 100644
--- a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
+++ b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
@@ -1,247 +1,255 @@
<template>
<div class="basic-info">
- <el-form ref="demoFormRef" :disabled="disabled" :model="projectForm" :rules="rules" class="dialog_form" :inline = "true">
+ <el-form ref="projectForm" :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">
- <el-input v-model.trim="projectForm.projectName" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ <el-input v-model.trim="projectForm.projectName" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�"/>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item class="item" label="椤圭洰浠ｇ爜" label-width="100px" prop="code">
- <el-input v-model.trim="projectForm.projectCode" class="item" clearable disabled maxlength="255" placeholder="璇疯緭鍏�" />
+ <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>
<el-col :span="12" style="position: relative">
- <div style="width: 150px; position: absolute;"><img alt="" src="../../../../assets/images/s.png" /></div>
+ <div style="width: 150px; position: absolute;"><img alt="" src="../../../../assets/images/s.png"/></div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item class="item" label="寤鸿鍐呭" label-width="100px" prop="content">
- <el-input v-model.trim="projectForm.content" style="width: 100%;" clearable maxlength="255" placeholder="璇疯緭鍏�" type="textarea" />
+ <el-input v-model.trim="projectForm.content" style="width: 100%;" clearable maxlength="255"
+ placeholder="璇疯緭鍏�" type="textarea"/>
</el-form-item>
</el-col>
</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">
<el-form-item label="椤圭洰闃舵" label-width="100px" prop="fundsType" style="width: 100%">
- <el-input v-model.trim="projectForm.projectPhase" class="item" clearable disabled maxlength="255" placeholder="璇疯緭鍏�" />
+ <el-input v-model.trim="projectForm.projectPhase" 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="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-input v-model.trim="projectForm.projectOwnerUnit" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ <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-input v-model.trim="projectForm.projectContactPerson" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ <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-input v-model.trim="projectForm.contact" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ <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" />
+ <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" />-->
</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 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-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-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" 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>
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="绔嬮」鏃堕棿" label-width="100px" prop="setTime" style="width: 100%">
- <el-date-picker v-model="setTime" placeholder="閫夋嫨鏃堕棿" style="width: 100%" type="date" @change="chaneApproval" />
+ <el-date-picker v-model="projectForm.createProjectTime"
+ placeholder="閫夋嫨鏃堕棿"
+ style="width: 100%"
+ type="date"
+ value-format="yyyy-MM-dd HH:mm:ss"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="璁″垝寮�宸ユ椂闂�" label-width="100px" style="width: 100%">
- <el-date-picker v-model="planStartTime" placeholder="閫夋嫨鏃堕棿" style="width: 100%" type="date" @change="chaneStartWork" />
+ <el-date-picker v-model="projectForm.planStartTime "
+ placeholder="閫夋嫨鏃堕棿"
+ style="width: 100%"
+ type="date"
+ value-format="yyyy-MM-dd HH:mm:ss"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="璁″垝绔ｅ伐鏃堕棿" label-width="100px" style="width: 100%">
- <el-date-picker v-model="planCompleteTime" placeholder="閫夋嫨鏃堕棿" style="width: 100%" type="date" @change="chaneCompleted" />
+ <el-date-picker v-model="projectForm.planCompleteTime "
+ placeholder="閫夋嫨鏃堕棿"
+ style="width: 100%"
+ type="date"
+ value-format="yyyy-MM-dd HH:mm:ss"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="涓爣鍗曚綅" label-width="100px" prop="setTime" style="width: 100%">
- <el-input v-model.trim="projectForm.winUnit" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ <el-input v-model.trim="projectForm.winUnit" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="涓爣閲戦" label-width="100px" style="width: 100%">
- <el-input v-model.trim="projectForm.winAmount" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" type="number" />
+ <el-input v-model.trim="projectForm.winAmount" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�"
+ type="number"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="涓爣鏃堕棿" label-width="100px" style="width: 100%">
- <el-date-picker v-model="winTime" placeholder="閫夋嫨鏃堕棿" style="width: 100%" type="date" @change="chaneWinTime" />
+ <el-date-picker v-model="projectForm.winTime"
+ placeholder="閫夋嫨鏃堕棿"
+ style="width: 100%"
+ type="date"
+ value-format="yyyy-MM-dd HH:mm:ss"/>
</el-form-item>
</el-col>
</el-row>
<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-input v-model.trim="projectForm.yearInvestAmount" clearable maxlength="255" placeholder="璇疯緭鍏�" style="width: 90%" type="number" />
+ <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>
</el-col>
@@ -250,9 +258,10 @@
<el-col :span="18">
<el-form-item label="椤圭洰鍦板潃:" label-width="100px" prop="medicalAddr" style="width: 100%">
<div class="input-row">
- <el-input v-model.trim="projectForm.address" class="input-item" disabled maxlength="255" placeholder="璇疯緭鍏�"></el-input>
+ <el-input v-model.trim="projectForm.projectAddress" class="input-item" disabled maxlength="255"
+ placeholder="璇疯緭鍏�"></el-input>
<div v-if="!disabled" class="map-btn" @click="dialogMap = true">
- <img alt="" src="@/assets/images/positionl.png" />
+ <img alt="" src="@/assets/images/positionl.png"/>
</div>
</div>
</el-form-item>
@@ -261,47 +270,45 @@
<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="projectForm.fileList"
+ :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';
// import RemoteSelect from '@/components/RemoteSelect/index.vue';
-import { formatDate } from '@/utils';
+import Cookies from "js-cookie";
+import {addProject, getProject, updateProject, getProjectCode} from '@/api/projectEngineering/projectInfo';
+import {approvalList} from "@/api/system/dept";
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
},
@@ -314,10 +321,11 @@
data() {
return {
projectForm: {
+ id: '',
projectName: '',
projectCode: '',
projectType: '',
- projectStatus: '1',
+ projectStatus: 'working',
fundType: '',
investType: '',
importanceType: '',
@@ -339,7 +347,7 @@
winTime: '',
winUnit: '',
winAmount: '',
- address: '',
+ projectAddress: '',
engineeringIdList: [],
content: '',
contact: '',
@@ -347,81 +355,117 @@
planStartTime: '',
planCompleteTime: '',
projectContactPerson: '',
- fileIdList: [],
- sysOssVos: [],
+ fileList: [],
engineeringInfos: [],
year: '',
yearInvestAmount: '',
competentDepartmentList: [],
managementCentralizationList: []
},
- projectList: [],
+ approvalList: [],
+ setTime: '',
+ planStartTime: '',
+ planCompleteTime: '',
+ winTime: '',
dialogMap: false,
page: 1,
loading: false,
hasMore: true,
selectOptions: [],
- accept: `'pdf', 'docx', 'xlsx', 'jpg','jpeg'`,
+ accept: ['pdf', 'docx', 'xlsx', 'jpg', 'jpeg'],
largeCategory: '',
subclass: '',
mapCreateInfo: {},
demoFormRef: null,
rules: {
- projectName: [{ required: true, message: '璇疯緭鍏ラ」鐩悕绉�', trigger: 'blur' }]
+ projectName: [{required: true, message: '璇疯緭鍏ラ」鐩悕绉�', trigger: 'blur'}]
}
};
},
computed: {
dialogMapList() {
return [{
- addr: this.projectForm.address,
+ addr: this.projectForm.projectAddress,
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);
+ mounted() {
+ this.projectForm.id = this.$route.query.projectId;
+ const projectForm = Cookies.get("projectForm");
+ if (projectForm) {
+ this.projectForm = JSON.parse(projectForm);
+ } else {
+ //鍒濆鍖栦富绠￠儴闂ㄤ笅鎷夋
+ this.getApprovalList();
+ // 鍦ㄧ粍浠跺垱寤烘椂鑾峰彇椤圭洰淇℃伅锛屽鏋� projectId 瀛樺湪
+ if (this.projectForm.id) {
+ this.getProjectInfo(this.projectForm.id);
+ } else {
+ this.getProjectCodeApi();
+ }
+ // this.handleLoadMore(1);
+ }
+ },
+ beforeDestroy() {
+ Cookies.set("projectForm", JSON.stringify(this.projectForm));
},
methods: {
+ getProjectInfo(id) {
+ getProject(id).then(res => {
+ this.projectForm = res.data;
+ });
+ },
+ getApprovalList() {
+ approvalList().then(res => {
+ this.approvalList = res.data;
+ });
+ },
+ submit() {
+ this.$refs["projectForm"].validate(valid => {
+ if (valid) {
+ if (this.projectForm.id != null) {
+ updateProject(this.projectForm).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ //璺宠浆鍒颁笅涓粍浠�
+ this.$emit('toNext', 1);
+ });
+ } else {
+ addProject(this.projectForm).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.projectForm.id = response.data
+ //璺宠浆鍒颁笅涓粍浠�
+ this.$emit('toNext', 1);
+ });
+ }
+ }
+ });
+ },
+ getProjectCodeApi() {
+ getProjectCode().then(res => {
+ this.projectForm.projectCode = res.data;
+ });
+ },
changeDepartment(val) {
if (!val.length) {
this.largeCategory = '';
return;
}
- const labels = this.sysDepartment.filter(item => val.includes(item.value)).map(item => item.label);
+ const labels = this.approvalList.filter(item => val.includes(item.id)).map(item => item.value);
this.largeCategory = labels.join(',');
},
changePutUnder(val) {
- // 鍚� changeDepartment 鏂规硶
- },
- chaneApproval(val) {
- if (!val) return;
- this.projectForm.setTime = formatDate(val);
- },
- chaneCompleted(val) {
- if (!val) return;
- this.projectForm.planCompleteTime = formatDate(val);
- },
- chaneWinTime(val) {
- if (!val) return;
- this.projectForm.winTime = formatDate(val);
- },
- chaneStartWork(val) {
- if (!val) return;
- this.projectForm.planStartTime = formatDate(val);
+ if (!val.length) {
+ this.subclass = '';
+ return;
+ }
+ const labels = this.dict.type.sys_centralized_management.filter(item => val.includes(item.value)).map(item => item.label);
+ this.subclass = labels.join(',');
},
async loadDataList(newPage) {
try {
this.loading = true;
- const res = await getList({ pageNum: newPage, pageSize: 10000 });
+ const res = await getList({pageNum: newPage, pageSize: 10000});
const list = res.rows || [];
if (newPage === 1) {
this.selectOptions = [];
@@ -438,41 +482,33 @@
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() {
- const { lon, lat, addr } = this.mapCreateInfo;
+ console.log("鍒涘缓")
+ const {lon, lat, addr} = this.mapCreateInfo;
if (lon && lat && addr) {
this.projectForm.longitude = lon;
this.projectForm.latitude = lat;
- this.projectForm.address = addr;
+ this.projectForm.projectAddress = addr;
this.$message.success('鑾峰彇鍦板潃鎴愬姛');
this.dialogMap = false;
} else {
this.$message.error('鑾峰彇鍧愭爣澶辫触');
}
},
- handleRemove(file) {
- if (file) {
- this.projectForm.fileIdList = this.projectList.map(item => item.fileId);
- localStorage.setItem('projectList', JSON.stringify(file));
- }
- },
- handleAdd(file) {
- if (file) {
- localStorage.setItem('projectList', JSON.stringify(file));
- }
- }
+
},
watch: {
'projectForm.managementCentralizationList'(val) {
if (val) {
- const labels = this.sysCentralizedManagement
+ const labels = this.dict.type.sys_centralized_management
.filter(item => val.includes(item.value))
.map(item => item.label);
this.subclass = labels.join(',');
@@ -480,27 +516,24 @@
},
'projectForm.competentDepartmentList'(val) {
if (val) {
- const labels = this.sysDepartment
- .filter(item => val.includes(item.value))
- .map(item => item.label);
+ const labels = this.approvalList
+ .filter(item => val.includes(item.id))
+ .map(item => item.value);
this.largeCategory = labels.join(',');
}
},
- projectList: {
- handler(val) {
- if (val) {
- this.projectForm.fileIdList = val.map(item => item.fileId);
- }
- },
- deep: true
- }
}
};
</script>
<style lang="scss" scoped>
.item {
- width: 130%;
+ width: 100%;
+}
+
+.map_div {
+ width: 100%;
+ height: 643px;
}
.input-row {
--
Gitblit v1.8.0