diff --git a/jinbooks-ui/src/api/system/voucher/voucher-template.ts b/jinbooks-ui/src/api/system/voucher/voucher-template.ts index ab58b39..e8c72f2 100644 --- a/jinbooks-ui/src/api/system/voucher/voucher-template.ts +++ b/jinbooks-ui/src/api/system/voucher/voucher-template.ts @@ -13,12 +13,13 @@ export function get(relatedId:string,id: string): any { } // 获取 -export function list(relatedId: string): any { +export function list(relatedId: string,category: number): any { return request({ url: '/vouchertemplate/fetch', method: 'get', params: { - relatedId: relatedId + relatedId: relatedId, + category :category } }) } diff --git a/jinbooks-ui/src/views/settlement/carry-forward.vue b/jinbooks-ui/src/views/settlement/carry-forward.vue index af8f725..4270c97 100644 --- a/jinbooks-ui/src/views/settlement/carry-forward.vue +++ b/jinbooks-ui/src/views/settlement/carry-forward.vue @@ -9,6 +9,15 @@ @tab-click="handleClick" > + + + 全部 + 期末 + 计提 + 支付 + 常规 + + - - + + + + @@ -244,7 +255,8 @@ const initFormData: any = { const data = reactive({ form: {...initFormData}, queryParams: { - bookId: currBookStore.bookId + bookId: currBookStore.bookId, + category:0 }, voucherForm: {}, items: { @@ -262,7 +274,7 @@ const {queryParams, form, items, voucherForm} = toRefs(data); /** 查询列表 */ function getList() { loading.value = true; - settlementApi.fetchcarry(currBookStore.bookId).then((response: any) => { + settlementApi.fetchcarry(queryParams.value).then((response: any) => { vouchertemplateList.value = response.data.records; //total.value = response.data.total; loading.value = false; diff --git a/jinbooks-ui/src/views/voucher/voucher-template.vue b/jinbooks-ui/src/views/voucher/voucher-template.vue index 75f7c7b..478f21c 100644 --- a/jinbooks-ui/src/views/voucher/voucher-template.vue +++ b/jinbooks-ui/src/views/voucher/voucher-template.vue @@ -13,6 +13,15 @@ + + + 全部 + 期末 + 计提 + 支付 + 常规 + + @@ -65,8 +74,10 @@ - - + + + + @@ -206,6 +217,7 @@ const data = reactive({ queryParams: { periodType: 'month', standardId:'', + category:0, date: parseTime(new Date(), "{y}-{m}"), reportQuarter: getCurrentQuarter(), reportDate: parseTime(new Date(), "{y}-{m}"), @@ -236,7 +248,7 @@ const disabledDate = (time: any) => { /** 查询列表 */ function getList() { loading.value = true; - voucherTemplateService.list(queryParams.value.standardId).then((response: any) => { + voucherTemplateService.list(queryParams.value.standardId,queryParams.value.category).then((response: any) => { vouchertemplateList.value = response.data.records; //total.value = response.data.total; loading.value = false; diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/BookServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/BookServiceImpl.java index 267c3e3..bc181f9 100644 --- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/BookServiceImpl.java +++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/BookServiceImpl.java @@ -112,6 +112,9 @@ public class BookServiceImpl extends ServiceImpl implements Bo //新增默认科目和现金流量的关系 standardSubjectCashFlowService.saveTemplateRelationships(dto.getId()); + + //新增凭证模板 + voucherTemplateService.insertBookTemplate(dto.getId(), dto.getStandardId()); //新增账套 Book newBook = new Book(); diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/SettlementCarryServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/SettlementCarryServiceImpl.java index a4ba2ff..80ff1d0 100644 --- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/SettlementCarryServiceImpl.java +++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/SettlementCarryServiceImpl.java @@ -81,9 +81,6 @@ public class SettlementCarryServiceImpl extends ServiceImpl> fetchCarry(VoucherTemplatePageDto dto) { - dto.setCategory(1);//期末处理模板 dto.setYearPeriod(configSysService.getCurrentTerm(dto.getBookId())); Page page = settlementCarryforwardMapper.pageList(dto.build(), dto); - if (page.getTotal() <= 0) { - Book book = bookMapper.selectById(dto.getRelatedId()); - voucherTemplateService.insertBookTemplate(dto.getRelatedId(), book.getStandardId()); - //重新查询数据 - page = settlementCarryforwardMapper.pageList(dto.build(), dto); - } - return Message.ok(page); } diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/VoucherTemplateServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/VoucherTemplateServiceImpl.java index afd6c94..6a77cfb 100644 --- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/VoucherTemplateServiceImpl.java +++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/VoucherTemplateServiceImpl.java @@ -208,7 +208,6 @@ public class VoucherTemplateServiceImpl extends ServiceImpltemplateWrapper = new LambdaQueryWrapper<>(); templateWrapper.eq(VoucherTemplate::getRelatedId, standardId); - templateWrapper.eq(VoucherTemplate::getCategory, 1);//期末处理模板 List templates = voucherTemplateMapper.selectList(templateWrapper); List newItems = new ArrayList<>(); for(VoucherTemplate template: templates) {