Skip to content

W
web-project
Commit 1eedb3ba authored by mengzixuan's avatar mengzixuan
Browse files
Options

feat: (工程投资计划): 删除问题修复

parent 5ed34be6
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 47 deletions
src/views/engineeringProject/constructionEdit/constructionEdit.vue
View file @ 1eedb3ba
...@@ -6,25 +6,27 @@ ...@@ -6,25 +6,27 @@
<a-button type="default" @click="router.back()"> 返回 </a-button> <a-button type="default" @click="router.back()"> 返回 </a-button>
</template> </template>
<PageCard v-for="(item, index) in tabsFormSchema" :key="index" :title="item.name"> <template v-for="(item, index) in tabsFormSchema">
<template #right> <PageCard v-if="item.show" :key="index" :title="item.name">
<a-button <template #right>
type="text" <a-button
preIcon="ant-design:delete-outlined" type="text"
danger preIcon="ant-design:delete-outlined"
v-if="!disabled" danger
@click="deleteItem(index)" v-if="!disabled"
/> @click="deleteItem(index)"
</template> />
<BasicForm :loading="loading" @register="item.Form[0]" /> </template>
<div style="width: 500px"> <BasicForm :loading="loading" @register="item.Form[0]" />
<BasicTable <div style="width: 500px">
:ref="(el) => setSwipeCellRef(item, index)" <BasicTable
@register="item.table" :ref="(el) => setSwipeCellRef(item, index)"
:beforeEditSubmit="beforeEditSubmit(item, index)" @register="item.table"
/> :beforeEditSubmit="beforeEditSubmit(item, index)"
</div> />
</PageCard> </div>
</PageCard>
</template>
<a-button v-if="!disabled" type="dashed" @click="add" preIcon="ei:plus"> <a-button v-if="!disabled" type="dashed" @click="add" preIcon="ei:plus">
从项目库导入 从项目库导入
</a-button> </a-button>
...@@ -185,11 +187,12 @@ ...@@ -185,11 +187,12 @@
engineerId.value = id; engineerId.value = id;
isUpdate.value = true; isUpdate.value = true;
let res = await getItem({ id }); let res = await getItem({ id });
console.log('getItem', res); // console.log('getItem', res);
for (let i = 0; i < res.length; i++) { for (let i = 0; i < res.length; i++) {
const item = { const item = {
name: '序号' + (i + 1), name: '序号' + (i + 1),
forceRender: true, forceRender: true,
show: true,
Form: useForm( Form: useForm(
Object.assign({ schemas: formSchema, disabled }, baseFormConfig) as FormProps, Object.assign({ schemas: formSchema, disabled }, baseFormConfig) as FormProps,
), ),
...@@ -217,7 +220,10 @@ ...@@ -217,7 +220,10 @@
id: info.id, id: info.id,
investmentId: info.investmentId, investmentId: info.investmentId,
}; };
formData.value.investmentPlan = []; console.log('ddatadataata', data);
if (formData.value.investmentPlan === undefined) {
formData.value.investmentPlan = [];
}
formData.value.investmentPlan.push(data); formData.value.investmentPlan.push(data);
console.log('info', info); console.log('info', info);
const { setTableData } = item.table[1]; const { setTableData } = item.table[1];
...@@ -254,6 +260,7 @@ ...@@ -254,6 +260,7 @@
type TabsFormType = { type TabsFormType = {
name: string; name: string;
forceRender?: boolean; forceRender?: boolean;
show?: boolean;
Form: UseFormReturnType; Form: UseFormReturnType;
table: any; table: any;
}; };
...@@ -263,7 +270,7 @@ ...@@ -263,7 +270,7 @@
layout: 'vertical', layout: 'vertical',
}; };
const tabsFormSchema = reactive<TabsFormType[]>([]); let tabsFormSchema = reactive<TabsFormType[]>([]);
async function add() { async function add() {
openModal(); openModal();
...@@ -283,6 +290,7 @@ ...@@ -283,6 +290,7 @@
const item = { const item = {
name: '序号' + (tabsFormSchema.length + 1), name: '序号' + (tabsFormSchema.length + 1),
forceRender: true, forceRender: true,
show: true,
Form: useForm(Object.assign({ schemas: formSchema }, baseFormConfig) as FormProps), Form: useForm(Object.assign({ schemas: formSchema }, baseFormConfig) as FormProps),
table: useTable({ table: useTable({
title: '表尾行合计示例', title: '表尾行合计示例',
...@@ -348,8 +356,9 @@ ...@@ -348,8 +356,9 @@
}); });
} }
async function deleteItem(index: any) { async function deleteItem(index: any) {
tabsFormSchema.splice(index, 1); tabsFormSchema[index].show = false;
formData.value.investmentPlan.splice(index, 1); // tabsFormSchema.splice(index, 1);
// formData.value.investmentPlan.splice(index, 1);
} }
async function handleAdd() { async function handleAdd() {
openDrawer(true, { openDrawer(true, {
...@@ -366,29 +375,31 @@ ...@@ -366,29 +375,31 @@
try { try {
for (let i = 0; i < tabsFormSchema.length; i++) { for (let i = 0; i < tabsFormSchema.length; i++) {
let item = tabsFormSchema[i]; let item = tabsFormSchema[i];
const { validate, getFieldsValue } = item.Form[1]; if (item.show) {
const { getDataSource } = item.table[1]; const { validate, getFieldsValue } = item.Form[1];
await validate(); const { getDataSource } = item.table[1];
let res = getFieldsValue(); await validate();
let data = getDataSource(); let res = getFieldsValue();
console.log(' getFieldsValue()', getFieldsValue()); let data = getDataSource();
console.log(' getDataSource()', getDataSource()); console.log(' getFieldsValue()', getFieldsValue());
console.log(' data111', data); console.log(' getDataSource()', getDataSource());
data[0].amount = Number(data[0].amount); console.log(' data111', data);
data[1].amount = Number(data[1].amount); data[0].amount = Number(data[0].amount);
data[2].amount = Number(data[2].amount); data[1].amount = Number(data[1].amount);
// res.biddingPeriod = res.biddingPeriod.join(','); data[2].amount = Number(data[2].amount);
// res.plannedPeriod = res.plannedPeriod.join(','); // res.biddingPeriod = res.biddingPeriod.join(',');
formData.value.investmentPlan[i] = deepMerge(formData.value.investmentPlan[i], res); // res.plannedPeriod = res.plannedPeriod.join(',');
formData.value.investmentPlan[i].planYear = data; formData.value.investmentPlan[i] = deepMerge(formData.value.investmentPlan[i], res);
formData.value.investmentPlan[i].beginTime = res.time[0]; formData.value.investmentPlan[i].planYear = data;
formData.value.investmentPlan[i].endTime = res.time[1]; formData.value.investmentPlan[i].beginTime = res.time[0];
formData.value.planType = '承建'; formData.value.investmentPlan[i].endTime = res.time[1];
formData.value.filingCycle = year.value;; formData.value.planType = '承建';
formData.value.investmentPlan[i].totalInvestment = Number( formData.value.filingCycle = year.value;;
formData.value.investmentPlan[i].totalInvestment, formData.value.investmentPlan[i].totalInvestment = Number(
); formData.value.investmentPlan[i].totalInvestment,
formData.value.id = engineerId.value; );
formData.value.id = engineerId.value;
}
} }
formData.value.proNumber = formData.value.investmentPlan.Length; formData.value.proNumber = formData.value.investmentPlan.Length;
console.log(' formData()', unref(formData)); console.log(' formData()', unref(formData));
......
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