From 16f122cfcec09e65e4790ecee46bae1f1b7b8fff Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期日, 02 三月 2025 10:17:38 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
src/views/projectEngineering/projectLibrary/component/investmentFunds.vue | 75 ++
src/views/projectEngineering/projectLibrary/component/legalPerson.vue | 16
src/components/VisibilityToolbar/index.vue | 3
src/api/projectEngineering/projectEngineering.js | 62 ++
src/views/projectEngineering/projectLibrary/list.js | 8
src/views/login.vue | 4
src/api/projectEngineering/projectInfo.js | 12
src/views/projectEngineering/projectLibrary/component/BasicInfo.vue | 142 +++-
src/views/projectEngineering/projectLibrary/projectDetails.vue | 73 ++
src/views/projectProcess/detail/index.vue | 27
src/views/engineering/index.vue | 361 ++++++++++++++
src/views/projectProcess/index.vue | 47 -
src/views/projectProcess/index-copy.vue | 640 +++++++++++++++++++++++++
src/views/components/projectOverview.vue | 8
14 files changed, 1,341 insertions(+), 137 deletions(-)
diff --git a/src/api/projectEngineering/projectEngineering.js b/src/api/projectEngineering/projectEngineering.js
new file mode 100644
index 0000000..43ee8fd
--- /dev/null
+++ b/src/api/projectEngineering/projectEngineering.js
@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+
+// 鑾峰彇椤圭洰宸ョ▼鍒嗛〉
+export const getProjectEngineerings = (params) => {
+ return request({
+ url: "/project-engineering/page",
+ method: "GET",
+ params: params
+ })
+}
+
+// 鑾峰彇椤圭洰宸ョ▼鍒楄〃
+export const getProjectEngineeringList = () => {
+ return request({
+ url: "/project-engineering/list",
+ method: "GET"
+ })
+}
+
+// 閫氳繃id鑾峰彇椤圭洰宸ョ▼
+export const getProjectEngineeringById = (params) => {
+ return request({
+ url: "/project-engineering/" + params,
+ method: "GET"
+ })
+}
+
+// 閫氳繃id鍒犻櫎椤圭洰宸ョ▼
+export const deleteProjectEngineeringById = (params) => {
+ return request({
+ url: "/project-engineering/" + params,
+ method: "DELETE"
+ })
+}
+
+// 鎵归噺鍒犻櫎椤圭洰宸ョ▼
+export const deleteProjectEngineeringByIds = (params) => {
+ return request({
+ url: "/project-engineering/batch",
+ method: "DELETE",
+ data: params
+ })
+}
+
+// 淇敼椤圭洰宸ョ▼
+export const editProjectEngineering = (params) => {
+ return request({
+ url: "/project-engineering/",
+ method: "PUT",
+ data: params
+ })
+}
+
+// 娣诲姞椤圭洰宸ョ▼
+export const addProjectEngineering = (params) => {
+ return request({
+ url: "/project-engineering/",
+ method: "POST",
+ data: params
+ })
+}
diff --git a/src/api/projectEngineering/projectInfo.js b/src/api/projectEngineering/projectInfo.js
index d380122..af8f0d7 100644
--- a/src/api/projectEngineering/projectInfo.js
+++ b/src/api/projectEngineering/projectInfo.js
@@ -9,6 +9,14 @@
})
}
+// 鍏ㄩ儴
+export function list() {
+ return request({
+ url: '/project/info/list',
+ method: 'get'
+ })
+}
+
// 鏌ヨ椤圭洰绠＄悊鍩虹淇℃伅璇︾粏
export function getProject(id) {
return request({
@@ -90,8 +98,8 @@
export function saveHiddenList(data){
return request({
url:'/hidden-admin/updateList',
- method:'put',
- data:data
+ method: 'put',
+ data: data
})
}
export function addList(data){
diff --git a/src/components/VisibilityToolbar/index.vue b/src/components/VisibilityToolbar/index.vue
index c1b45cf..871a291 100644
--- a/src/components/VisibilityToolbar/index.vue
+++ b/src/components/VisibilityToolbar/index.vue
@@ -182,10 +182,9 @@
},
save(){
//淇濆瓨閫昏緫
-
if (this.saveList.length !== 0){
saveHiddenList(CircularJSON.stringify(this.saveList)).then(res =>{
- this.$modal.msgSuccess(res.msg);
+ this.$modal.msgSuccess("淇濆瓨鎴愬姛");
});
}
},
diff --git a/src/views/components/projectOverview.vue b/src/views/components/projectOverview.vue
index be61a27..49d5c32 100644
--- a/src/views/components/projectOverview.vue
+++ b/src/views/components/projectOverview.vue
@@ -215,7 +215,7 @@
this.$router.push({
path: '/projectEngineering/project/reserveProjects',
query: {
- projectCategory: '1'
+ projectPhase: '1'
}
});
break;
@@ -223,7 +223,7 @@
this.$router.push({
path: '/projectEngineering/project/previousProjects',
query: {
- projectCategory: '2'
+ projectPhase: '2'
}
});
break;
@@ -231,7 +231,7 @@
this.$router.push({
path: '/projectEngineering/project/implementationProject',
query: {
- projectCategory: '3'
+ projectPhase: '3'
}
});
break;
@@ -239,7 +239,7 @@
this.$router.push({
path: '/projectEngineering/project/completedProjects',
query: {
- projectCategory: '4'
+ projectPhase: '4'
}
});
break;
diff --git a/src/views/engineering/index.vue b/src/views/engineering/index.vue
new file mode 100644
index 0000000..3dfc4a5
--- /dev/null
+++ b/src/views/engineering/index.vue
@@ -0,0 +1,361 @@
+<template>
+ <div class="app-container">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form-item label="宸ョ▼鍚嶇О" prop="projectName">
+ <el-input
+ v-model="queryParams.projectName"
+ placeholder="璇疯緭鍏ュ伐绋嬪悕绉�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="涓婚」鐩�" prop="projectInfoId">
+ <el-row>
+ <el-select v-model="queryParams.projectInfoId" filterable clearable style="width: 100%" placeholder="璇烽�夋嫨涓婚」鐩�">
+ <el-option
+ v-for="item in projectList"
+ :key="'pp1' + item.id"
+ :label="item.projectName"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-row>
+ </el-form-item>
+ <el-form-item label="椤圭洰鎺ㄨ繘绫诲瀷" label-width="120px" prop="projectType">
+ <el-select v-model="queryParams.projectType" placeholder="璇烽�夋嫨椤圭洰鎺ㄨ繘绫诲瀷" clearable>
+ <el-option
+ v-for="dict in dict.type.sys_project_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐘舵��" prop="status">
+ <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨鐘舵��" clearable>
+ <el-option
+ v-for="dict in dict.type.sys_project_status"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ v-hasPermi="['code:engineering:add']"
+ >鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="success"
+ plain
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleUpdate"
+ v-hasPermi="['code:engineering:edit']"
+ >淇敼</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="danger"
+ plain
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="multiple"
+ @click="deleteByIds"
+ v-hasPermi="['code:engineering:remove']"
+ >鍒犻櫎</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ @click="handleExport"
+ v-hasPermi="['code:engineering:export']"
+ >瀵煎嚭</el-button>
+ </el-col>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
+
+ <el-table v-loading="loading" :data="engineeringList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column label="宸ョ▼鍚嶇О" align="center" prop="projectName" />
+ <el-table-column label="涓婚」鐩悕绉�" align="center" prop="projectInfoName" />
+ <el-table-column label="椤圭洰鎺ㄨ繘绫诲瀷" align="center" prop="projectType">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎶曡祫棰�(涓�)" align="center" prop="investmentAmount" />
+ <el-table-column label="寮�宸ョ姸鎬�" align="center" prop="status">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_project_status" :value="scope.row.status"/>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['code:engineering:edit']"
+ >淇敼</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="deleteById(scope.row)"
+ v-hasPermi="['code:engineering:remove']"
+ >鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="queryParams.currentPage"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
+ />
+
+ <!-- 娣诲姞鎴栦慨鏀瑰伐绋嬪簱瀵硅瘽妗� -->
+ <el-dialog :title="title" :visible.sync="open" width="800px" :close-on-click-modal="false" :destroy-on-close="true" append-to-body>
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form-item label="宸ョ▼鍚嶇О" prop="projectName">
+ <el-input v-model="form.projectName" placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" />
+ </el-form-item>
+ <el-form-item label="涓婚」鐩�" prop="projectInfoId">
+ <el-row>
+ <el-select v-model="form.projectInfoId" filterable style="width: 100%" placeholder="璇烽�夋嫨涓婚」鐩�">
+ <el-option
+ v-for="item in projectList"
+ :key="'pp' + item.id"
+ :label="item.projectName"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-row>
+ </el-form-item>
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <el-form-item label="鎶曡祫棰�(涓�)" prop="investmentAmount">
+ <el-input v-model="form.investmentAmount" type="number" placeholder="璇疯緭鍏ユ姇璧勯(涓囧厓)" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="椤圭洰鎺ㄨ繘绫诲瀷" prop="projectType" label-width="100px">
+ <el-select v-model="form.projectType" style="width: 100%" placeholder="璇烽�夋嫨椤圭洰鎺ㄨ繘绫诲瀷">
+ <el-option
+ v-for="dict in dict.type.sys_project_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-form-item label="寮�宸ョ姸鎬�" prop="status">
+ <el-select v-model="form.status" placeholder="璇烽�夋嫨寮�宸ョ姸鎬�">
+ <el-option
+ v-for="dict in dict.type.sys_project_status"
+ :key="'1111' + dict.value"
+ :value="dict.value"
+ :label="dict.label"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import { getProjectEngineerings, getProjectEngineeringById, deleteProjectEngineeringByIds, deleteProjectEngineeringById, editProjectEngineering, addProjectEngineering } from "@/api/projectEngineering/projectEngineering";
+import {list} from "@/api/projectEngineering/projectInfo";
+
+export default {
+ name: "Engineering",
+ dicts: ['sys_project_type', 'sys_project_status'],
+ data() {
+ return {
+ projectList: [], // 涓婚」鐩垪琛�
+ // 閬僵灞�
+ loading: true,
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 鎬绘潯鏁�
+ total: 0,
+ // 宸ョ▼搴撹〃鏍兼暟鎹�
+ engineeringList: [],
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ currentPage: 1,
+ pageSize: 10,
+ projectInfoId: null,
+ projectName: null,
+ projectType: null,
+ status: null,
+ },
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ projectName: [{required: true, message: '璇疯緭鍏ュ伐绋嬪悕绉�', trigger: 'blur'}],
+ projectInfoId: [{required: true, message: '璇烽�夋嫨涓婚」鐩�', trigger: 'change'}],
+ investmentAmount: [{required: true, message: '璇疯緭鍏ユ姇璧勯', trigger: 'change'}],
+ projectType: [{required: true, message: '璇烽�夋嫨娴佺▼鎺ㄨ繘绫诲瀷', trigger: 'change'}],
+ status: [{required: true, message: '璇烽�夋嫨寮�宸ョ姸鎬�', trigger: 'change'}],
+ }
+ };
+ },
+ created() {
+ this.getList();
+ this.getProjectList();
+ },
+ methods: {
+ getProjectList() {
+ list().then(res => {
+ this.projectList = res.data
+ })
+ },
+ /** 鏌ヨ宸ョ▼搴撳垪琛� */
+ getList() {
+ this.loading = true;
+ getProjectEngineerings(this.queryParams).then(res => {
+ this.engineeringList = res.data;
+ this.total = res.total;
+ this.loading = false;
+ });
+ },
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.open = false;
+ this.reset();
+ },
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ this.form = {
+ id: null,
+ projectInfoId: null,
+ projectName: null,
+ projectType: null,
+ investmentAmount: null,
+ status: null,
+ gmtCreate: null,
+ gmtUpdate: null,
+ deleted: null
+ };
+ this.resetForm("form");
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.getList();
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ this.ids = selection.map(item => item.id)
+ this.single = selection.length!==1
+ this.multiple = !selection.length
+ },
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.reset();
+ this.open = true;
+ this.title = "娣诲姞宸ョ▼";
+ },
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate(row) {
+ this.reset();
+ const id = row.id || this.ids
+ getProjectEngineeringById(id).then(response => {
+ this.form = response.data;
+ this.open = true;
+ this.title = "淇敼宸ョ▼";
+ });
+ },
+ /** 鎻愪氦鎸夐挳 */
+ submitForm() {
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ if (this.form.id != null) {
+ editProjectEngineering(this.form).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ } else {
+ addProjectEngineering(this.form).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ }
+ }
+ });
+ },
+ deleteById(row) {
+ this.$modal.confirm('鏄惁纭鍒犻櫎閫変腑宸ョ▼锛�').then(function() {
+ return deleteProjectEngineeringById(row.id);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ deleteByIds() {
+ const ids = this.ids;
+ this.$modal.confirm('鏄惁纭鍒犻櫎閫変腑宸ョ▼锛�').then(function() {
+ return deleteProjectEngineeringByIds(ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ handleExport() {
+ this.download('code/engineering/export', {
+ ...this.queryParams
+ }, `engineering_${new Date().getTime()}.xlsx`)
+ }
+ }
+};
+</script>
diff --git a/src/views/login.vue b/src/views/login.vue
index 1794448..bb69350 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -153,8 +153,8 @@
currentTab: "corporation",
codeUrl: "",
loginForm: {
- username: "admin",
- password: "admin123",
+ username: "",
+ password: "",
rememberMe: false,
code: "",
uuid: "",
diff --git a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
index d27e24c..4807cf7 100644
--- a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
+++ b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
@@ -48,7 +48,7 @@
<el-row :gutter="20">
<el-col :span="6">
- <el-form-item label="璧勯噾绫诲瀷" label-width="100px" style="width: 100%">
+ <el-form-item label="璧勯噾绫诲瀷" label-width="100px" prop="fundTypeList" style="width: 100%">
<el-select
v-model="projectForm.fundTypeList"
clearable
@@ -119,7 +119,7 @@
<!-- </el-col>-->
<el-col :span="6">
- <el-form-item label="椤圭洰鐘舵��" label-width="100px" prop="projectstatus" style="width: 100%">
+ <el-form-item label="椤圭洰鐘舵��" label-width="100px" prop="projectStatus" style="width: 100%">
<el-select v-model="projectForm.projectStatus" clearable placeholder="璇烽�夋嫨" @change="handleProjectStatusChange" style="width: 100%">
<el-option v-for="item in dict.type.sys_project_status" :key="item.value" :label="item.label"
:value="item.value"/>
@@ -154,14 +154,13 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <!-- TODO锛氭殏鏃朵笉鍋� -->
- <el-form-item label="椤圭洰涓氫富鍗曚綅" label-width="100px" prop="engineering" style="width: 100%">
+ <el-form-item label="椤圭洰涓氫富鍗曚綅" label-width="100px" prop="projectOwnerUnit" style="width: 100%">
<!-- <el-input v-model.trim="getEngineeringName" class="item" clearable disabled maxlength="255" placeholder="璇峰湪宸ョ▼涓�夋嫨椤圭洰" />-->
<!-- <el-select v-model="projectForm.engineeringIdList" :multiple="true" collapse-tags placeholder="璇烽�夋嫨"-->
<!-- style="width: 100%">-->
<!-- <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="閫夋嫨涓婄骇閮ㄩ棬" />-->
- <treeselect v-model="projectForm.projectOwnerUnit" :disabled="disabled" :options="selectOptions" noChildrenText="鏃犲尮閰嶆暟鎹�" :normalizer="normalizer" placeholder="閫夋嫨鍗曚綅" />
+ <treeselect v-model="projectForm.projectOwnerUnit" :disabled="disabled" :options="selectOptions" @input="getProjectOwnerUnit" noChildrenText="鏃犲尮閰嶆暟鎹�" :normalizer="normalizer" placeholder="閫夋嫨鍗曚綅" />
<!-- <RemoteSelect v-if="selectOptions.length" :hasMore="hasMore" :loading="loading" :page="page" @loadMore="handleLoadMore" />-->
<!-- </el-select>-->
</el-form-item>
@@ -170,11 +169,11 @@
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="涓荤閮ㄩ棬" label-width="100px" prop="competentDepartment" style="width: 100%">
- <treeselect v-model="projectForm.competentDepartment" :disabled="disabled" @input="getCompetentDepartmentInfo" noChildrenText="鏃犲尮閰嶆暟鎹�" :options="approvalList" :normalizer="normalizer" placeholder="閫夋嫨鍗曚綅" />
+ <treeselect v-model="competentDepartment" :disabled="disabled" @input="getCompetentDepartmentInfo" noChildrenText="鏃犲尮閰嶆暟鎹�" :options="approvalList" :normalizer="normalizer" placeholder="閫夋嫨鍗曚綅" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="涓荤閮ㄩ棬鑱旂郴浜�" label-width="140px" style="width: 100%">
+ <el-form-item label="涓荤閮ㄩ棬鑱旂郴浜�" prop="competentDepartmentPerson" label-width="140px" style="width: 100%">
<el-select
v-model="projectForm.competentDepartmentPerson"
clearable
@@ -194,7 +193,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="涓荤閮ㄩ棬鑱旂郴鏂瑰紡" label-width="140px" style="width: 100%">
+ <el-form-item label="涓荤閮ㄩ棬鑱旂郴鏂瑰紡" prop="competentDepartmentPhone" label-width="140px" style="width: 100%">
<el-input
v-model="projectForm.competentDepartmentPhone"
clearable
@@ -218,7 +217,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="绠＄悊褰掑彛" label-width="100px" style="width: 100%">
+ <el-form-item label="绠＄悊褰掑彛" prop="managementCentralizationList" label-width="100px" style="width: 100%">
<el-select
v-model="projectForm.managementCentralizationList"
clearable
@@ -234,7 +233,7 @@
</el-row>
<el-row :gutter="20">
<el-col :span="6">
- <el-form-item label="椤圭洰瀹℃壒绫诲瀷" label-width="100px" style="width: 100%">
+ <el-form-item label="椤圭洰瀹℃壒绫诲瀷" prop="projectApprovalType" label-width="100px" style="width: 100%">
<el-select
v-model="projectForm.projectApprovalType"
clearable
@@ -247,13 +246,13 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鎶曡祫绫诲埆" label-width="100px" style="width: 100%">
+ <el-form-item label="鎶曡祫绫诲埆" prop="largeCategory" label-width="100px" style="width: 100%">
<el-input v-model="largeCategory" clearable disabled placeholder="璇烽�夋嫨澶х被" style="width: 49%"/>
<el-input v-model="subclass" clearable disabled placeholder="璇烽�夋嫨灏忕被" style="width: 49%;margin-left: 2%"/>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="閲嶇偣鍒嗙被" label-width="100px" style="width: 100%">
+ <el-form-item label="閲嶇偣鍒嗙被" prop="importanceTypeList" label-width="100px" style="width: 100%">
<el-select
v-model="projectForm.importanceTypeList"
:multiple="true"
@@ -265,9 +264,6 @@
</el-select>
</el-form-item>
</el-col>
-
-
-
</el-row>
<el-row :gutter="20">
@@ -281,7 +277,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="璁″垝寮�宸ユ椂闂�" label-width="100px" style="width: 100%">
+ <el-form-item label="璁″垝寮�宸ユ椂闂�" prop="planStartTime" label-width="100px" style="width: 100%">
<el-date-picker v-model="projectForm.planStartTime "
placeholder="閫夋嫨鏃堕棿"
style="width: 100%"
@@ -290,7 +286,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="璁″垝绔ｅ伐鏃堕棿" label-width="100px" style="width: 100%">
+ <el-form-item label="璁″垝绔ｅ伐鏃堕棿" prop="planCompleteTime" label-width="100px" style="width: 100%">
<el-date-picker v-model="projectForm.planCompleteTime "
placeholder="閫夋嫨鏃堕棿"
style="width: 100%"
@@ -302,11 +298,11 @@
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="琛屼笟涓荤閮ㄩ棬" label-width="100px" prop="industryCompetentDepartment" style="width: 100%">
- <treeselect v-model="projectForm.industryCompetentDepartment" :disabled="disabled" noChildrenText="鏃犲尮閰嶆暟鎹�" @input="getIndustryCompetentDepartmentInfo" :options="approvalList" :normalizer="normalizer" placeholder="閫夋嫨鍗曚綅" />
+ <treeselect v-model="industryCompetentDepartment" :disabled="disabled" noChildrenText="鏃犲尮閰嶆暟鎹�" @input="getIndustryCompetentDepartmentInfo" :options="approvalList" :normalizer="normalizer" placeholder="閫夋嫨鍗曚綅" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="琛屼笟涓荤閮ㄩ棬鑱旂郴浜�" label-width="160px" style="width: 100%">
+ <el-form-item label="琛屼笟涓荤閮ㄩ棬鑱旂郴浜�" prop="industryCompetentDepartmentPerson" label-width="160px" style="width: 100%">
<el-select
v-model="projectForm.industryCompetentDepartmentPerson"
clearable
@@ -326,7 +322,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="琛屼笟涓荤閮ㄩ棬鑱旂郴鏂瑰紡" label-width="160px" style="width: 100%">
+ <el-form-item label="琛屼笟涓荤閮ㄩ棬鑱旂郴鏂瑰紡" prop="departmentPersonPhone" label-width="160px" style="width: 100%">
<el-input
v-model="projectForm.departmentPersonPhone"
clearable
@@ -340,20 +336,20 @@
<div class="label">
<div style="font-size: small;margin-bottom: 10px">涓爣鍗曚綅锛�</div>
<div>
- <el-row :gutter="20" v-for="(winUnit,index) in projectForm.winUnitList" :key="'zb' + index">
- <el-col :span="5">
- <el-form-item label="鍗曚綅鍚嶇О" label-width="100px" prop="setTime" style="width: 100%">
+ <el-row :gutter="10" v-for="(winUnit,index) in projectForm.winUnitList" :key="'zb' + index">
+ <el-col :span="7">
+ <el-form-item label="鍗曚綅鍚嶇О" label-width="80px" prop="setTime" style="width: 100%">
<el-input v-model.trim="winUnit.winUnit" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�"/>
</el-form-item>
</el-col>
<el-col :span="4">
- <el-form-item label="涓爣閲戦" label-width="100px" style="width: 100%">
+ <el-form-item label="涓爣閲戦" label-width="80px" style="width: 100%">
<el-input v-model.trim="winUnit.winAmount" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�"
type="number"/>
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="涓爣鏃堕棿" label-width="100px" style="width: 100%">
+ <el-form-item label="涓爣鏃堕棿" label-width="80px" style="width: 100%">
<el-date-picker v-model="winUnit.winTime"
placeholder="閫夋嫨鏃堕棿"
style="width: 100%"
@@ -367,7 +363,7 @@
</el-form-item>
</el-col>
<el-col :span="4">
- <el-form-item label="鑱旂郴鐢佃瘽" label-width="100px" style="width: 100%">
+ <el-form-item label="鑱旂郴鐢佃瘽" label-width="80px" style="width: 100%">
<el-input v-model.trim="winUnit.phone" class="item" clearable maxlength="20" placeholder="璇疯緭鍏�"/>
</el-form-item>
</el-col>
@@ -503,6 +499,8 @@
return {
tagList: [],
projectSubTypeList: [], // 椤圭洰瀛愮被鍨�
+ competentDepartment: '',
+ industryCompetentDepartment: '',
projectForm: {
id: '',
projectName: '',
@@ -579,8 +577,32 @@
mapCreateInfo: {},
demoFormRef: null,
rules: {
- projectName: [{required: true, message: '璇疯緭鍏ラ」鐩悕绉�', trigger: 'blur'}]
- }
+ projectName: [{required: true, message: '璇疯緭鍏ラ」鐩悕绉�', trigger: 'blur'}],
+ content: [{required: true, message: '璇疯緭鍏ュ缓璁惧唴瀹�', trigger: 'blur'}],
+ fundTypeList: [{required: true, message: '璇烽�夋嫨璧勯噾绫诲瀷', trigger: 'change'}],
+ investType: [{required: true, message: '璇烽�夋嫨椤圭洰鎶曡祫绫诲埆', trigger: 'change'}],
+ constructionNature: [{required: true, message: '璇烽�夋嫨寤鸿鎬ц川', trigger: 'change'}],
+ attractInvestment: [{required: true, message: '璇烽�夋嫨鏄惁鎷涘晢寮曡祫椤圭洰', trigger: 'change'}],
+ projectType: [{required: true, message: '璇烽�夋嫨椤圭洰鎺ㄨ繘绫诲瀷', trigger: 'change'}],
+ projectStatus: [{required: true, message: '璇烽�夋嫨椤圭洰鐘舵��', trigger: 'change'}],
+ projectPhase: [{required: true, message: '璇烽�夋嫨椤圭洰闃舵', trigger: 'change'}],
+ projectContactPerson: [{required: true, message: '璇疯緭鍏ラ」鐩仈绯讳汉', trigger: 'blur'}],
+ contact: [{required: true, message: '璇疯緭鍏ラ」鐩仈绯绘柟寮�', trigger: 'blur'}],
+ projectOwnerUnit: [{required: true, message: '璇烽�夋嫨椤圭洰涓氫富鍗曚綅', trigger: 'change'}],
+ competentDepartment: [{required: true, message: '璇烽�夋嫨涓荤閮ㄩ棬', trigger: 'change'}],
+ competentDepartmentPerson: [{required: true, message: '璇烽�夋嫨涓荤閮ㄩ棬鑱旂郴浜�', trigger: 'change'}],
+ competentDepartmentPhone: [{required: true, message: '璇疯緭鍏ヤ富绠￠儴闂ㄨ仈绯绘柟寮�', trigger: 'blur'}],
+ area: [{required: true, message: '璇烽�夋嫨琛屾斂鍖哄垝', trigger: 'change'}],
+ managementCentralizationList: [{required: true, message: '璇烽�夋嫨绠＄悊褰掑彛', trigger: 'change'}],
+ projectApprovalType: [{required: true, message: '璇烽�夋嫨椤圭洰瀹℃壒绫诲瀷', trigger: 'change'}],
+ importanceTypeList: [{required: true, message: '璇烽�夋嫨閲嶇偣鍒嗙被', trigger: 'change'}],
+ planStartTime: [{required: true, message: '璇烽�夋嫨璁″垝寮�宸ユ椂闂�', trigger: 'change'}],
+ planCompleteTime: [{required: true, message: '璇烽�夋嫨璁″垝绔ｅ伐鏃堕棿', trigger: 'change'}],
+ industryCompetentDepartment: [{required: true, message: '璇烽�夋嫨琛屼笟涓荤閮ㄩ棬', trigger: 'change'}],
+ industryCompetentDepartmentPerson: [{required: true, message: '璇疯緭鍏ヨ涓氫富绠￠儴闂ㄨ仈绯讳汉', trigger: 'blur'}],
+ departmentPersonPhone: [{required: true, message: '璇疯緭鍏ヨ涓氫富绠￠儴闂ㄨ仈绯绘柟寮�', trigger: 'blur'}],
+ },
+ needClearPeople: true
};
},
computed: {
@@ -601,12 +623,6 @@
if (projectForm) {
this.projectForm = JSON.parse(projectForm);
- if (this.projectForm.industryCompetentDepartment) {
- // 鏍规嵁閫変腑鐨勯儴闂↖D鏌ヨ浜哄憳
- getByDept(this.projectForm.industryCompetentDepartment).then((res) => {
- this.personList = res.data;
- })
- }
if (this.projectForm.projectType) {
// 鏍规嵁椤圭洰绫诲瀷鏌ュ瓙绫诲瀷
getDicts("sys_project_type").then(res => {
@@ -619,6 +635,8 @@
})
}
this.$emit('updateIsShow', true);
+ this.competentDepartment = this.projectForm.competentDepartment
+ this.industryCompetentDepartment = this.projectForm.industryCompetentDepartment
} else {
this.projectForm.id = this.$route.query.projectId;
// 鍦ㄧ粍浠跺垱寤烘椂鑾峰彇椤圭洰淇℃伅锛屽鏋� projectId 瀛樺湪
@@ -630,17 +648,29 @@
}
// this.handleLoadMore(1);
}
- console.log(this.projectForm, "鍘熷鍊�")
+
this.$nextTick(() => {
- console.log("璁剧疆浜�")
this.tagList = this.projectForm.tag ? this.projectForm.tag.split(",") : []
- console.log(this.tagList)
})
},
beforeDestroy() {
localStorage.setItem("projectForm", JSON.stringify(this.projectForm));
},
methods: {
+ getIndustryCompetentDepartmentPeople(deptId) {
+ // 鏍规嵁閫変腑鐨勯儴闂↖D鏌ヨ浜哄憳
+ getByDept(deptId).then((res) => {
+ this.personList = res.data;
+ this.personList.forEach(item => item.userId += '')
+ })
+ },
+ getCompetentDepartmentPeople(deptId) {
+ // 鏍规嵁閫変腑鐨勯儴闂↖D鏌ヨ浜哄憳
+ getByDept(deptId).then((res) => {
+ this.deptPersonList = res.data;
+ this.deptPersonList.forEach(item => item.userId += '')
+ })
+ },
getTagList(list) {
console.log("鎷垮埌浜�")
if (!list || list.length < 1) {
@@ -691,28 +721,41 @@
},
getIndustryCompetentDepartmentInfo(deptId) {
if (deptId) {
- getByDept(deptId).then((res) => {
- this.personList = res.data;
- })
+ if (this.projectForm.industryCompetentDepartment != deptId) {
+ this.projectForm.industryCompetentDepartmentPerson = ""
+ this.projectForm.departmentPersonPhone = ""
+ }
+ this.projectForm.industryCompetentDepartment = deptId
+ this.getIndustryCompetentDepartmentPeople(deptId)
} else {
+ this.projectForm.industryCompetentDepartment = ''
this.personList = [];
+ }
+ },
+ getProjectOwnerUnit(deptId) {
+ if (deptId) {
+ this.projectForm.projectOwnerUnit = deptId
+ } else {
+ this.projectForm.projectOwnerUnit = ''
}
},
getCompetentDepartmentInfo(deptId) {
if (deptId) {
- getByDept(deptId).then((res) => {
- this.deptPersonList = res.data;
- })
+ if (this.projectForm.competentDepartment != deptId) {
+ this.projectForm.competentDepartmentPerson = ""
+ this.projectForm.competentDepartmentPhone = ""
+ }
+ this.projectForm.competentDepartment = deptId
+ this.getCompetentDepartmentPeople(deptId)
} else {
+ this.projectForm.competentDepartment = ''
this.deptPersonList = [];
}
},
handleDepartmentChange(departmentId) {
if (departmentId) {
// 鏍规嵁閫変腑鐨勯儴闂↖D鏌ヨ浜哄憳
- getByDept(departmentId).then((res) => {
- this.personList = res.data;
- })
+ this.getIndustryCompetentDepartmentPeople(departmentId)
} else {
// 濡傛灉鏈�夋嫨閮ㄩ棬锛屾竻绌轰汉鍛樺垪琛�
this.personList = [];
@@ -779,18 +822,21 @@
this.tagList = this.projectForm.tag ? this.projectForm.tag.split(",") : []
console.log(this.tagList)
})
+ this.competentDepartment = this.projectForm.competentDepartment
+ this.industryCompetentDepartment = this.projectForm.industryCompetentDepartment
});
},
getApprovalList() {
approvalList().then(res => {
- this.approvalList = this.handleTree(res.data, "deptId");;
+ this.approvalList = this.handleTree(res.data, "deptId");
+ this.approvalList.push({deptId: '', deptName: '鏃�', children: []})
});
},
getDeptList(){
listDept().then(response => {
console.log(response.data)
-
this.selectOptions = this.handleTree(response.data, "deptId");
+ this.selectOptions.push({deptId: '', deptName: '鏃�', children: []})
});
},
diff --git a/src/views/projectEngineering/projectLibrary/component/investmentFunds.vue b/src/views/projectEngineering/projectLibrary/component/investmentFunds.vue
index 6280f9f..97a0272 100644
--- a/src/views/projectEngineering/projectLibrary/component/investmentFunds.vue
+++ b/src/views/projectEngineering/projectLibrary/component/investmentFunds.vue
@@ -1,11 +1,11 @@
<template>
<div class="basic-info">
- <el-form ref="demoFormRef" :disabled="disabled" :model="investmentFundsForm" class="dialog_form">
+ <el-form ref="demoFormRef" :disabled="disabled" :model="investmentFundsForm" :rules="rules" 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="investmentFundsForm.totalInvestment" class="item" clearable maxlength="255" style="width: 90%"
+ <el-form-item label="椤圭洰鎬绘姇璧勯" label-width="130px" prop="totalInvestment" required style="width: 100%">
+ <el-input v-model.trim="totalInvestment" class="item" clearable disabled style="width: 90%"
placeholder="璇疯緭鍏�"/>
<span class="money">涓囧厓</span>
</el-form-item>
@@ -30,7 +30,7 @@
<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="investmentFundsForm.centralInvestmentTotal" class="item" clearable maxlength="255" style="width: 90%"
+ <el-input v-model.trim="centralInvestmentTotal" class="item" clearable disabled style="width: 90%"
placeholder="璇疯緭鍏�"/>
<span class="money">涓囧厓</span>
</el-form-item>
@@ -86,8 +86,8 @@
<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="investmentFundsForm.provincialInvestmentTotal" class="item" clearable style="width: 90%"
- maxlength="255" placeholder="璇疯緭鍏�"/>
+ <el-input v-model.trim="provincialInvestmentTotal" class="item" clearable disabled style="width: 90%"
+ placeholder="璇疯緭鍏�"/>
<span class="money">涓囧厓</span>
</el-form-item>
</el-col>
@@ -118,7 +118,7 @@
<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="investmentFundsForm.cityInvestmentTotal" class="item" clearable maxlength="255" style="width: 90%"
+ <el-input v-model.trim="cityInvestmentTotal" class="item" clearable disabled style="width: 90%"
placeholder="璇疯緭鍏�"/>
<span class="money">涓囧厓</span>
</el-form-item>
@@ -150,7 +150,7 @@
<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="investmentFundsForm.countyInvestmentTotal" class="item" clearable maxlength="255" style="width: 90%"
+ <el-input v-model.trim="countyInvestmentTotal" class="item" disabled style="width: 90%"
placeholder="璇疯緭鍏�"/>
<span class="money">涓囧厓</span>
</el-form-item>
@@ -159,7 +159,7 @@
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="1.鍖�(鍘�)棰勭畻鍐呮姇璧�" label-width="180px" prop="fundsType" style="width: 100%">
- <el-input v-model.trim="investmentFundsForm.countyBudgetInvestment" class="item" clearable maxlength="255" style="width: 90%"
+ <el-input v-model.trim="investmentFundsForm.countyBudgetInvestment" class="item" clearable style="width: 90%"
placeholder="璇疯緭鍏�"/>
<span class="money">涓囧厓</span>
</el-form-item>
@@ -167,7 +167,7 @@
<el-col :span="6">
<el-form-item label="2.鍖猴紙鍘匡級璐㈡斂鎬у缓璁捐祫閲�" label-width="170px" prop="investmentType"
style="width: 100%">
- <el-input v-model.trim="investmentFundsForm.countyFiscalInvestment" class="item" clearable maxlength="255" style="width: 90%"
+ <el-input v-model.trim="investmentFundsForm.countyFiscalInvestment" class="item" clearable style="width: 90%"
placeholder="璇疯緭鍏�"/>
<span class="money">涓囧厓</span>
</el-form-item>
@@ -175,7 +175,7 @@
<el-col :span="6">
<el-form-item label="3.鍖�(鍘�)涓撻」璧勯噾" label-width="130px" prop="investmentType" style="width: 100%">
<el-input v-model.trim="investmentFundsForm.countySpecialFundInvestment" class="item" clearable style="width: 90%"
- maxlength="255" placeholder="璇疯緭鍏�"/>
+ type="number" placeholder="璇疯緭鍏�"/>
<span class="money">涓囧厓</span>
</el-form-item>
</el-col>
@@ -183,7 +183,7 @@
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="4.鍦版柟鏀垮簻涓撻」鍊哄埜" label-width="180px" prop="engineering" style="width: 100%">
- <el-input v-model.trim="investmentFundsForm.deptBond" class="item" clearable maxlength="255" style="width: 90%"
+ <el-input v-model.trim="investmentFundsForm.deptBond" class="item" clearable style="width: 90%"
placeholder="璇疯緭鍏�"/>
<span class="money">涓囧厓</span>
</el-form-item>
@@ -257,9 +257,60 @@
required: true
},
},
+ computed: {
+ totalInvestment() {
+ this.investmentFundsForm.totalInvestment =
+ parseFloat(this.investmentFundsForm.governmentInvestmentTotal ? this.investmentFundsForm.governmentInvestmentTotal : 0) +
+ this.centralInvestmentTotal +
+ this.provincialInvestmentTotal +
+ this.cityInvestmentTotal +
+ this.countyInvestmentTotal +
+ parseFloat(this.investmentFundsForm.domesticLoanTotal ? this.investmentFundsForm.domesticLoanTotal : 0) +
+ parseFloat(this.investmentFundsForm.bankLoan ? this.investmentFundsForm.bankLoan : 0) +
+ parseFloat(this.investmentFundsForm.foreignInvestmentTotal ? this.investmentFundsForm.foreignInvestmentTotal : 0) +
+ parseFloat(this.investmentFundsForm.enterpriseSelfRaisedTotal ? this.investmentFundsForm.enterpriseSelfRaisedTotal : 0) +
+ parseFloat(this.investmentFundsForm.otherInvestmentTotal ? this.investmentFundsForm.otherInvestmentTotal : 0)
+ return this.investmentFundsForm.totalInvestment;
+ },
+ centralInvestmentTotal() {
+ this.investmentFundsForm.centralInvestmentTotal =
+ parseFloat(this.investmentFundsForm.centralBudgetInvestment ? this.investmentFundsForm.centralBudgetInvestment : 0) +
+ parseFloat(this.investmentFundsForm.centralFiscalInvestment ? this.investmentFundsForm.centralFiscalInvestment : 0) +
+ parseFloat(this.investmentFundsForm.centralSpecialBondInvestment ? this.investmentFundsForm.centralSpecialBondInvestment : 0) +
+ parseFloat(this.investmentFundsForm.centralSpecialFundInvestment ? this.investmentFundsForm.centralSpecialFundInvestment : 0) +
+ parseFloat(this.investmentFundsForm.nationalDebt ? this.investmentFundsForm.nationalDebt : 0) +
+ parseFloat(this.investmentFundsForm.additionalNationalDebt ? this.investmentFundsForm.additionalNationalDebt : 0)
+ return this.investmentFundsForm.centralInvestmentTotal;
+ },
+ provincialInvestmentTotal() {
+ this.investmentFundsForm.provincialInvestmentTotal =
+ parseFloat(this.investmentFundsForm.provincialBudgetInvestment ? this.investmentFundsForm.provincialBudgetInvestment : 0) +
+ parseFloat(this.investmentFundsForm.provincialFiscalInvestment ? this.investmentFundsForm.provincialFiscalInvestment : 0) +
+ parseFloat(this.investmentFundsForm.provincialSpecialFundInvestment ? this.investmentFundsForm.provincialSpecialFundInvestment : 0)
+ return this.investmentFundsForm.provincialInvestmentTotal;
+ },
+ cityInvestmentTotal() {
+ this.investmentFundsForm.cityInvestmentTotal =
+ parseFloat(this.investmentFundsForm.cityBudgetInvestment ? this.investmentFundsForm.cityBudgetInvestment : 0) +
+ parseFloat(this.investmentFundsForm.cityFiscalInvestment ? this.investmentFundsForm.cityFiscalInvestment : 0) +
+ parseFloat(this.investmentFundsForm.citySpecialFundInvestment ? this.investmentFundsForm.citySpecialFundInvestment : 0)
+ return this.investmentFundsForm.cityInvestmentTotal;
+ },
+ countyInvestmentTotal() {
+ this.investmentFundsForm.countyInvestmentTotal =
+ parseFloat(this.investmentFundsForm.countyBudgetInvestment ? this.investmentFundsForm.countyBudgetInvestment : 0) +
+ parseFloat(this.investmentFundsForm.countyFiscalInvestment ? this.investmentFundsForm.countyFiscalInvestment : 0) +
+ parseFloat(this.investmentFundsForm.countySpecialFundInvestment ? this.investmentFundsForm.countySpecialFundInvestment : 0) +
+ parseFloat(this.investmentFundsForm.deptBond ? this.investmentFundsForm.deptBond : 0)
+ return this.investmentFundsForm.countyInvestmentTotal;
+ }
+ },
data() {
return {
projectForm: {},
+ rules: {
+
+ },
investmentFundsForm: {
// id: '',
// projectId: '',
diff --git a/src/views/projectEngineering/projectLibrary/component/legalPerson.vue b/src/views/projectEngineering/projectLibrary/component/legalPerson.vue
index 3116490..e57e757 100644
--- a/src/views/projectEngineering/projectLibrary/component/legalPerson.vue
+++ b/src/views/projectEngineering/projectLibrary/component/legalPerson.vue
@@ -2,14 +2,14 @@
<div class="basic-info">
<el-form ref="demoFormRef" :disabled="disabled" :model="legalPersonForm" 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="legalPersonForm.totalInvestment" class="item" clearable maxlength="255" style="width: 90%"
- placeholder="璇疯緭鍏�"/>
- <span class="money">涓囧厓</span>
- </el-form-item>
- </el-col>
- <el-col :span="6">
+<!-- <el-col :span="6">-->
+<!-- <el-form-item label="椤圭洰鎬绘姇棰�" label-width="120px" prop="investmentType" style="width: 100%">-->
+<!-- <el-input v-model="legalPersonForm.totalInvestment" class="item" clearable maxlength="255" style="width: 90%"-->
+<!-- placeholder="璇疯緭鍏�"/>-->
+<!-- <span class="money">涓囧厓</span>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+ <el-col :span="12">
<el-form-item label="椤圭洰鍗曚綅" label-width="120px" prop="investmentType" style="width: 100%">
<el-input v-model="legalPersonForm.projectUnit" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�"/>
</el-form-item>
diff --git a/src/views/projectEngineering/projectLibrary/list.js b/src/views/projectEngineering/projectLibrary/list.js
index ea2eb19..4f6c975 100644
--- a/src/views/projectEngineering/projectLibrary/list.js
+++ b/src/views/projectEngineering/projectLibrary/list.js
@@ -196,7 +196,7 @@
{id: 'projectOwnerUnitName', label: '涓氫富鍗曚綅', visible: true},
{id: 'coding', label: '椤圭洰鐮�', slotName: 'coding', visible: true},
{id: 'projectCode', label: '椤圭洰浠ｇ爜', visible: true},
- {id: 'projectType', label: '椤圭洰绫诲瀷', slotName: 'projectType', visible: true},
+ {id: 'projectType', label: '椤圭洰鎺ㄨ繘绫诲瀷', slotName: 'projectType', visible: true},
{id: 'projectPhase', label: '椤圭洰闃舵', visible: true},
{id: 'constructionNature', label: '寤鸿鎬ц川', slotName: 'constructionNature', visible: true},
{id: 'totalInvestment', label: '鎬绘姇璧勯', visible: true},
@@ -216,10 +216,6 @@
{id: 'importanceType', label: '閲嶇偣鍒嗙被', slotName: 'importanceType', visible: false},
{id: 'setTime', label: '绔嬮」鏃堕棿', visible: false},
{id: 'planCompleteTime', label: '璁″垝绔ｅ伐鏃堕棿', visible: false},
- // {id: 'winUnit', label: '涓爣鍗曚綅', visible: false},
- // {id: 'winAmount', label: '涓爣閲戦', visible: false},
- // {id: 'winTime', label: '涓爣鏃堕棿', visible: false},
- // {id: 'year', label: '骞村害鎶曡祫璁″垝', visible: false},
{id: 'address', label: '椤圭洰鍦板潃', visible: false},
{id: 'projectBudget', label: '椤圭洰棰勭畻', visible: false},
{id: 'beCrossRegion', label: '寤鸿鍦扮偣鏄惁璺ㄥ煙', visible: false},
@@ -286,7 +282,7 @@
{id: 'projectOwnerUnitName', label: '涓氫富鍗曚綅', visible: true},
{id: 'coding', label: '椤圭洰鐮�', slotName: 'coding', visible: true},
{id: 'projectCode', label: '椤圭洰浠ｇ爜', visible: true},
- {id: 'projectType', label: '椤圭洰绫诲瀷', slotName: 'projectType', visible: true},
+ {id: 'projectType', label: '椤圭洰鎺ㄨ繘绫诲瀷', slotName: 'projectType', visible: true},
{id: 'projectPhase', label: '椤圭洰闃舵', visible: true},
{id: 'constructionNature', label: '寤鸿鎬ц川', slotName: 'constructionNature', visible: true},
{id: 'totalInvestment', label: '鎬绘姇璧勯', visible: true},
diff --git a/src/views/projectEngineering/projectLibrary/projectDetails.vue b/src/views/projectEngineering/projectLibrary/projectDetails.vue
index 0cec26a..446ece8 100644
--- a/src/views/projectEngineering/projectLibrary/projectDetails.vue
+++ b/src/views/projectEngineering/projectLibrary/projectDetails.vue
@@ -127,6 +127,35 @@
// },
],
childRef: null,
+ 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: {
@@ -187,13 +216,45 @@
},
saveProject(num) {
this.projectForm.projectInfoForm.usedStatus = num;
- editProject(this.projectForm).then((res) => {
- this.$message.success("淇濆瓨鎴愬姛");
- this.$store.dispatch("tagsView/delView", this.$route);
- this.$router.push('/projectEngineering/project/projectLibrary')
- })
- }
+ const msg = this.formValidate()
+ if (msg && num != 0) { // 鑽夌涓嶆牎楠�
+ this.$message.error(msg)
+ } else {
+ editProject(this.projectForm).then((res) => {
+ this.$message.success("淇濆瓨鎴愬姛");
+ this.$store.dispatch("tagsView/delView", this.$route);
+ this.$router.push('/projectEngineering/project/projectLibrary')
+ })
+ }
+ },
+ /**
+ * 涓存椂浣跨敤杩欑鏂瑰紡鏍￠獙
+ */
+ 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;
+ },
},
mounted() {
if (this.$route.query.disabled) {
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index acacce6..412ab09 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -23,7 +23,7 @@
<div @click="changeTab(4, 'remaining')" :class="{'item-warm': true, 'remaining-color': true, 'active': 4 === selectTabId}">鍓╀綑浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.remainingTaskNum}}锛�</span></div>
<div @click="changeTab(5, 'timely')" :class="{'item-warm': true, 'timely-color': true, 'active': 5 === selectTabId}">鎸夋椂瀹屾垚<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.timelyFinishedTaskNum}}锛�</span></div>
<div @click="changeTab(6, 'overtime')" :class="{'item-warm': true, 'overtime-color': true, 'active': 6 === selectTabId}">瓒呮椂浜嬮」锛�0锛�</div>
- <div @click="changeTab(7, 'willOvertime')" :class="{'item-warm': true, 'willOvertime-color': true, 'active': 7 === selectTabId}">涓存湡浜嬮」锛�0锛�</div>
+<!-- <div @click="changeTab(7, 'willOvertime')" :class="{'item-warm': true, 'willOvertime-color': true, 'active': 7 === selectTabId}">涓存湡浜嬮」锛�0锛�</div>-->
<div @click="changeTab(8, 'urge')" :class="{'item-warm': true, 'urge-color': true, 'active': 8 === selectTabId}">鐫ｅ姙浜嬮」锛�0锛�</div>
</div>
<div style="display: flex;justify-content: center;align-items: center;margin-top: 20px; position: relative">
@@ -388,22 +388,23 @@
})
},
unitFormatter(row) {
- if (row.handlerType === 'USER') {
- return null;
- } else if (row.handlerType === 'DEPT') {
- return row.handlerUnitName.join("銆�")
- } else if (row.handlerType === 'ROLE') {
- return row.handlerUnitName.join('銆�')
+ if (row.taskStatus != '宸插畬鎴�') {
+ return null
}
+ return row.handlerUnitName.join("銆�")
},
candidateFormatter(row) {
- if (row.handlerType === 'USER') {
- return row.handlerName.join('銆�')
- } else if (row.handlerType === 'DEPT') {
- return row.handlerUnitName.join('銆�')
- } else if (row.handlerType === 'ROLE') {
- return row.handlerUnitName.join('銆�')
+ if (row.taskStatus != '宸插畬鎴�') {
+ return null
}
+ return row.handlerName.join("銆�")
+ // if (row.handlerType === 'USER') {
+ // return row.handlerName.join('銆�')
+ // } else if (row.handlerType === 'DEPT') {
+ // return row.handlerUnitName.join('銆�')
+ // } else if (row.handlerType === 'ROLE') {
+ // return row.handlerUnitName.join('銆�')
+ // }
},
finalFinishedFormatter(row) {
// 涓嶆槸宸插畬鎴愮殑鐘舵�佹病鏈夊疄闄呭鐞嗕汉锛屽凡瀹屾垚鐨勭姸鎬佸彧鏈変竴涓汉
diff --git a/src/views/projectProcess/index-copy.vue b/src/views/projectProcess/index-copy.vue
new file mode 100644
index 0000000..5a24dde
--- /dev/null
+++ b/src/views/projectProcess/index-copy.vue
@@ -0,0 +1,640 @@
+<template>
+ <div class="app-container">
+ <el-form :model="queryParams" ref="queryParamsRef" size="small" :inline="true" v-show="showSearch"
+ label-width="68px">
+ <div class="slot">
+ <div class="left-section">
+ <el-form-item label="椤圭洰鍚嶇О" prop="projectName">
+ <el-input
+ style="width: 190px;margin-right: 20px"
+ size="small"
+ v-model="queryParams.projectName"
+ placeholder="璇疯緭鍏ラ」鐩悕绉�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="椤圭洰浠ｇ爜" prop="projectCode">
+ <el-input
+ style="width: 190px;margin-right: 20px"
+ size="small"
+ v-model="queryParams.projectCode"
+ placeholder="璇疯緭鍏ラ」鐩唬鐮�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+
+ <el-form-item label="椤圭洰骞撮檺" prop="timeRange">
+ <el-date-picker
+ style="width: 270px"
+ size="small"
+ v-model="queryParams[timeRange]"
+ type="daterange"
+ range-separator="-"
+ value-format="yyyy-MM-dd"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ @change="handleQuery"
+ clearable
+ >
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item>
+ <el-button icon="el-icon-search" size="small" @click="handleQuery">鏌ヨ</el-button>
+ <el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ <el-popover :value="popoverValue" trigger="click" :width="500" placement="bottom">
+ <span>绛涢�夋潯浠�</span>
+ <el-form ref="moreQueryParamsRef" label-width="68px" label-position="right" :model="queryParams">
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="椤圭洰绫诲瀷">
+ <el-select v-model="queryParams.projectType" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery"
+ size="small">
+ <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="12">
+ <el-form-item label="閲嶇偣鍒嗙被">
+ <el-select v-model="queryParams.importanceType" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <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>
+ <el-col :span="12">
+ <el-form-item label="椤圭洰鏍囩">
+ <el-select v-model="queryParams.tag" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <el-option v-for="item in dict.type.sys_project_tags" :key="item.value" :label="item.label"
+ :value="item.value"/>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="椤圭洰鐘舵��">
+ <el-select v-model="queryParams.projectStatus" :disabled="isProjectCategory" clearable @change="handleQuery"
+ placeholder="璇烽�夋嫨" class="select-option">
+ <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-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="椤圭洰鐮�">
+ <el-select v-model="queryParams.coding" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <el-option v-for="item in dict.type.sys_project_code" :key="item.value" :label="item.label"
+ :value="item.value"/>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍏宠仈鐘舵��">
+ <el-select v-model="queryParams.assignmentStatus" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <el-option v-for="item in dict.type.sys_association_status" :key="item.value" :label="item.label"
+ :value="item.value"/>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="璧勯噾绫诲瀷">
+ <el-select v-model="queryParams.investmentType" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <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="12">
+ <el-form-item label="椤圭洰闃舵">
+ <el-select v-model="queryParams.projectPhase" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <el-option v-for="item in dict.type.sys_project_phases" :key="item.value" :label="item.label"
+ :value="item.value"/>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鎶曡祫绫诲埆">
+ <el-select v-model="queryParams.investType" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <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="12">
+ <el-form-item label="琛屾斂鍖哄垝">
+ <el-select v-model="queryParams.area" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+ <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-row>
+ </el-form>
+ <el-button style="margin-right: 16px; margin-top: 1px; color: #3369ff" slot="reference"
+ size="small">
+ 鏇村绛涙煡鏉′欢
+ <span style="margin-left: 5px">
+ <el-icon v-if="!popoverValue" class="el-icon-arrow-down"></el-icon>
+ <el-icon v-else-if="popoverValue" class="el-icon-arrow-up"></el-icon>
+ </span>
+ </el-button>
+ </el-popover>
+ </div>
+ <div class="right-section">
+ <div>
+ <el-button @click="handleExport" size="small">
+ <svg-icon icon-class="exportIcon" style="margin-right: 8px"/>
+ 瀵煎嚭鏁版嵁
+ </el-button>
+ <el-button :disabled="!isReserve" @click="handleImport" size="small">
+ <svg-icon icon-class="importIcon" style="margin-right: 8px"/>
+ 瀵煎叆鏁版嵁
+ </el-button>
+ </div>
+ <div class="add-btn">
+ <el-tooltip content="鏂板" effect="dark" placement="top">
+ <el-button :disabled="!isReserve" circle icon="el-icon-plus" @click="add()" size="small"/>
+ </el-tooltip>
+ </div>
+ <VisibilityToolbar
+ v-model:showSearch="showSearch"
+ :columns="defaultColumns"
+ @queryTable="handleQuery"
+ @update:sort="handleUpdateSort"
+ @update:columns="handleUpdateColumns"
+ @update:resetSort="handleResetSort"
+ ></VisibilityToolbar>
+ </div>
+ </div>
+ </el-form>
+
+ <el-table
+ :key="tableKey"
+ ref="elTable"
+ style="margin-top: 20px"
+ v-loading="loading"
+ :data="projectInfoList"
+ @selection-change="handleSelectionChange"
+ height="100%"
+ sortable="custom"
+ :show-overflow-tooltip="true">
+ <el-table-column type="selection" width="55" align="center"/>
+ <!-- 鍔ㄦ�佸垪 -->
+ <el-table-column
+ v-for="item in columns"
+ :key="item.id"
+ v-if="item.visible"
+ :prop="item.id"
+ :label="item.label"
+ :min-width="item.minWidth"
+ :show-overflow-tooltip="item.showOverflowTooltip"
+ >
+ <template slot-scope="scope">
+ <!-- 浣跨敤鍏峰悕鎻掓Ы -->
+ <template v-if="item.slotName">
+ <!-- projectStatus鎻掓Ы -->
+ <template v-if="item.slotName === 'projectStatus'">
+ <dict-tag :options="dict.type.sys_project_status" :value="scope.row.projectStatus"/>
+ </template>
+ <!-- coding鎻掓Ы -->
+ <template v-if="item.slotName === 'coding' || item.slotName === 'coding'">
+ <dict-tag :options="dict.type.sys_project_code" :value="scope.row.coding"/>
+ </template>
+ <!-- projectType鎻掓Ы -->
+ <template v-if="item.slotName === 'projectType'">
+ <dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/>
+ </template>
+ <!-- investType鎻掓Ы -->
+ <template v-if="item.slotName === 'investType'">
+ <dict-tag :options="dict.type.sys_investment_type" :value="scope.row.investType"/>
+ </template>
+ </template>
+ <!-- 榛樿鏄剧ず -->
+ <span v-else>{{ scope.row[item.id] }}</span>
+ </template>
+ </el-table-column>
+
+ <!-- 鎿嶄綔鍒� -->
+ <el-table-column label="鎿嶄綔" width="140" align="center" >
+ <template slot-scope="scope">
+ <el-button
+ size="medium"
+ type="text"
+ icon="el-icon-view"
+ v-if="scope.row.processInsId"
+ @click="lookProcessDetail(scope.row)"
+ >
+ </el-button>
+ <!-- <el-button-->
+ <!-- v-if="isReserve"-->
+ <!-- size="medium"-->
+ <!-- type="text"-->
+ <!-- icon="el-icon-edit"-->
+ <!-- @click="handleUpdate(scope.row)"-->
+ <!-- >-->
+ <!-- </el-button>-->
+ <el-tooltip content="娴佺▼" placement="top" effect="light" :enterable="false">
+ <el-button
+ v-if="isReserve"
+ size="medium"
+ type="text"
+ icon="el-icon-s-operation"
+ @click="openOpProcess(scope.row)"
+ >
+ </el-button>
+ </el-tooltip>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="queryParams.currentPage"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
+ />
+
+ <FileDialog
+ :fileDialogVisible.sync="fileDialogVisible"
+ :isImportOrExport="isImportOrExport"
+ @fileDialogCancel="fileDialogCancel"
+ :currentColumns="columns"
+ />
+
+ <RunProcess ref="runProcess" :show="showRunProcess"
+ :now-process-def-id="nowProcessDefId"
+ :now-process-ins-id="nowProcessInsId"
+ :project-info="projectRunFrom"
+ :process-list="processList"
+ @close="closeRunProcess">
+ </RunProcess>
+ </div>
+</template>
+
+<script>
+import { listDefinition } from "@/api/flowable/definition";
+import {listInfo, getInfo, delInfo, addInfo, updateInfo} from "@/api/projectEngineering/projectInfo";
+import { getProjectProcess } from "@/api/projectProcess/projectProcess"
+import {projectProcessCurrent, projectProcessCurrentRest} from '@/views/projectEngineering/projectLibrary/list';
+import FileDialog from '@/views/projectEngineering/projectLibrary/component/FileDialog';
+import RunProcess from "@/views/projectProcess/components/RunProcess";
+import {getProcessConfigInfoList} from "@/api/projectProcess/processConfigInfo";
+
+export default {
+ dicts: ['sys_administrative_divisions', 'sys_investment_type', 'sys_project_phases',
+ 'sys_funding_type', 'sys_association_status', 'sys_project_status', 'sys_project_code',
+ 'sys_project_tags', 'sys_key_categories', 'sys_project_type'],
+ name: "projectInfo",
+ components: {
+ FileDialog, RunProcess
+ },
+ data() {
+ return {
+ projectRunFrom: {
+ projectId: null,
+ projectName: ''
+ },
+ processList: [],
+ showRunProcess: false,
+ nowProcessDefId: '',
+ nowProcessInsId: '',
+ isImportOrExport: false,
+ fileDialogVisible: false,
+ //鏄惁闇�瑕佹柊澧炴寜閽�(鍌ㄨ搫椤圭洰闇�瑕�)
+ isReserve: false,
+ //椤圭洰鐘舵�佺瓫閫夋潯浠�
+ isProjectCategory: false,
+ //琛ㄥご
+ columns: [],
+ defaultColumns: [],
+ //鎺у埗鏇村绛涢�夋樉闅�
+ popoverValue: false,
+ // 閬僵灞�
+ loading: true,
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 鎬绘潯鏁�
+ total: 0,
+ // 椤圭洰绠＄悊鍩虹淇℃伅琛ㄦ牸鏁版嵁
+ projectInfoList: [],
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ tableKey: 0,
+ open: false,
+ timeRange: [],
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ currentPage: 1,
+ pageSize: 10,
+ projectName: null,
+ projectCode: null,
+ },
+ moreQueryParams: {
+ projectType: '', // 椤圭洰绫诲瀷
+ importanceType: '', // 閲嶇偣鍒嗙被
+ projectStatus: '', // 椤圭洰鐘舵��
+ coding: '', // 椤圭洰鐮�
+ investmentType: '', // 璧勯噾绫诲瀷
+ projectPhase: '', // 椤圭洰闃舵
+ investType: '', // 鎶曡祫绫诲埆
+ area: '', // 琛屾斂鍖哄垝
+ assignmentStatus: '', //鍏宠仈鐘舵��
+ tag: '' //椤圭洰鏍囩
+ },
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ projectName: [
+ {required: true, message: "椤圭洰鍚嶇О涓嶈兘涓虹┖", trigger: "blur"}
+ ],
+ projectStatus: [
+ {required: true, message: "椤圭洰鐘舵�佷笉鑳戒负绌�", trigger: "change"}
+ ],
+ }
+ };
+ },
+ created() {
+ const projectCategory = this.$route.query.projectCategory;
+ if(!projectCategory || projectCategory === '1'){
+ this.isReserve = true;
+ }
+ if(projectCategory){
+ this.isProjectCategory = true;
+ }
+ const columns = projectProcessCurrent.map((item, index) => {
+ item.index = index + 1;
+ item.key = index;
+ item.serialNumber = index + 1;
+ return item;
+ });
+ this.columns = columns;
+ this.defaultColumns = JSON.parse(JSON.stringify(columns));
+ this.getList();
+ },
+ methods: {
+ // 鏌ョ湅璇︽儏
+ lookProcessDetail(row) {
+ sessionStorage.removeItem("projectProDetail")
+ this.$router.push({
+ path: '/projectFlow/detail',
+ query: {
+ projectId: row.id,
+ processDefId: row.processDefId,
+ processInsId: row.processInsId,
+ deployId: row.deployId,
+ processName: row.flowableProcessName
+ }
+ })
+ },
+ closeRunProcess() {
+ this.projectRunFrom = {
+ projectId: null,
+ projectName: ''
+ }
+ this.nowProcessDefId = "";
+ this.nowProcessInsId = "";
+ this.showRunProcess = false
+ this.getList()
+ },
+ // 鎵撳紑娴佺▼椤甸潰
+ openOpProcess(row) {
+ this.nowProcessDefId = row.processDefId ? row.processDefId : '';
+ this.nowProcessInsId = row.processInsId ? row.processInsId : '';
+ // // 闃叉锛歩d娌″彉涓嶈Е鍙戠洃鍚�
+ // this.$refs.runProcess.setSelect(row.flowableProcessId);
+ this.projectRunFrom.projectId = row.id;
+ this.projectRunFrom.projectName = row.projectName;
+
+ this.showRunProcess = true;
+ // 鎷垮埌娴佺▼鍒楄〃 TODO 鏍规嵁椤圭洰绫诲瀷鍋氱瓫閫�
+ // getProcessConfigInfoList().then(response => {
+ // this.processList = response.data;
+ //
+ // });
+ },
+ // 閲嶇疆鎺掑簭鐨勬柟娉�
+ handleResetSort() {
+ this.defaultColumns = projectProcessCurrentRest.map((item, index) => {
+ item.index = index + 1;
+ item.key = index;
+ item.serialNumber = index + 1
+ return item;
+ });
+ this.columns = projectProcessCurrentRest.map((item, index) => {
+ item.index = index + 1;
+ item.key = index;
+ item.serialNumber = index + 1
+ return item;
+ });
+ },
+ // 鏇存柊鍒楃殑鏂规硶
+ handleUpdateColumns(row) {
+ // this.currentColumns = row;
+ this.columns = this.columns.map(item => {
+ if (item.key === row.key) {
+ return row;
+ }
+ return item;
+ });
+ },
+ handleUpdateSort(row) {
+ console.log( this.columns, '鎺掑簭鍓嶇殑鍒�');
+ this.columns = this.columns.map(item => {
+ if (item.key === row.key) {
+ return row;
+ }
+ return item;
+ });
+ this.defaultColumns = JSON.parse(JSON.stringify(this.columns)).sort((a, b) => a.index - b.index);
+ this.columns.sort((a, b) => a.serialNumber - b.serialNumber);
+ //寮哄埗table娓叉煋
+ this.tableKey = this.tableKey +1;
+ console.log( this.columns, '鎺掑簭鍚庣殑鍒�');
+ },
+ // 鍏抽棴鏂囦欢澶勭悊寮规鐨勬柟娉�
+ fileDialogCancel() {
+ this.tableLoading = true;
+ this.fileDialogVisible = false;
+ // this.getList();
+ this.tableLoading = false;
+ },
+ handlePopover() {
+ this.popoverValue = true;
+ },
+ closePopover() {
+ this.popoverValue = false;
+ },
+ /** 鏌ヨ椤圭洰绠＄悊鍩虹淇℃伅鍒楄〃 */
+ getList() {
+ this.loading = true;
+ getProjectProcess(this.queryParams).then(response => {
+ this.projectInfoList = response.data;
+ this.total = response.total;
+ this.loading = false;
+ });
+ },
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.open = false;
+ this.reset();
+ },
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ this.form = {
+ id: null,
+ projectName: null,
+ projectCode: null,
+ content: null,
+ projectType: null,
+ projectStatus: null,
+ fundType: null,
+ investType: null,
+ projectPhase: null,
+ tag: null,
+ competentDepartment: null,
+ areaCode: null,
+ managementCentralization: null,
+ projectApprovalType: null,
+ investmentCatalogue: null,
+ importanceType: null,
+ year: null,
+ yearInvestAmount: null,
+ createProjectTime: null,
+ planStartTime: null,
+ planCompleteTime: null,
+ winUnit: null,
+ winAmount: null,
+ winTime: null,
+ projectAddress: null,
+ longitude: null,
+ latitude: null,
+ projectOwnerUnit: null,
+ projectContactPerson: null,
+ contact: null,
+ gmtCreateTime: null,
+ gmtUpdateTime: null,
+ updateBy: null,
+ createBy: null,
+ deleted: null
+ };
+ this.resetForm("form");
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.queryParams.currentPage = 1;
+ this.getList();
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ this.ids = selection.map(item => item.id)
+ this.single = selection.length !== 1
+ this.multiple = !selection.length
+ },
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.reset();
+ this.open = true;
+ this.title = "娣诲姞椤圭洰绠＄悊鍩虹淇℃伅";
+ },
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate(row) {
+ this.reset();
+ const id = row.id || this.ids
+ getInfo(id).then(response => {
+ this.form = response.data;
+ this.open = true;
+ this.title = "淇敼椤圭洰绠＄悊鍩虹淇℃伅";
+ });
+ },
+ /** 鎻愪氦鎸夐挳 */
+ submitForm() {
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ if (this.form.id != null) {
+ updateInfo(this.form).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ } else {
+ addInfo(this.form).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ }
+ }
+ });
+ },
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete(row) {
+ const ids = row.id || this.ids;
+ this.$modal.confirm('鏄惁纭鍒犻櫎椤圭洰绠＄悊鍩虹淇℃伅缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
+ return delInfo(ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {
+ });
+ },
+ /** 瀵煎叆鎸夐挳鎿嶄綔 */
+ handleImport() {
+ this.isImportOrExport = false;
+ this.fileDialogVisible = true;
+ },
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ handleExport() {
+ this.download('code/info/export', {
+ ...this.queryParams
+ }, `info_${new Date().getTime()}.xlsx`)
+ }
+ }
+};
+</script>
+<style lang="scss" scoped>
+.select-option {
+ width: 100%;
+}
+
+.slot {
+ display: flex;
+}
+
+.left-section {
+ flex-grow: 1;
+}
+
+.right-section {
+ display: flex;
+ margin-left: auto;
+
+ .add-btn {
+ margin: 0 10px;
+ }
+}
+
+</style>
diff --git a/src/views/projectProcess/index.vue b/src/views/projectProcess/index.vue
index 5a24dde..93aafd2 100644
--- a/src/views/projectProcess/index.vue
+++ b/src/views/projectProcess/index.vue
@@ -179,48 +179,27 @@
</el-form>
<el-table
- :key="tableKey"
ref="elTable"
style="margin-top: 20px"
v-loading="loading"
:data="projectInfoList"
- @selection-change="handleSelectionChange"
height="100%"
sortable="custom"
+ row-key="id"
+ border
+ default-expand-all
+ :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
:show-overflow-tooltip="true">
- <el-table-column type="selection" width="55" align="center"/>
- <!-- 鍔ㄦ�佸垪 -->
- <el-table-column
- v-for="item in columns"
- :key="item.id"
- v-if="item.visible"
- :prop="item.id"
- :label="item.label"
- :min-width="item.minWidth"
- :show-overflow-tooltip="item.showOverflowTooltip"
- >
+ <el-table-column label="椤圭洰鍚嶇О" prop="projectName" />
+ <el-table-column label="椤圭洰鎺ㄨ繘绫诲瀷" align="center" prop="projectType">
<template slot-scope="scope">
- <!-- 浣跨敤鍏峰悕鎻掓Ы -->
- <template v-if="item.slotName">
- <!-- projectStatus鎻掓Ы -->
- <template v-if="item.slotName === 'projectStatus'">
- <dict-tag :options="dict.type.sys_project_status" :value="scope.row.projectStatus"/>
- </template>
- <!-- coding鎻掓Ы -->
- <template v-if="item.slotName === 'coding' || item.slotName === 'coding'">
- <dict-tag :options="dict.type.sys_project_code" :value="scope.row.coding"/>
- </template>
- <!-- projectType鎻掓Ы -->
- <template v-if="item.slotName === 'projectType'">
- <dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/>
- </template>
- <!-- investType鎻掓Ы -->
- <template v-if="item.slotName === 'investType'">
- <dict-tag :options="dict.type.sys_investment_type" :value="scope.row.investType"/>
- </template>
- </template>
- <!-- 榛樿鏄剧ず -->
- <span v-else>{{ scope.row[item.id] }}</span>
+ <dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎶曡祫棰�(涓�)" align="center" prop="investmentAmount" />
+ <el-table-column label="寮�宸ョ姸鎬�" align="center" prop="status">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_project_status" :value="scope.row.status"/>
</template>
</el-table-column>
--
Gitblit v1.8.0