Skip to content

W
web-project
Commit 9859f018 authored by 高滢's avatar 高滢
Browse files
Options

feat(年度): 字段修改

parent 9def9918
Hide whitespace changes
Inline Side-by-side
Showing with 230 additions and 214 deletions
src/router/routes/modules/biddingPlan.ts
View file @ 9859f018
......@@ -22,6 +22,16 @@ const biddingPlan: AppRouteModule = {
meta: {
auth: '/www/dist/index.html#/biddingPlan/index',
title: '招标计划填报',
orderNo: 1,
},
},
{
path: 'biddingPlanData',
name: 'planData',
component: () => import('@/views/biddingPlan/biddingPlanData.vue'),
meta: {
auth: '/www/dist/index.html#/biddingPlan/index',
title: '招标计划统计',
orderNo: 2,
},
},
......@@ -32,7 +42,7 @@ const biddingPlan: AppRouteModule = {
meta: {
auth: '/www/dist/index.html#/biddingManagement/index',
title: '招标管理填报',
orderNo: 3,
orderNo: 5,
},
},
{
......@@ -42,7 +52,7 @@ const biddingPlan: AppRouteModule = {
meta: {
auth: '/www/dist/index.html#/biddingManagement/index',
title: '招标管理统计',
orderNo: 3,
orderNo: 6,
},
},
{
......@@ -55,7 +65,7 @@ const biddingPlan: AppRouteModule = {
hideBreadcrumb: true,
auth: '/www/dist/index.html#/biddingManagement/index',
title: '招标情况',
orderNo: 3,
orderNo: 4,
},
},
{
......@@ -68,17 +78,7 @@ const biddingPlan: AppRouteModule = {
hideBreadcrumb: true,
auth: '/www/dist/index.html#/biddingPlan/index',
title: '招标计划',
orderNo: 2,
},
},
{
path: 'biddingPlanData',
name: 'planData',
component: () => import('@/views/biddingPlan/biddingPlanData.vue'),
meta: {
auth: '/www/dist/index.html#/biddingPlan/index',
title: '招标计划统计',
orderNo: 2,
orderNo: 3,
},
},
],
......
src/views/changeSignature/addChangeSignature.vue
View file @ 9859f018
......@@ -92,11 +92,8 @@
import { useModal } from '@/components/Modal';
import { router } from '@/router';
import { useRoute } from 'vue-router';
import { monthListByMonthYear } from '@/api/project/detail/Amonth';
import { forEach } from '@/utils/helper/treeHelper';
import CollapseContainer from '@/components/Container/src/collapse/CollapseContainer.vue';
import { template } from 'xe-utils';
import { useUserStore } from '@/store/modules/user';
//历史记录是否可查
const historyData = ref(true);
......
src/views/changeSignature/changeSignatrue.data.ts
View file @ 9859f018
......@@ -130,7 +130,7 @@ export const formSchema: FormSchema[] = [
required: true,
component: 'InputNumber',
componentProps: {
addonAfter: '元',
addonAfter: '万元',
},
colProps: { span: 7, offset: 1 },
},
......
src/views/changeSignature/changeSignatureStatistic.vue
View file @ 9859f018
......@@ -79,7 +79,7 @@
width: 180,
},
{
title: '合同金额（元）',
title: '合同金额（万元）',
dataIndex: 'contractAmount',
width: 180,
},
......@@ -94,7 +94,7 @@
width: 180,
},
{
title: '立项投资额（元）',
title: '立项投资额（万元）',
dataIndex: 'amountInvested',
width: 180,
},
......
src/views/completed/completedEdit/completedEdit.vue
View file @ 9859f018
......@@ -471,7 +471,6 @@
{ field: 'totalActualPay', required: false },
{ field: 'plannedInvestment', required: false },
{ field: 'contractAmount', required: false },
{ field: 'completionSettlement', required: false },
{ field: 'constructionNature', required: false },
{ field: 'time', required: false },
{ field: 'imageProgress', required: false },
......@@ -489,7 +488,6 @@
{ field: 'totalActualPay', required: true },
{ field: 'plannedInvestment', required: planType.value === '计划投资项目' },
{ field: 'contractAmount', required: planType.value === '已竣工验收项目' },
{ field: 'completionSettlement', required: planType.value === '已竣工验收项目' },
{ field: 'constructionNature', required: planType.value === '计划投资项目' },
{ field: 'time', required: planType.value === '计划投资项目' },
{ field: 'imageProgress', required: planType.value === '计划投资项目' },
......
src/views/completed/completedEdit/tableData.tsx
View file @ 9859f018
......@@ -171,15 +171,9 @@ export function formSchema(year, planType): FormSchema[] {
colProps: { span: 7, offset: 1 },
},
{
field: 'competentDepartment',
label: '项目主管部门',
required: true,
component: 'Input',
colProps: { span: 7, offset: 1 },
},
{
field: 'projectInvestment',
label: '立项总投资',
field: 'annualFund',
label: parseInt(year) - 1 + '年资金执行情况-计划额:',
labelWidth: 200,
required: true,
component: 'InputNumber',
componentProps: {
......@@ -188,8 +182,8 @@ export function formSchema(year, planType): FormSchema[] {
colProps: { span: 7, offset: 1 },
},
{
field: 'annualFund',
label: parseInt(year) - 1 + '年资金执行情况-计划额:',
field: 'actualPay',
label: parseInt(year) - 1 + '年资金执行情况-实付额',
labelWidth: 200,
required: true,
component: 'InputNumber',
......@@ -199,8 +193,8 @@ export function formSchema(year, planType): FormSchema[] {
colProps: { span: 7, offset: 1 },
},
{
field: 'actualPay',
label: parseInt(year) - 1 + '年资金执行情况-实付额',
field: 'totalActualPay',
label: parseInt(year) - 1 + '年底前累计实付额',
labelWidth: 200,
required: true,
component: 'InputNumber',
......@@ -210,9 +204,8 @@ export function formSchema(year, planType): FormSchema[] {
colProps: { span: 7, offset: 1 },
},
{
field: 'totalActualPay',
label: parseInt(year) - 1 + '年底前累计实付额',
labelWidth: 200,
field: 'projectInvestment',
label: '立项总投资',
required: true,
component: 'InputNumber',
componentProps: {
......@@ -221,11 +214,10 @@ export function formSchema(year, planType): FormSchema[] {
colProps: { span: 7, offset: 1 },
},
{
field: 'plannedInvestment',
label: parseInt(year) - 1 + '年计划投资',
labelWidth: 200,
required: planType === '计划投资项目' ? true : false,
show: planType === '计划投资项目' ? true : false,
field: 'completionSettlement',
label: '竣工结算额',
required: false,
show: planType === '已竣工验收项目' ? true : false,
component: 'InputNumber',
componentProps: {
addonAfter: '万元',
......@@ -244,10 +236,11 @@ export function formSchema(year, planType): FormSchema[] {
colProps: { span: 7, offset: 1 },
},
{
field: 'completionSettlement',
label: '竣工结算额',
required: planType === '已竣工验收项目' ? true : false,
show: planType === '已竣工验收项目' ? true : false,
field: 'plannedInvestment',
label: parseInt(year) + '年计划投资',
labelWidth: 200,
required: planType === '计划投资项目' ? true : false,
show: planType === '计划投资项目' ? true : false,
component: 'InputNumber',
componentProps: {
addonAfter: '万元',
......@@ -280,8 +273,8 @@ export function formSchema(year, planType): FormSchema[] {
componentProps: {
placeholder: ['开始日期', '结束日期'],
style: { width: '100%' },
valueFormat: 'YYYY-MM-DD',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM',
format: 'YYYY-MM',
},
},
{
......@@ -303,6 +296,13 @@ export function formSchema(year, planType): FormSchema[] {
labelWidth: 400,
colProps: { span: 7, offset: 1 },
},
{
field: 'competentDepartment',
label: '项目主管部门',
required: true,
component: 'Input',
colProps: { span: 7, offset: 1 },
},
{
field: 'fundingGap',
label: '2024资金缺口:',
......
src/views/engineeringProject/engineeringEdit/tableData.tsx
View file @ 9859f018
......@@ -148,9 +148,9 @@ export function getformSchema(year, planType): FormSchema[] {
component: 'Select',
componentProps: {
options: [
{ label: '已经立项实施的跨年工程', value: '已经立项实施的跨年工程' },
{ label: '必须建设的项目', value: '必须建设的项目' },
{ label: '可缓建项目', value: '可缓建项目' },
{ label: '已经立项实施的跨年工程', value: 'A' },
{ label: '必须建设的项目', value: 'B' },
{ label: '可缓建项目', value: 'C' },
],
},
labelWidth: 400,
......@@ -175,6 +175,13 @@ export function getformSchema(year, planType): FormSchema[] {
},
colProps: { span: 7, offset: 1 },
},
{
field: 'competentDepartment',
label: '项目主管部门',
required: true,
component: 'Input',
colProps: { span: 7, offset: 1 },
},
{
field: 'contractAmount',
label: '合同额',
......@@ -186,17 +193,6 @@ export function getformSchema(year, planType): FormSchema[] {
},
colProps: { span: 7, offset: 1 },
},
{
field: 'planOutputValue',
label: year + '年计划完成投资额',
show: planType != '承建',
required: planType != '承建',
component: 'InputNumber',
componentProps: {
addonAfter: '万元',
},
colProps: { span: 7, offset: 1 },
},
{
field: 'planCompleteOutputValue',
label: year + '年计划完成产值',
......@@ -208,14 +204,6 @@ export function getformSchema(year, planType): FormSchema[] {
},
colProps: { span: 7, offset: 1 },
},
{
field: 'competentDepartment',
label: '项目主管部门',
required: true,
component: 'Input',
colProps: { span: 7, offset: 1 },
},
{
field: 'matchingFunds',
label: `${year}` + '年财政预算匹配资金',
......@@ -240,6 +228,18 @@ export function getformSchema(year, planType): FormSchema[] {
labelWidth: 400,
colProps: { span: 7, offset: 1 },
},
{
field: 'planOutputValue',
label: year + '年计划完成投资额',
show: planType != '承建',
required: planType != '承建',
component: 'InputNumber',
componentProps: {
addonAfter: '万元',
},
labelWidth: 400,
colProps: { span: 7, offset: 1 },
},
{
field: 'planFunds',
label: `${year}` + '年计划资金',
......@@ -275,8 +275,8 @@ export function getformSchema(year, planType): FormSchema[] {
componentProps: {
placeholder: ['开始日期', '结束日期'],
style: { width: '100%' },
valueFormat: 'YYYY-MM-DD',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM',
format: 'YYYY-MM',
},
},
{
......
src/views/engineeringProject/index.vue
View file @ 9859f018
......@@ -11,22 +11,33 @@
</div>
<div class="characte">
<div class="top">填报周期</div>
<div @click="selectCycle" class="bottom" style="color: #0d84ff; text-decoration: underline; cursor: pointer">{{ mothCycle.fillCycle}}</div>
<div
@click="selectCycle"
class="bottom"
style="color: #0d84ff; text-decoration: underline; cursor: pointer"
>{{ mothCycle.fillCycle }}</div
>
</div>
</div>
<Divider type="vertical" style="height: 36px; border-color: rgba(22,106,203,0.30)" dashed />
<Divider
type="vertical"
style="height: 36px; border-color: rgba(22, 106, 203, 0.3)"
dashed
/>
<div class="card">
<div class="cycleIcon">
<img src="@/assets/icons/shenyutianshu.png" />
</div>
<div class="characte">
<div class="top">剩余天数</div>
<div class="bottom" style="color:#DFAA21 ">{{
daysReturn() + '天'
}}</div>
<div class="bottom" style="color: #dfaa21">{{ daysReturn() + '天' }}</div>
</div>
</div>
<Divider type="vertical" style="height: 36px; border-color: rgba(22,106,203,0.30)" dashed />
<Divider
type="vertical"
style="height: 36px; border-color: rgba(22, 106, 203, 0.3)"
dashed
/>
<div class="card">
<div class="cycleIcon">
......@@ -34,12 +45,14 @@
</div>
<div class="characte">
<div class="top">企业未完成</div>
<div class="bottom" style="color:#DB4343">{{
mothCycle.noNum + '家'
}}</div>
<div class="bottom" style="color: #db4343">{{ mothCycle.noNum + '家' }}</div>
</div>
</div>
<Divider type="vertical" style="height: 36px; border-color: rgba(22,106,203,0.30)" dashed />
<Divider
type="vertical"
style="height: 36px; border-color: rgba(22, 106, 203, 0.3)"
dashed
/>
<div class="card">
<div class="cycleIcon">
......@@ -47,17 +60,15 @@
</div>
<div class="characte">
<div class="top">企业已完成</div>
<div class="bottom" style="color:#16CB28">{{
mothCycle.deptNum - mothCycle.noNum + '家'
}}</div>
<div class="bottom" style="color: #16cb28">{{
mothCycle.deptNum - mothCycle.noNum + '家'
}}</div>
</div>
</div>
</div>
</Col>
<Col :span="4">
<a-button class="btn" @click="getFillDetails">
查看填报详情
</a-button>
<a-button class="btn" @click="getFillDetails"> 查看填报详情 </a-button>
<a-button class="btn" type="primary" @click="returnEdit">
{{ mothCycle.isEdit === '1' ? '开启本轮填报' : '结束本轮填报' }}
</a-button>
......@@ -69,18 +80,20 @@
<template #tabSlot>
<div>
<Tabs v-model:activeKey="planType" size="large" @change="clickTab">
<a-tab-pane key="自投" tab="自投"></a-tab-pane>
<a-tab-pane key="代建" tab="代建"></a-tab-pane>
<a-tab-pane key="承建" tab="承建"></a-tab-pane>
<a-tab-pane key="储备" tab="储备"></a-tab-pane>
<a-tab-pane key="自投" tab="自投" />
<a-tab-pane key="代建" tab="代建" />
<a-tab-pane key="承建" tab="承建" />
<a-tab-pane key="储备" tab="储备" />
</Tabs>
</div>
</template>
<template #toolbar>
<a-button class="btn" type="primary" @click="addEngineering(planType)"> {{'新建投资计划'+'('+planType+')'}} </a-button>
<!-- <a-button class="btn" type="primary" @click="addEngineering('代建')"> 新建计划（代建） </a-button>-->
<!-- <a-button class="btn" type="primary" @click="addEngineering('承建')"> 新建计划（承建） </a-button>-->
<!-- <a-button type="primary" @click="addEngineering('储备')"> 新建计划（储备） </a-button>-->
<a-button class="btn" type="primary" @click="addEngineering(planType)">
{{ '新建投资计划' + '(' + planType + ')' }}
</a-button>
<!-- <a-button class="btn" type="primary" @click="addEngineering('代建')"> 新建计划（代建） </a-button>-->
<!-- <a-button class="btn" type="primary" @click="addEngineering('承建')"> 新建计划（承建） </a-button>-->
<!-- <a-button type="primary" @click="addEngineering('储备')"> 新建计划（储备） </a-button>-->
</template>
<template #bodyCell="{ column, text, record, index }">
<!-- 当前列是序号列时，显示序号 -->
......@@ -97,17 +110,17 @@
label: '详情',
// icon: 'clarity:note-edit-line',
onClick: handleEdit.bind(null, record, 1),
ifShow: true
ifShow: true,
},
{
label: '修改',
// icon: 'clarity:note-edit-line',
onClick: handleEdit.bind(null, record, 0),
ifShow: (_action) => {
ifShow: (_action) => {
return record.editStatus == '0';
},
},
{
{
label: '删除',
color: 'error',
popConfirm: {
......@@ -115,7 +128,7 @@
placement: 'left',
confirm: handleDelete.bind(null, record),
},
ifShow: (_action) => {
ifShow: (_action) => {
return record.editStatus == '0';
},
},
......@@ -138,89 +151,93 @@
</BasicTable>
<CycleModel @register="registerCycleModel" :user-data="mothCycle" @get-cycle="getSetCycle" />
<yearModal @register="register" @close="handleNew" />
<FillDetailsModel @register="registerFillDetail"></FillDetailsModel>
<FillDetailsModel @register="registerFillDetail" />
</div>
</template>
<script lang="ts" setup>
import {Tag, Tabs, Col, Row, Divider} from 'ant-design-vue';
import { Tag, Tabs, Col, Row, Divider } from 'ant-design-vue';
import { BasicTable, useTable, TableAction } from '@/components/Table';
import yearModal from '@/components/yearModal.vue';
import { useModal } from '@/components/Modal';
import { getEngineeringList, auditItem } from '@/api/project/engineeringProject';
import {
getEngineeringList,
auditItem,
deleteItem,
selectCount,
} from '@/api/project/engineeringProject';
import { useDrawer } from '@/components/Drawer';
import { deleteItem, selectCount } from '@/api/project/engineeringProject';
import { columns, searchFormSchema } from './data';
import { router } from '@/router';
import {onMounted, ref} from "vue";
import {getDepartmentList} from "@/api/project/settlementManage";
import {useMessage} from "@/hooks/web/useMessage";
import {useUserStore} from "@/store/modules/user";
import PageCard from "@/components/Page/src/PageCard.vue";
import CycleModel from "@/views/monthlyPlan/cycleModel/cycleModel.vue";
import FillDetailsModel from "@/views/monthlyPlan/fillDetailsModel/fillDetailsModel.vue";
import {getMothCycel,SetEditStatus} from "@/api/project/monthlyPlan";
const mothCycle = ref({
fillCycle:'2024',
isEdit: '0',
deptNum: 12,
noNum: 6,
planType:''
});
const [registerCycleModel, { openModal: openCycleModel }] = useModal();
const [registerFillDetail, { openModal: openFillDetailModel }] = useModal();
function selectCycle() {
openCycleModel(true, {
data: mothCycle.value,
type:'year',
id:8,
planType:planType.value
import { onMounted, ref } from 'vue';
import { getDepartmentList } from '@/api/project/settlementManage';
import { useMessage } from '@/hooks/web/useMessage';
import { useUserStore } from '@/store/modules/user';
import PageCard from '@/components/Page/src/PageCard.vue';
import CycleModel from '@/views/monthlyPlan/cycleModel/cycleModel.vue';
import FillDetailsModel from '@/views/monthlyPlan/fillDetailsModel/fillDetailsModel.vue';
import { getMothCycel, SetEditStatus } from '@/api/project/monthlyPlan';
const mothCycle = ref({
fillCycle: '2024',
isEdit: '0',
deptNum: 12,
noNum: 6,
planType: '',
});
}
function getFillDetails(){
openFillDetailModel(true,{
data:mothCycle.value,
url:'/pro/monthEngineer/businessComDetails',
module:'Engineering',
planType:planType.value
})
}
async function getSetCycle() {
const cycle = await getMothCycel({id:'8',module:'Engineering',planType:planType.value});
mothCycle.value = cycle;
}
function daysReturn() {
// 获取今天的日期
const today = new Date();
const [registerCycleModel, { openModal: openCycleModel }] = useModal();
const [registerFillDetail, { openModal: openFillDetailModel }] = useModal();
function selectCycle() {
openCycleModel(true, {
data: mothCycle.value,
type: 'year',
id: 8,
planType: planType.value,
});
}
function getFillDetails() {
openFillDetailModel(true, {
data: mothCycle.value,
url: '/pro/monthEngineer/businessComDetails',
module: 'Engineering',
planType: planType.value,
});
}
async function getSetCycle() {
const cycle = await getMothCycel({ id: '8', module: 'Engineering', planType: planType.value });
mothCycle.value = cycle;
}
function daysReturn() {
// 获取今天的日期
const today = new Date();
// 获取目标年份和月份
let targetYear = Number.parseInt(mothCycle.value.fillCycle);
let targetMonth= 12;
// 获取目标年份和月份
let targetYear = Number.parseInt(mothCycle.value.fillCycle);
let targetMonth = 12;
// 创建目标日期（2024年9月30日）
const targetDate = new Date(targetYear, targetMonth, 0); // 0表示上一个月的最后一天，即9月30日
// 创建目标日期（2024年9月30日）
const targetDate = new Date(targetYear, targetMonth, 0); // 0表示上一个月的最后一天，即9月30日
// 计算时间差（毫秒）
const timeDifference = targetDate - today;
// 计算时间差（毫秒）
const timeDifference = targetDate - today;
// 计算天数差（天数 = 毫秒差 / 每天的毫秒数）
const daysUntilTarget = Math.max(0, Math.ceil(timeDifference / (1000 * 60 * 60 * 24)));
return daysUntilTarget ;
}
// 计算天数差（天数 = 毫秒差 / 每天的毫秒数）
const daysUntilTarget = Math.max(0, Math.ceil(timeDifference / (1000 * 60 * 60 * 24)));
return daysUntilTarget;
}
function returnEdit() {
mothCycle.value.planType = planType.value
if (mothCycle.value.isEdit == '1') {
mothCycle.value.isEdit = '0';
SetEditStatus(mothCycle.value);
} else {
mothCycle.value.isEdit = '1';
SetEditStatus(mothCycle.value);
function returnEdit() {
mothCycle.value.planType = planType.value;
if (mothCycle.value.isEdit == '1') {
mothCycle.value.isEdit = '0';
SetEditStatus(mothCycle.value);
} else {
mothCycle.value.isEdit = '1';
SetEditStatus(mothCycle.value);
}
reload();
}
reload();
}
const isExamine = ref<boolean>(false);
const deptId = useUserStore().userInfo.deptParentId;
const { createMessage } = useMessage();
......@@ -230,9 +247,9 @@ function returnEdit() {
const [registerDrawer, { openDrawer }] = useDrawer();
const [register, { openModal: openModal, closeModal: closeModal }] = useModal();
const [register, { openModal: openModal, closeModal: closeModal }] = useModal();
const [registerTable, { reload,getForm}] = useTable({
const [registerTable, { reload, getForm }] = useTable({
api: getEngineeringList,
title: '123',
columns,
......@@ -254,34 +271,36 @@ function returnEdit() {
});
onMounted(async () => {
const data = await getDepartmentList()
searchFormSchema[2].componentProps.options=data
const data = await getDepartmentList();
searchFormSchema[2].componentProps.options = data;
let roles = useUserStore().userInfo.roles;
roles.forEach((item) => {
if (item.role_key === 'approver') {
isExamine.value = true;
}
});
getSetCycle()
getSetCycle();
});
async function clickTab(value){
planType.value = value
getForm().setFieldsValue({
planType:value
}).then(()=>{
reload()
getSetCycle()
})
async function clickTab(value) {
planType.value = value;
getForm()
.setFieldsValue({
planType: value,
})
.then(() => {
reload();
getSetCycle();
});
}
const planType = ref('自投')
const planType = ref('自投');
function handleEdit(record: Recordable, disabled: number) {
const data = {
filingCycle: record.filingCycle,
planType: record.planType,
id: record.id,
disabled:disabled
}
disabled: disabled,
};
router.push({
path: '/engineeringProject/engineeringEdit',
query: data,
......@@ -308,13 +327,13 @@ function returnEdit() {
});
};
async function handleNew(e){
async function handleNew(e) {
const data = {
filingCycle: e.year,
planType: planType.value,
}
};
let res = await selectCount(data);
console.log(res)
console.log(res);
if (res == true) {
closeModal();
router.push({
......@@ -324,7 +343,7 @@ function returnEdit() {
} else {
error('该周期已填报');
}
};
}
const change = (key: string) => {
reload();
......@@ -342,24 +361,26 @@ function returnEdit() {
margin-top: 8px;
}
.cycleFrame{
border: 1px solid rgba(22, 106, 203, 0.10);
.cycleFrame {
border: 1px solid rgba(22, 106, 203, 0.1);
border-radius: 6px;
padding: 20px 50px;
margin-right: 20px;
display: flex;
justify-content: space-between;
.card{
.card {
display: flex;
.cycleIcon{
.cycleIcon {
margin-right: 10px;
}
.characte{
.characte {
display: flex;
flex-direction: column;
justify-content: space-around;
.top{}
.bottom{}
.top {
}
.bottom {
}
}
}
}
......
src/views/engineeringProject/statisticEngineering/statisticData.ts
View file @ 9859f018
......@@ -82,7 +82,7 @@ export function getBasicColumns(year: string, planType: string): BasicColumn[] {
className: planType === '承建' ? 'tableShow' : 'tableHiddle',
},
{
title: '投资总额(万元)',
title: '立项投资额(万元)',
dataIndex: 'totalInvestment',
className: planType != '承建' ? 'tableShow' : 'tableHiddle',
......@@ -94,7 +94,7 @@ export function getBasicColumns(year: string, planType: string): BasicColumn[] {
className: planType === '承建' ? 'tableShow' : 'tableHiddle',
},
{
title: year + '年计划完成投资额度',
title: year + '年计划完成投资额',
dataIndex: 'planOutputValue',
className: planType != '承建' ? 'tableShow' : 'tableHiddle',
},
......@@ -209,7 +209,6 @@ export function getDtailsBasicColumns(year: string, planType: string): BasicColu
dataIndex: 'matchingFunds',
ifShow: planType === '承建',
width: 150,
ifShow: true,
},
{
title: '其中专项债项目' + year + '预计使用专项债资金',
......@@ -242,7 +241,7 @@ export function getDtailsBasicColumns(year: string, planType: string): BasicColu
ifShow: true,
},
{
title: year + '年底预计形象季度',
title: year + '年底预计形象进度',
dataIndex: 'schedule',
width: 150,
ifShow: true,
......
src/views/performance/data.tsx
View file @ 9859f018
......@@ -589,16 +589,14 @@ export function formSchema(year, planType): FormSchema[] {
colProps: { span: 7, offset: 1 },
},
{
field: 'outputValue',
label:
planType === '承建'
? year + '年之前完成总产值(不含' + year + '年)'
: year + '年之前完成总投资额(不含' + year + '年)',
required: true,
show: true,
field: 'planCompleteOutputValue',
label: year + '计划产值',
required: planType === '承建',
show: planType === '承建',
component: 'InputNumber',
componentProps: {
addonAfter: '万元',
disabled: true,
},
colProps: { span: 7, offset: 1 },
},
......@@ -615,20 +613,22 @@ export function formSchema(year, planType): FormSchema[] {
colProps: { span: 7, offset: 1 },
},
{
field: 'planCompleteOutputValue',
label: year + '计划产值',
required: planType === '承建',
show: planType === '承建',
field: 'actualOutputValue',
label: planType === '承建' ? year + '年实际产值' : year + '实际投资额',
required: true,
show: true,
component: 'InputNumber',
componentProps: {
addonAfter: '万元',
disabled: true,
},
colProps: { span: 7, offset: 1 },
},
{
field: 'actualOutputValue',
label: planType === '承建' ? year + '年实际产值' : year + '实际投资额',
field: 'outputValue',
label:
planType === '承建'
? year + '年之前完成总产值(不含' + year + '年)'
: year + '年之前完成总投资额(不含' + year + '年)',
required: true,
show: true,
component: 'InputNumber',
......@@ -672,6 +672,7 @@ export function formSchema(year, planType): FormSchema[] {
field: 'contract',
label: '合同方式',
component: 'Input',
show: planType === '承建',
componentProps: {
readonly: true,
disabled: true,
......
src/views/settlementManagement/data.tsx
View file @ 9859f018
......@@ -137,7 +137,7 @@ export const formSchema: FormSchema[] = [
required: true,
component: 'InputNumber',
componentProps: {
addonAfter: '元',
addonAfter: '万元',
},
colProps: { span: 7, offset: 1 },
},
......
src/views/settlementManagement/statistic/index.vue
View file @ 9859f018
......@@ -230,7 +230,7 @@
width: 180,
},
{
title: '立项投资额(元)',
title: '立项投资额(万元)',
dataIndex: 'projectInvestment',
width: 180,
},
......@@ -260,7 +260,7 @@
width: 180,
},
{
title: '合同金额(元)',
title: '合同金额(万元)',
dataIndex: 'contractAmount',
width: 180,
},
......
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