Commit 37a826c5 authored by 高滢's avatar 高滢

feat(完成): 提交

parent 2f48f71b
...@@ -531,7 +531,7 @@ export function formSchema(year, planType): FormSchema[] { ...@@ -531,7 +531,7 @@ export function formSchema(year, planType): FormSchema[] {
}, },
{ {
field: 'totalInvestment', field: 'totalInvestment',
label: '总投资', label: '立项总投资',
required: planType != '承建', required: planType != '承建',
show: planType != '承建', show: planType != '承建',
component: 'InputNumber', component: 'InputNumber',
...@@ -541,10 +541,10 @@ export function formSchema(year, planType): FormSchema[] { ...@@ -541,10 +541,10 @@ export function formSchema(year, planType): FormSchema[] {
colProps: { span: 7, offset: 1 }, colProps: { span: 7, offset: 1 },
}, },
{ {
field: 'contractAmount', field: 'projectApproval',
label: '合同总额', label: '实际控制总投资',
show: planType === '承建', required: false,
required: planType === '承建', show: planType != '承建',
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
addonAfter: '万元', addonAfter: '万元',
...@@ -552,19 +552,15 @@ export function formSchema(year, planType): FormSchema[] { ...@@ -552,19 +552,15 @@ export function formSchema(year, planType): FormSchema[] {
colProps: { span: 7, offset: 1 }, colProps: { span: 7, offset: 1 },
}, },
{ {
field: 'time', field: 'contractAmount',
component: 'RangePicker', label: '合同总额',
label: '开竣工时间', show: planType === '承建',
required: true, required: planType === '承建',
icon: 'healthicons:i-schedule-school-date-time-outline', component: 'InputNumber',
colProps: { span: 7, offset: 1 },
componentProps: { componentProps: {
picker: 'month', addonAfter: '万元',
placeholder: ['开始日期', '结束日期'],
style: { width: '100%' },
valueFormat: 'YYYY-MM',
format: 'YYYY-MM',
}, },
colProps: { span: 7, offset: 1 },
}, },
{ {
field: 'completionSchedule', field: 'completionSchedule',
...@@ -656,6 +652,21 @@ export function formSchema(year, planType): FormSchema[] { ...@@ -656,6 +652,21 @@ export function formSchema(year, planType): FormSchema[] {
component: 'Input', component: 'Input',
colProps: { span: 7, offset: 1 }, colProps: { span: 7, offset: 1 },
}, },
{
field: 'time',
component: 'RangePicker',
label: '开竣工时间',
required: true,
icon: 'healthicons:i-schedule-school-date-time-outline',
colProps: { span: 7, offset: 1 },
componentProps: {
picker: 'month',
placeholder: ['开始日期', '结束日期'],
style: { width: '100%' },
valueFormat: 'YYYY-MM',
format: 'YYYY-MM',
},
},
{ {
field: 'contract', field: 'contract',
label: '合同方式', label: '合同方式',
......
...@@ -270,6 +270,7 @@ ...@@ -270,6 +270,7 @@
{ field: 'actualOutputValue', required: false }, { field: 'actualOutputValue', required: false },
{ field: 'planFunds', required: false }, { field: 'planFunds', required: false },
{ field: 'actualPay', required: false }, { field: 'actualPay', required: false },
{ field: 'contract', required: false },
]); ]);
} else { } else {
updateSchema([ updateSchema([
...@@ -291,6 +292,7 @@ ...@@ -291,6 +292,7 @@
{ field: 'actualOutputValue', required: true }, { field: 'actualOutputValue', required: true },
{ field: 'planFunds', required: true }, { field: 'planFunds', required: true },
{ field: 'actualPay', required: true }, { field: 'actualPay', required: true },
{ field: 'contract', required: planType.value === '承建' },
]); ]);
} }
}); });
......
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