Commit 691f194b authored by zhang's avatar zhang

style: (月度工程资金计划/上报月度资金计划/创建月度资金计划)改为树形控件形式

parent fdaa5e30
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
setup(props, { expose, slots }) { setup(props, { expose, slots }) {
const { prefixCls } = useDesign('collapse-container'); const { prefixCls } = useDesign('collapse-container');
const show = ref(true); const show = ref(false);// 定义初始是否展开
const handleExpand = (val: boolean) => { const handleExpand = (val: boolean) => {
show.value = isNil(val) ? !show.value : val; show.value = isNil(val) ? !show.value : val;
...@@ -111,7 +111,8 @@ ...@@ -111,7 +111,8 @@
display: flex; display: flex;
flex: 1; flex: 1;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: space-between;
margin-left: 10px;
text-align: right; text-align: right;
} }
} }
......
...@@ -26,16 +26,23 @@ ...@@ -26,16 +26,23 @@
const _prefixCls = computed(() => props.prefixCls || unref(prefixCls)); const _prefixCls = computed(() => props.prefixCls || unref(prefixCls));
return () => ( return () => (
<div class={[`${unref(_prefixCls)}__header px-2 py-5`, attrs.class]}> <div class={[`${unref(_prefixCls)}__header px-2 py-5`, attrs.class]}>
<BasicTitle helpMessage={props.helpMessage} normal> <BasicTitle onClick={() => emit('expand')} helpMessage={props.helpMessage} normal>
{slots.title?.() || props.title} {slots.title?.() || props.title}
</BasicTitle> </BasicTitle>
<div class={`${unref(_prefixCls)}__action`}> <div class={`${unref(_prefixCls)}__action`}>
{slots.action {
? slots.action({ expand: props.show, onClick: () => emit('expand') }) props.canExpand&& (
: props.canExpand && (
<BasicArrow up expand={props.show} onClick={() => emit('expand')} /> <BasicArrow up expand={props.show} onClick={() => emit('expand')} />
)} )
}
{
slots.action
? slots.action({ expand: props.show, onClick: () => emit('expand') })
: props.canExpand
}
</div> </div>
</div> </div>
); );
......
...@@ -13,8 +13,11 @@ ...@@ -13,8 +13,11 @@
<a-button type="default" @click="router.back()"> 返回 </a-button> <a-button type="default" @click="router.back()"> 返回 </a-button>
</template> </template>
<!-- page页 --> <!-- page页 -->
<PageCard v-for="(item, index) in tabsFormSchema" :key="index" :title="item.name"> <CollapseContainer v-for="(item, index) in tabsFormSchema" :key="index">
<template #right> <template #title >
<span class="projectName" >{{item.name}}</span>
</template>
<template #action>
<a-button <a-button
v-if="!disabled" v-if="!disabled"
type="text" type="text"
...@@ -26,14 +29,18 @@ ...@@ -26,14 +29,18 @@
</template> </template>
<BasicForm :loading="loading" @register="item.Form[0]" /> <BasicForm :loading="loading" @register="item.Form[0]" />
<!-- 左上角为项目名 --> <!-- 左上角为项目名 -->
<PageCard <CollapseContainer
v-for="(content, key) in item.list" v-for="(content, key) in item.list"
:key="key" :key="key"
class="subCard" class="subCard"
:title="content.name" :title="content.name"
> >
<template #title >
<span class="contractName">{{ content.name }}</span>
</template>
<!-- 右上角的删除按钮 --> <!-- 右上角的删除按钮 -->
<template #right> <template #right>
<a-button <a-button
v-if="!disabled" v-if="!disabled"
type="text" type="text"
...@@ -44,8 +51,8 @@ ...@@ -44,8 +51,8 @@
> >
</template> </template>
<BasicForm :loading="loading" @register="content.form" /> <BasicForm :loading="loading" @register="content.form" />
</PageCard> </CollapseContainer>
</PageCard> </CollapseContainer>
<!--导入或新增按钮--> <!--导入或新增按钮-->
<a-button type="dashed" @click="add" preIcon="ei:plus" v-if="!disabled"> <a-button type="dashed" @click="add" preIcon="ei:plus" v-if="!disabled">
从合同中导入 从合同中导入
...@@ -83,6 +90,8 @@ ...@@ -83,6 +90,8 @@
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import { monthListByMonthYear } from '@/api/project/detail/month'; import { monthListByMonthYear } from '@/api/project/detail/month';
import { forEach } from '@/utils/helper/treeHelper'; import { forEach } from '@/utils/helper/treeHelper';
import CollapseContainer from '@/components/Container/src/collapse/CollapseContainer.vue';
import { template } from 'xe-utils';
//历史记录是否可查 //历史记录是否可查
const historyData = ref(true); const historyData = ref(true);
...@@ -366,7 +375,6 @@ ...@@ -366,7 +375,6 @@
for (let t = 0; t < item.list.length; t++) { for (let t = 0; t < item.list.length; t++) {
let content = tabsFormSchema[i].list[t]; let content = tabsFormSchema[i].list[t];
let contentRes = await getFormData(content.form[1]); let contentRes = await getFormData(content.form[1]);
console.log(contentRes);
formData.value.engineerConList[i].conList[t] = deepMerge( formData.value.engineerConList[i].conList[t] = deepMerge(
formData.value.engineerConList[i].conList[t], formData.value.engineerConList[i].conList[t],
contentRes, contentRes,
...@@ -378,11 +386,11 @@ ...@@ -378,11 +386,11 @@
formData.value.fundId = tenderId.value; formData.value.fundId = tenderId.value;
console.log(unref(formData)); console.log(unref(formData));
let res = isUpdate.value ? await updateItem(unref(formData)) : await addItem(unref(formData)); let res = isUpdate.value ? await updateItem(unref(formData)) : await addItem(unref(formData));
addItemData.operateType = operateType.update; addItemData.operateType = operateType.update;
addItemData.businessId = routeId.value; addItemData.businessId = routeId.value;
addItemData.businessType = '月度工程资金计划'; addItemData.businessType = '月度工程资金计划';
const showDatem = await addItemApi(addItemData); const showDatem = await addItemApi(addItemData);
console.log(showDatem, '记录添加成功'); console.log(showDatem, '记录添加成功');
loadingRef.value = true; loadingRef.value = true;
...@@ -410,4 +418,14 @@ ...@@ -410,4 +418,14 @@
.subCard { .subCard {
border: 1px solid #e8eaec; border: 1px solid #e8eaec;
} }
.projectName{
border-left: blue solid 6px;
padding-left:10px;
font-weight:bold;
}
.contractName{
border-left: red solid 6px;
padding-left:10px;
font-weight:bold;
}
</style> </style>
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