明树Git Lab

Skip to content

J
jt_front
Commit cc86f528 authored by zhanghan's avatar zhanghan
Browse files
Options

回收功能处理

parent d132b74c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 773 additions and 244 deletions
src/components/InvestmentRecoveryTable.vue
View file @ cc86f528
This diff is collapsed.
src/styles/manage.css
View file @ cc86f528
......@@ -161,9 +161,27 @@
justify-content: flex-end;
align-items: center;
}
.add-project-content .tab-content .is-transparent {
font-size: 12px;
}
.add-project-content .tab-content .el-button,
.add-project-content .tab-content .count-text,
.add-project-content .tab-content .count-num,
.add-project-content .tab-content .upload-icon,
.add-project-content .tab-content .el-input__suffix,
.add-project-content .tab-content .el-input__suffix-inner {
font-size: 12px;
}
.add-project-content .tab-content .el-table {
margin-bottom: 10px;
}
.add-project-content .tab-content .el-table .cell {
text-align: center;
font-size: 12px;
}
.add-project-content .tab-content .el-table .cell .el-input__inner {
font-size: 12px;
}
.add-project-content .tab-content .el-table tbody tr {
height: 46px;
}
......@@ -184,6 +202,13 @@
}
.add-project-content .tab-content .el-table thead th .cell {
text-align: center;
font-size: 12px;
}
.add-project-content .tab-content .el-table thead th .cell .el-input__inner {
font-size: 12px;
}
.add-project-content .tab-content .el-table th {
background: #e4e8f1;
}
.add-project-content .tab-content .el-table .sums-column {
display: flex;
......@@ -312,7 +337,7 @@
.el-form-item__label {
min-width: 100px;
font-weight: 400;
font-size: 14px;
font-size: 12px;
color: #333333;
height: 32px;
display: flex;
......@@ -347,3 +372,26 @@
font-weight: 600;
font-size: 14px;
}
.table-stripe-colors {
border: 1px solid #ebeef5;
}
.table-stripe-colors .odd-row {
background-color: #f5f5f5 !important;
}
.table-stripe-colors .even-row {
background-color: #edf0f5 !important;
}
.table-stripe-colors .el-table__body tr:hover > td {
background-color: #e8f4ff !important;
}
.table-stripe-colors .el-table__header-wrapper th {
background-color: #f0f2f5 !important;
color: #333;
font-weight: 600;
text-align: center;
border-color: #ebeef5;
}
.table-stripe-colors .el-table__body-wrapper td {
border-color: #ebeef5;
padding: 8px 0;
}
src/styles/manage.less
View file @ cc86f528
......@@ -171,8 +171,26 @@
justify-content: flex-end;
align-items: center;
}
.is-transparent {
font-size: 12px;
}
.el-button,
.count-text,
.count-num,
.upload-icon,
.el-input__suffix,
.el-input__suffix-inner {
font-size: 12px;
}
.el-table {
margin-bottom: 10px;
.cell {
text-align: center;
font-size: 12px;
.el-input__inner {
font-size: 12px;
}
}
tbody {
tr {
......@@ -195,9 +213,16 @@
background: #e4e8f1;
.cell {
text-align: center;
font-size: 12px;
.el-input__inner {
font-size: 12px;
}
}
}
}
th {
background: #e4e8f1;
}
.sums-column {
display: flex;
flex-direction: column;
......@@ -341,7 +366,7 @@
.el-form-item__label {
min-width: 100px;
font-weight: 400;
font-size: 14px;
font-size: 12px;
color: rgba(51, 51, 51, 1);
height: 32px;
display: flex;
......
src/views/castbehind/investmentCecovery.vue
View file @ cc86f528
<template>
<div class="manage-container">
<div class="manage-wrap">
<search-form @search="handleSearch" />
<search-form :items="searchItems" @search="handleSearch" />
<div class="manage-header">
<div class="header-left"></div>
<div class="header-right">
......@@ -62,6 +62,68 @@ import { ElMessage, ElMessageBox } from "element-plus";
import CommonTable from "@/components/common/commonTable.vue";
import SearchForm from "@/components/common/SearchForm.vue";
const searchItems = [
{
type: "input",
label: "项目名称",
prop: "projectName",
placeholder: "请输入项目名称",
span: 6,
clearable: true,
},
{
type: "input",
label: "项目编号",
prop: "projectCode",
placeholder: "请输入项目编号",
span: 6,
clearable: true,
},
{
type: "date",
label: "年度",
prop: "nd",
placeholder: "请选择年度",
span: 6,
clearable: true,
},
{
type: "input",
label: "管理主体",
prop: "glzt",
placeholder: "请输入管理主体",
span: 6,
clearable: true,
},
{
type: "input",
label: "联系人",
prop: "lxr",
placeholder: "请输入联系人",
span: 6,
clearable: true,
},
{
type: "dict-select",
label: "项目阶段",
prop: "xmjd",
dictName: "xmjd",
placeholder: "请选择项目阶段",
span: 6,
clearable: true,
},
{
type: "dict-select",
label: "项目区域",
prop: "xmqy",
dictName: "xmqy",
placeholder: "请选择项目区域",
span: 6,
clearable: true,
},
];
const handleSearch = (formData) => {
currentPage.value = 1;
......@@ -78,18 +140,11 @@ let tableColumns = ref([
showOverflowTooltip: true,
},
{
prop: "xmgsmc",
label: "项目公司名称",
prop: "nd",
label: "年度",
showOverflowTooltip: true,
},
{
prop: "ssejqy",
label: "所属二级企业",
showOverflowTooltip: true,
width: 170,
},
{
prop: "operations",
label: "操作",
......
src/views/castbehind/investmentCecoveryAdd.vue
View file @ cc86f528
......@@ -171,10 +171,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label-width="260px"
label="投资总额-实际值"
>
<el-form-item label-width="260px" label="投资总额-实际值">
<el-input
precision="2"
v-model="formData.tzzesj"
......@@ -203,10 +200,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label-width="260px"
label="投资总额-计划值"
>
<el-form-item label-width="260px" label="投资总额-计划值">
<el-input
precision="2"
v-model="formData.tzzejhz"
......@@ -221,12 +215,11 @@
</el-row>
</el-collapse-item>
<el-collapse-item
<!-- <el-collapse-item
:title="dynamicTitles.yearlyUpdateTitle"
:name="dynamicTitles.yearlyUpdateTitle"
>
<el-row gutter="20">
<!-- 第一行：决策目标值相关数字项 -->
<el-col :span="12">
<el-form-item
label-width="260px"
......@@ -262,10 +255,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label-width="260px"
label="下一年完成数"
>
<el-form-item label-width="260px" label="下一年完成数">
<el-input
precision="2"
v-model="formData.xynwcs"
......@@ -279,10 +269,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label-width="260px"
label="本年计划"
>
<el-form-item label-width="260px" label="本年计划">
<el-input
precision="2"
v-model="formData.bnjh"
......@@ -296,7 +283,6 @@
</el-form-item>
</el-col>
<!-- 第二行：实际值相关数字项 -->
<el-col :span="12">
<el-form-item
label-width="260px"
......@@ -332,10 +318,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label-width="260px"
label="累计欠收"
>
<el-form-item label-width="260px" label="累计欠收">
<el-input
precision="2"
v-model="formData.ljqs"
......@@ -363,7 +346,6 @@
</el-form-item>
</el-col>
<!-- 第三行及以后：长文本说明项（占满整行） -->
<el-col :span="24">
<el-form-item label="计划与决策目标值差异说明">
<el-input
......@@ -415,9 +397,20 @@
</el-form-item>
</el-col>
</el-row>
</el-collapse-item> -->
<el-collapse-item
:title="dynamicTitles.yearlyUpdateTitle"
:name="dynamicTitles.yearlyUpdateTitle"
>
<InvestmentRecoveryTable
v-model="formData.tzhsjc"
:is-preview="isPreview"
table-type="plan"
:table-title="`${currentYear}年投资回收计划`"
/>
</el-collapse-item>
<el-collapse-item
<!-- <el-collapse-item
title="截止12月末累计应收"
name="截止12月末累计应收"
>
......@@ -435,9 +428,9 @@
v-model="formData.jzymljsh"
:is-preview="isPreview"
/>
</el-collapse-item>
</el-collapse-item> -->
<el-collapse-item
<!-- <el-collapse-item
title="投资回收（计划）"
name="投资回收（计划）"
>
......@@ -448,7 +441,7 @@
:showNameColumn="false"
:showTotalColumn="false"
/>
</el-collapse-item>
</el-collapse-item> -->
<el-collapse-item
:title="dynamicTitles.yearlyCompletionTitle"
......@@ -474,6 +467,8 @@
:plan-data="formData.tzhsjh"
:decision-data="formData.tzhsjc"
:last-year-plan-data="formData.lastyeartzhs"
:yearly-plan-data="formData.tzhsjc"
:yearly-completion-data="formData.tzhswcqkndgx"
:current-year="currentYear"
/>
</el-collapse-item>
......@@ -1194,6 +1189,10 @@ let initTableData = () => {
formData.tzhswcqkydgx = {
tableData: [],
};
formData.tzhsjc = {
tableData: [],
};
};
const formData = reactive({
nd: new Date().getFullYear().toString(), // 年度，默认当前年份
......@@ -1203,6 +1202,7 @@ const formData = reactive({
tzhsjh: {},
tzhswcqkndgx: {},
tzhswcqkydgx: {},
tzhsjc: {}, // 投资回收完成情况年度计划
lastyeartzhs: null, // 去年投资回收计划数据
projectGdxxs: [],
});
......@@ -1221,7 +1221,7 @@ const dynamicTitles = computed(() => ({
// 投资回收累计完成情况-年度更新
yearlyUpdateTitle: `${currentYear.value}年投资回收累计完成情况-年度更新`,
// 投资回收完成情况-年度更新
yearlyCompletionTitle: `${currentYear.value}年投资回收完成情况（年度更新）`,
yearlyCompletionTitle: `${currentYear.value - 1}年投资回收完成情况（年度更新）`,
// 投资回收完成情况-月度更新
monthlyCompletionTitle: `${currentYear.value}年投资回收完成情况（月度更新）`,
}));
......@@ -1237,7 +1237,7 @@ const getActiveCollapseItems = () => [
"投资回收（计划）",
dynamicTitles.value.yearlyUpdateTitle,
"净现金流",
"截止12月末累计应收",
"投资额完成情况（单位：万元）",
"截止12月末累计实收",
"资金流出",
"分红情况",
......@@ -1264,8 +1264,6 @@ const changeProject = (val) => {
url: "/api/project/getProjectFinalInfo",
data: { id: val },
callback: (data) => {
loading.value = false;
// Object.assign(formData, data);
loading.value = false;
formData.projectName = data.projectName || "";
formData.sbdw = data.sbdw || "";
......
src/views/everydayPage/annualAdd.vue
View file @ cc86f528
This diff is collapsed.
src/views/investingManage/constructionTime.vue
View file @ cc86f528
......@@ -78,18 +78,11 @@ let tableColumns = ref([
showOverflowTooltip: true,
},
{
prop: "xmgsmc",
label: "项目公司名称",
prop: "nd",
label: "年度",
showOverflowTooltip: true,
},
{
prop: "ssejqy",
label: "所属二级企业",
showOverflowTooltip: true,
width: 170,
},
{
prop: "operations",
label: "操作",
......
src/views/investingManage/constructionTimeAdd.vue
View file @ cc86f528
......@@ -140,7 +140,7 @@
><el-row gutter="20">
<el-col :span="12">
<el-form-item
label-width="280px"
label-width="260px"
label="项目投资总额（决策值）"
>
<el-input
......@@ -156,7 +156,7 @@
</el-col>
<el-col :span="12">
<el-form-item
label-width="280px"
label-width="260px"
label="我方资本金出资额-决策值"
>
<el-input
......@@ -171,10 +171,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label-width="280px"
label="投资总额-实际值"
>
<el-form-item label-width="260px" label="投资总额-实际值">
<el-input
precision="2"
v-model="formData.tzzesj"
......@@ -188,7 +185,7 @@
</el-col>
<el-col :span="12">
<el-form-item
label-width="280px"
label-width="260px"
label="我方资本金出资额--实际值"
>
<el-input
......@@ -203,10 +200,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label-width="280px"
label="投资总额-计划值"
>
<el-form-item label-width="260px" label="投资总额-计划值">
<el-input
precision="2"
v-model="formData.tzzejhz"
......@@ -221,15 +215,14 @@
</el-row>
</el-collapse-item>
<el-collapse-item
<!-- <el-collapse-item
:title="dynamicTitles.yearlyUpdateTitle"
:name="dynamicTitles.yearlyUpdateTitle"
>
<el-row gutter="20">
<!-- 第一行：决策目标值相关数字项 -->
<el-col :span="12">
<el-form-item
label-width="280px"
label-width="260px"
label="本年完成 投资回收决策目标值"
>
<el-input
......@@ -246,7 +239,7 @@
</el-col>
<el-col :span="12">
<el-form-item
label-width="280px"
label-width="260px"
label="截止本年累计（决策目标值）"
>
<el-input
......@@ -262,10 +255,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label-width="280px"
label="下一年完成数"
>
<el-form-item label-width="260px" label="下一年完成数">
<el-input
precision="2"
v-model="formData.xynwcs"
......@@ -279,10 +269,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label-width="280px"
label="本年计划"
>
<el-form-item label-width="260px" label="本年计划">
<el-input
precision="2"
v-model="formData.bnjh"
......@@ -296,10 +283,9 @@
</el-form-item>
</el-col>
<!-- 第二行：实际值相关数字项 -->
<el-col :span="12">
<el-form-item
label-width="280px"
label-width="260px"
label="本年完成--投资回收实际值"
>
<el-input
......@@ -316,7 +302,7 @@
</el-col>
<el-col :span="12">
<el-form-item
label-width="280px"
label-width="260px"
label="截止本年累计--投资回收实际值"
>
<el-input
......@@ -332,10 +318,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label-width="280px"
label="累计欠收"
>
<el-form-item label-width="260px" label="累计欠收">
<el-input
precision="2"
v-model="formData.ljqs"
......@@ -349,7 +332,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label-width="280px" label="完成率">
<el-form-item label-width="260px" label="完成率">
<el-input
precision="2"
v-model="formData.wcl"
......@@ -363,7 +346,6 @@
</el-form-item>
</el-col>
<!-- 第三行及以后：长文本说明项（占满整行） -->
<el-col :span="24">
<el-form-item label="计划与决策目标值差异说明">
<el-input
......@@ -415,9 +397,20 @@
</el-form-item>
</el-col>
</el-row>
</el-collapse-item> -->
<el-collapse-item
:title="dynamicTitles.yearlyUpdateTitle"
:name="dynamicTitles.yearlyUpdateTitle"
>
<InvestmentRecoveryTable
v-model="formData.tzhsjc"
:is-preview="isPreview"
table-type="plan"
:table-title="`${currentYear}年投资回收计划`"
/>
</el-collapse-item>
<el-collapse-item
<!-- <el-collapse-item
title="截止12月末累计应收"
name="截止12月末累计应收"
>
......@@ -435,9 +428,9 @@
v-model="formData.jzymljsh"
:is-preview="isPreview"
/>
</el-collapse-item>
</el-collapse-item> -->
<el-collapse-item
<!-- <el-collapse-item
title="投资回收（计划）"
name="投资回收（计划）"
>
......@@ -448,7 +441,7 @@
:showNameColumn="false"
:showTotalColumn="false"
/>
</el-collapse-item>
</el-collapse-item> -->
<el-collapse-item
:title="dynamicTitles.yearlyCompletionTitle"
......@@ -474,6 +467,8 @@
:plan-data="formData.tzhsjh"
:decision-data="formData.tzhsjc"
:last-year-plan-data="formData.lastyeartzhs"
:yearly-plan-data="formData.tzhsjc"
:yearly-completion-data="formData.tzhswcqkndgx"
:current-year="currentYear"
/>
</el-collapse-item>
......
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