明树Git Lab

Skip to content

J
jt_front
Commit 33cec7e4 authored by zfp1's avatar zfp1
Browse files
Options

立项、决策字段调整

parent d22c977e
Show whitespace changes
Inline Side-by-side
Showing with 1919 additions and 3414 deletions
.npmrc 0 → 100644
View file @ 33cec7e4
registry=https://registry.npmmirror.com
\ No newline at end of file
package-lock.json
View file @ 33cec7e4
This source diff could not be displayed because it is too large. You can view the blob instead.
src/data/https.js
View file @ 33cec7e4
...@@ -2,7 +2,7 @@ import axios from "axios"; ...@@ -2,7 +2,7 @@ import axios from "axios";
import { ElMessage } from "element-plus"; import { ElMessage } from "element-plus";
import windowConfig from "@/window"; import windowConfig from "@/window";
axios.interceptors.request.use(function (config) { axios.interceptors.request.use(function (config) {
let token = "8681f75e775447f7903708c55a35634e"; let token = "bcb6deadbe9e4b28b00a81d37a4487a5";
if (token) { if (token) {
config.headers.Authorization = token; config.headers.Authorization = token;
} }
......
src/views/managePage/addProject.vue
View file @ 33cec7e4
...@@ -2,20 +2,20 @@ ...@@ -2,20 +2,20 @@
<div class="add-project-container"> <div class="add-project-container">
<div class="add-project-content" v-loading="loading"> <div class="add-project-content" v-loading="loading">
<el-tabs v-model="pageActiveName" type="border-card"> <el-tabs v-model="pageActiveName" type="border-card">
<el-tab-pane label="立项情况" name="立项情况"> <el-tab-pane label="立项填报" name="立项填报">
<div class="project-tab-content"> <div class="project-tab-content">
<div class="add-project-header"> <div class="add-project-header">
<div class="header-left"></div> <div class="header-left"></div>
<div class="header-right"> <div class="header-right">
<el-button type="default" @click="backClick">返回</el-button> <el-button type="default" v-if="formData.projectLzType === 1" @click="backClick">返回</el-button>
<el-button type="primary" @click="saveClick('save')">保存</el-button> <el-button type="primary" v-if="formData.projectLzType === 1" @click="saveClick('save')">保存</el-button>
<el-button type="primary" v-if="formData.projectLzType === 1" @click="saveClick('submit')">发起立项</el-button> <el-button type="primary" v-if="formData.projectLzType === 1" @click="saveClick('submit')">发起立项填报</el-button>
</div> </div>
</div> </div>
<el-tabs v-model="lxTabActiveName"> <el-tabs v-model="lxTabActiveName">
<el-tab-pane label="基本信息" name="基本信息"> <el-tab-pane label="基本信息" name="基本信息">
<div class="tab-content"> <div class="tab-content">
<el-form :model="formData" :label-width="150" :disabled="isPreview || formData.projectLzType <= 5"> <el-form :model="formData" :label-width="150" :disabled="isPreview || (formData.projectLzType <= 5 && formData.projectLzType != 1)">
<el-collapse v-model="activeCollapse"> <el-collapse v-model="activeCollapse">
<el-collapse-item title="项目基本信息" name="项目基本信息"> <el-collapse-item title="项目基本信息" name="项目基本信息">
<el-row :gutter="20"> <el-row :gutter="20">
...@@ -473,7 +473,7 @@ ...@@ -473,7 +473,7 @@
<el-form-item label="相关支撑材料" :label-width="100"> <el-form-item label="相关支撑材料" :label-width="100">
<el-upload <el-upload
:action="windowConfig.baseUrl + '/api/file/upload'" :action="windowConfig.baseUrl + '/api/file/upload'"
:headers="{Authorization: '8681f75e775447f7903708c55a35634e'}" :headers="{Authorization: 'bcb6deadbe9e4b28b00a81d37a4487a5'}"
:show-file-list="false" :show-file-list="false"
:on-success="addZcclFile" :on-success="addZcclFile"
> >
...@@ -495,6 +495,14 @@ ...@@ -495,6 +495,14 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-collapse-item> </el-collapse-item>
</el-collapse>
</el-form>
</div>
</el-tab-pane>
<el-tab-pane label="立项批复" name="立项批复">
<div class="tab-content">
<el-form :model="formData" :label-width="150" :disabled="isPreview || (formData.projectLzType <= 5 && formData.projectLzType != 1)">
<el-collapse v-model="activeCollapse">
<el-collapse-item title="项目投资总额（全口径）" name="项目投资总额（全口径）"> <el-collapse-item title="项目投资总额（全口径）" name="项目投资总额（全口径）">
<el-table :data="tzzeqkjData" style="width: 100%" empty-text="暂无数据" <el-table :data="tzzeqkjData" style="width: 100%" empty-text="暂无数据"
default-expand-all row-key="xh" border default-expand-all row-key="xh" border
...@@ -515,7 +523,7 @@ ...@@ -515,7 +523,7 @@
<el-table :data="cwpjzbData" style="width: 100%" empty-text="暂无数据" border> <el-table :data="cwpjzbData" style="width: 100%" empty-text="暂无数据" border>
<el-table-column prop="name" label="指标" /> <el-table-column prop="name" label="指标" />
<el-table-column prop="unit" label="" width="70" /> <el-table-column prop="unit" label="" width="70" />
<el-table-column prop="num" label="投资评估阶段批复值"> <el-table-column prop="tzpgjdpfz" label="投资评估阶段批复值">
<template #default="scope"> <template #default="scope">
<el-input-number v-model="scope.row.num" :min="0" :precision="2" :max="999.99" <el-input-number v-model="scope.row.num" :min="0" :precision="2" :max="999.99"
controls-position="right" controls-position="right"
...@@ -685,7 +693,7 @@ ...@@ -685,7 +693,7 @@
<el-form-item label="立项批复文件" :label-width="100"> <el-form-item label="立项批复文件" :label-width="100">
<el-upload <el-upload
:action="windowConfig.baseUrl + '/api/file/upload'" :action="windowConfig.baseUrl + '/api/file/upload'"
:headers="{Authorization: '8681f75e775447f7903708c55a35634e'}" :headers="{Authorization: 'bcb6deadbe9e4b28b00a81d37a4487a5'}"
:show-file-list="false" :show-file-list="false"
:on-success="addLxpfFile" :on-success="addLxpfFile"
> >
...@@ -746,7 +754,7 @@ ...@@ -746,7 +754,7 @@
<el-form-item label="相关上会材料" :label-width="100"> <el-form-item label="相关上会材料" :label-width="100">
<el-upload <el-upload
:action="windowConfig.baseUrl + '/api/file/upload'" :action="windowConfig.baseUrl + '/api/file/upload'"
:headers="{Authorization: '8681f75e775447f7903708c55a35634e'}" :headers="{Authorization: 'bcb6deadbe9e4b28b00a81d37a4487a5'}"
:show-file-list="false" :show-file-list="false"
:on-success="addShclFile" :on-success="addShclFile"
> >
...@@ -775,13 +783,14 @@ ...@@ -775,13 +783,14 @@
</el-tabs> </el-tabs>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="决策信息" name="决策信息" v-if="formData.projectLzType === 5"> <el-tab-pane label="决策信息填报" name="决策信息填报" v-if="[5,7].includes(jcFormData.projectLzType)">
<div class="project-tab-content"> <div class="project-tab-content">
<div class="add-project-header"> <div class="add-project-header">
<div class="header-left"></div> <div class="header-left"></div>
<div class="header-right"> <div class="header-right">
<el-button type="default" @click="backClick">返回</el-button> <el-button type="default" @click="backClick">返回</el-button>
<el-button type="primary" @click="saveClick('save')">保存</el-button> <el-button type="primary" @click="saveClick('save')">保存1</el-button>
<el-button type="primary" v-if="jcFormData.projectLzType === 7" @click="saveClick('submit')">发起决策信息填报</el-button>
</div> </div>
</div> </div>
<el-tabs v-model="jcTabActiveName"> <el-tabs v-model="jcTabActiveName">
...@@ -1449,7 +1458,7 @@ ...@@ -1449,7 +1458,7 @@
</el-col> </el-col>
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="我方担保及融资情况" name="我方担保及融资情况"> <el-collapse-item title="我方担保及股权融资情况" name="我方担保及股权融资情况">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="我方负责的股权融资金额" :label-width="170"> <el-form-item label="我方负责的股权融资金额" :label-width="170">
...@@ -1495,50 +1504,14 @@ ...@@ -1495,50 +1504,14 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="我方负责的债权融资金额" :label-width="170">
<el-input-number v-model="jcFormData.wffzdzqrzjewy" :min="0" :precision="2" :max="999.99"
controls-position="right"
>
<template #suffix>
<span>万元</span>
</template>
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="融资成本">
<el-input-number v-model="jcFormData.rzcbzq" :min="0" :precision="2" :max="999.99"
controls-position="right"
>
<template #suffix>
<span>%</span>
</template>
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="期限">
<el-input-number v-model="jcFormData.qxzq" :min="0" :precision="2" :max="999.99"
controls-position="right"
>
<template #suffix>
<span>年</span>
</template>
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="预计落地时间">
<el-date-picker
v-model="jcFormData.yjldsjzq"
type="date"
placeholder="请选择"
/>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="我方担保及债权融资情况" name="我方担保及债权融资情况">
<!-- wffzdzqrzjewy: { type: DataTypes.DECIMAL(19, 8), allowNull: true, comment: "我方负责的债权融资金额(万元)" },
rzcbzq: { type: DataTypes.DECIMAL(19, 8), allowNull: true, comment: "融资成本债权" },
qxzq: { type: DataTypes.INTEGER, allowNull: true, comment: "期限债权" },TODO:
yjldsjzq: { type: DataTypes.DATE, allowNull: true, comment: "预计落地时间债权" },建表 -->
</el-collapse-item>
<el-collapse-item title="工程带动情况" name="工程带动情况"> <el-collapse-item title="工程带动情况" name="工程带动情况">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="6"> <el-col :span="6">
...@@ -1588,6 +1561,9 @@ ...@@ -1588,6 +1561,9 @@
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="项目内容及必要性" name="项目内容及必要性"> <el-collapse-item title="项目内容及必要性" name="项目内容及必要性">
<el-form-item label="建设内容及规模">
<el-input v-model="formData.jsnrjgm" type="textarea" />
</el-form-item>
<el-form-item label="项目必要性"> <el-form-item label="项目必要性">
<el-input v-model="jcFormData.xmbyx" type="textarea" /> <el-input v-model="jcFormData.xmbyx" type="textarea" />
</el-form-item> </el-form-item>
...@@ -1659,7 +1635,7 @@ ...@@ -1659,7 +1635,7 @@
<el-form-item label="里程碑计划审批表" :label-width="130"> <el-form-item label="里程碑计划审批表" :label-width="130">
<el-upload <el-upload
:action="windowConfig.baseUrl + '/api/file/upload'" :action="windowConfig.baseUrl + '/api/file/upload'"
:headers="{Authorization: '8681f75e775447f7903708c55a35634e'}" :headers="{Authorization: 'bcb6deadbe9e4b28b00a81d37a4487a5'}"
:show-file-list="false" :show-file-list="false"
:on-success="addLcbspFile" :on-success="addLcbspFile"
> >
...@@ -1681,11 +1657,58 @@ ...@@ -1681,11 +1657,58 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="审批意见" name="审批意见">
<div class="tab-handle">
<el-button type="primary" size="small" @click="addSpyj">新增</el-button>
</div>
<el-table :data="spyjTableData" style="width: 100%" empty-text="暂无数据" border>
<el-table-column type="index" width="50" />
<el-table-column prop="lx" label="类型">
<template #default="scope">
<el-select v-model="scope.row.lx" placeholder="请选择">
<el-option label="类型1" value="类型1"></el-option>
<el-option label="类型2" value="类型2"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="批复意见" prop="pfyj">
<template #default="scope">
<el-input v-model="scope.row.pfyj" type="textarea" />
</template>
</el-table-column>
<el-table-column label="批复意见时间" prop="pfyjsj">
<template #default="scope">
<el-date-picker
v-model="scope.row.pfyjsj"
type="date"
placeholder="请选择"
/>
</template>
</el-table-column>
<el-table-column label="执行回复" prop="zxhf">
<template #default="scope">
<el-input v-model="scope.row.zxhf" type="textarea" />
</template>
</el-table-column>
<el-table-column label="执行回复时间" prop="zxhfsj">
<template #default="scope">
<el-date-picker
v-model="scope.row.zxhfsj"
type="date"
placeholder="请选择"
/>
</template>
</el-table-column>
<el-table-column label="执行回复附件" prop="zxhffj">
<!-- TODO: 文件上传 和 文件信息展示 暂时只有一个文件 -->
</el-table-column>
</el-table>
</el-collapse-item>
<el-collapse-item title="投评决策资料" name="投评决策资料"> <el-collapse-item title="投评决策资料" name="投评决策资料">
<el-form-item label="可研材料" :label-width="160"> <el-form-item label="可研材料" :label-width="160">
<el-upload <el-upload
:action="windowConfig.baseUrl + '/api/file/upload'" :action="windowConfig.baseUrl + '/api/file/upload'"
:headers="{Authorization: '8681f75e775447f7903708c55a35634e'}" :headers="{Authorization: 'bcb6deadbe9e4b28b00a81d37a4487a5'}"
:show-file-list="false" :show-file-list="false"
:on-success="addKyclFile" :on-success="addKyclFile"
> >
...@@ -1709,7 +1732,7 @@ ...@@ -1709,7 +1732,7 @@
<el-form-item label="经济指标初步测算资料" :label-width="160"> <el-form-item label="经济指标初步测算资料" :label-width="160">
<el-upload <el-upload
:action="windowConfig.baseUrl + '/api/file/upload'" :action="windowConfig.baseUrl + '/api/file/upload'"
:headers="{Authorization: '8681f75e775447f7903708c55a35634e'}" :headers="{Authorization: 'bcb6deadbe9e4b28b00a81d37a4487a5'}"
:show-file-list="false" :show-file-list="false"
:on-success="addJjzbcsFile" :on-success="addJjzbcsFile"
> >
...@@ -1733,7 +1756,7 @@ ...@@ -1733,7 +1756,7 @@
<el-form-item label="其他相关支撑材料" :label-width="160"> <el-form-item label="其他相关支撑材料" :label-width="160">
<el-upload <el-upload
:action="windowConfig.baseUrl + '/api/file/upload'" :action="windowConfig.baseUrl + '/api/file/upload'"
:headers="{Authorization: '8681f75e775447f7903708c55a35634e'}" :headers="{Authorization: 'bcb6deadbe9e4b28b00a81d37a4487a5'}"
:show-file-list="false" :show-file-list="false"
:on-success="addTpzcclFile" :on-success="addTpzcclFile"
> >
...@@ -1757,7 +1780,7 @@ ...@@ -1757,7 +1780,7 @@
<el-form-item label="上会议案" :label-width="160"> <el-form-item label="上会议案" :label-width="160">
<el-upload <el-upload
:action="windowConfig.baseUrl + '/api/file/upload'" :action="windowConfig.baseUrl + '/api/file/upload'"
:headers="{Authorization: '8681f75e775447f7903708c55a35634e'}" :headers="{Authorization: 'bcb6deadbe9e4b28b00a81d37a4487a5'}"
:show-file-list="false" :show-file-list="false"
:on-success="addShyaFile" :on-success="addShyaFile"
> >
...@@ -1972,25 +1995,12 @@ ...@@ -1972,25 +1995,12 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="jc" label="届次">
<template #default="scope">
<el-input v-model="scope.row.jc" />
</template>
</el-table-column>
<el-table-column prop="zkrq" label="召开日期">
<template #default="scope">
<el-date-picker
v-model="scope.row.zkrq"
type="date"
placeholder="请选择"
/>
</template>
</el-table-column>
<el-table-column prop="jcjl" label="决策结论"> <el-table-column prop="jcjl" label="决策结论">
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.jcjl" type="textarea" /> <el-input v-model="scope.row.jcjl" type="textarea" />
</template> </template>
</el-table-column> </el-table-column>
<!-- TODO: 会议纪要 hyjy 文件上传 -->
<el-table-column prop="qtsm" label="其他说明"> <el-table-column prop="qtsm" label="其他说明">
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.qtsm" type="textarea" /> <el-input v-model="scope.row.qtsm" type="textarea" />
...@@ -2017,15 +2027,15 @@ ...@@ -2017,15 +2027,15 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="jc" label="届次"> <el-table-column prop="hymc" label="会议名称">
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.jc" /> <el-input v-model="scope.row.hymc" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="zkrq" label="召开日期"> <el-table-column prop="shsj" label="审核时间">
<template #default="scope"> <template #default="scope">
<el-date-picker <el-date-picker
v-model="scope.row.zkrq" v-model="scope.row.shsj"
type="date" type="date"
placeholder="请选择" placeholder="请选择"
/> />
...@@ -2036,6 +2046,7 @@ ...@@ -2036,6 +2046,7 @@
<el-input v-model="scope.row.jl" type="textarea" /> <el-input v-model="scope.row.jl" type="textarea" />
</template> </template>
</el-table-column> </el-table-column>
<!-- TODO: 附件 fj 文件上传 -->
<el-table-column prop="qtsm" label="其他说明"> <el-table-column prop="qtsm" label="其他说明">
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.qtsm" type="textarea" /> <el-input v-model="scope.row.qtsm" type="textarea" />
...@@ -2092,9 +2103,9 @@ ...@@ -2092,9 +2103,9 @@
</div> </div>
<el-table :data="jcspyjData" style="width: 100%" empty-text="暂无数据" border> <el-table :data="jcspyjData" style="width: 100%" empty-text="暂无数据" border>
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column prop="yjlx" label="类型"> <el-table-column prop="lx" label="类型">
<template #default="scope"> <template #default="scope">
<el-select v-model="scope.row.yjlx" placeholder="请选择"> <el-select v-model="scope.row.lx" placeholder="请选择">
<el-option label="类型1" value="类型1"></el-option> <el-option label="类型1" value="类型1"></el-option>
<el-option label="类型2" value="类型2"></el-option> <el-option label="类型2" value="类型2"></el-option>
</el-select> </el-select>
...@@ -2189,7 +2200,7 @@ ...@@ -2189,7 +2200,7 @@
const projectStore = useProjectStore(); const projectStore = useProjectStore();
// tab相关 // tab相关
const pageActiveName = ref("立项情况"); const pageActiveName = ref("立项填报");
const lxTabActiveName = ref("基本信息"); const lxTabActiveName = ref("基本信息");
const jcTabActiveName = ref("基本信息"); const jcTabActiveName = ref("基本信息");
const activeCollapse = reactive([ const activeCollapse = reactive([
...@@ -2809,8 +2820,8 @@ ...@@ -2809,8 +2820,8 @@
}); });
}; };
onMounted(() => { onMounted(() => {
getResourceData();
projectId && getProjectInfo(); projectId && getProjectInfo();
getResourceData();
}) })
// 返回列表页 // 返回列表页
...@@ -2827,7 +2838,7 @@ ...@@ -2827,7 +2838,7 @@
} }
// 保存数据 // 保存数据
const saveClick = (type) => { const saveClick = (type) => {
if (!formData.projectLzType ||formData.projectLzType === 1) { if (!formData.projectLzType || formData.projectLzType === 1) {
let url = formData.id ? type === "submit" ? "startLixiang" : "saveProjectPreLixiang" : "createProject"; let url = formData.id ? type === "submit" ? "startLixiang" : "saveProjectPreLixiang" : "createProject";
let params = { let params = {
...formData, ...formData,
...@@ -2852,6 +2863,7 @@ ...@@ -2852,6 +2863,7 @@
} }
}) })
} else if (jcFormData.projectLzType === 5 || jcFormData.projectLzType === 7) { } else if (jcFormData.projectLzType === 5 || jcFormData.projectLzType === 7) {
let url = type === "submit" ? "startJuece" : "saveJuece";
let params = { let params = {
...jcFormData, ...jcFormData,
projectJsgms: jcSwlzbData, projectJsgms: jcSwlzbData,
...@@ -2871,7 +2883,7 @@ ...@@ -2871,7 +2883,7 @@
projectSpyj: jcspyjData projectSpyj: jcspyjData
} }
proxy.$post({ proxy.$post({
url: "/api/project/saveJuece", url: "/api/project/" + url,
data: params, data: params,
callback: (data) => { callback: (data) => {
router.push("/projectArgument"); router.push("/projectArgument");
......
src/views/managePage/projectArgument.vue
View file @ 33cec7e4
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
<template #operations="{ row, index }"> <template #operations="{ row, index }">
<el-button link type="primary" size="small" @click="fillProject(row)">继续填报</el-button> <el-button link type="primary" size="small" @click="fillProject(row)">继续填报</el-button>
<el-button link type="primary" size="small" <el-button link type="primary" size="small"
:loading="row.loading" @click="approvalProject(row)" :loading="row.loading" @click="fillProject(row)"
>发起审批</el-button> >发起决策审批</el-button>
</template> </template>
</common-table> </common-table>
</div> </div>
......
src/views/managePage/projectDecision.vue
View file @ 33cec7e4
...@@ -53,6 +53,17 @@ ...@@ -53,6 +53,17 @@
label: "项目编号", label: "项目编号",
showOverflowTooltip: true showOverflowTooltip: true
}, },
{
prop: "projectLzType",
label: "状态",
width: 120,
align: "center",
formatter: (data) => {
return data.projectLzType === 1 ? "待立项" : data.projectLzType === 3 ? "立项审批中" :
data.projectLzType === 5 ? "已立项" : data.projectLzType === 7 ? "决策填报中" :
data.projectLzType === 8 ? "决策审批中" : data.projectLzType === 9 ? "已决策" : "待立项"
}
},
{ {
prop: "operations", prop: "operations",
label: "操作", label: "操作",
......
src/views/managePage/projectSetUp.vue
View file @ 33cec7e4
...@@ -60,6 +60,17 @@ ...@@ -60,6 +60,17 @@
label: "项目编号", label: "项目编号",
showOverflowTooltip: true showOverflowTooltip: true
}, },
{
prop: "projectLzType",
label: "状态",
width: 120,
align: "center",
formatter: (data) => {
return data.projectLzType === 1 ? "待立项" : data.projectLzType === 3 ? "立项审批中" :
data.projectLzType === 5 ? "已立项" : data.projectLzType === 7 ? "决策填报中" :
data.projectLzType === 8 ? "决策审批中" : data.projectLzType === 9 ? "已决策" : "待立项"
}
},
{ {
prop: "operations", prop: "operations",
label: "操作", label: "操作",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment