优化

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
         }
     })
 }

jinbooks-ui/src/views/settlement/carry-forward.vue

@@ -9,6 +9,15 @@
           @tab-click="handleClick"
       >
         <el-tab-pane label="期末处理" name="carry-forward">
+          <el-form-item  label="类型：">
+            <el-radio-group v-model="queryParams.category" @change="getList">
+              <el-radio-button :value="0">全部</el-radio-button>
+              <el-radio-button :value="1">期末</el-radio-button>
+              <el-radio-button :value="2">计提</el-radio-button>
+              <el-radio-button :value="3">支付</el-radio-button>
+              <el-radio-button :value="4">常规</el-radio-button>
+            </el-radio-group>
+        </el-form-item>
           <el-table v-loading="loading" :data="vouchertemplateList" border
                     :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
                     row-key="id" default-expand-all
@@ -73,8 +82,10 @@
                 </el-form-item>
                 <el-form-item label="分类" prop="category" :required="true">
                   <el-select v-model="form.category" placeholder="选择" style="width: 300px">
-                    <el-option label="期末处理" value="1"></el-option>
+                    <el-option label="期末" value="1"></el-option>
-                    <el-option label="薪资凭证" value="2"></el-option>
+                    <el-option label="计提" value="2"></el-option>
+                    <el-option label="支付" value="3"></el-option>
+                    <el-option label="常规" value="4"></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item label="字头" prop="wordHead" :required="true">
@@ -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;

jinbooks-ui/src/views/voucher/voucher-template.vue

@@ -13,6 +13,15 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item  label="类型：">
+            <el-radio-group v-model="queryParams.category" @change="getList">
+              <el-radio-button :value="0">全部</el-radio-button>
+              <el-radio-button :value="1">期末</el-radio-button>
+              <el-radio-button :value="2">计提</el-radio-button>
+              <el-radio-button :value="3">支付</el-radio-button>
+              <el-radio-button :value="4">常规</el-radio-button>
+            </el-radio-group>
+        </el-form-item>
         </el-form>
       </div>
     </el-card>
@@ -65,8 +74,10 @@
           </el-form-item>
           <el-form-item label="分类" prop="category" :required="true">
             <el-select  v-model="form.category" placeholder="选择" style="width: 300px">
-                  <el-option label="期末处理" value="1"></el-option>
+                  <el-option label="期末" value="1"></el-option>
-                  <el-option label="薪资凭证" value="2"></el-option>
+                  <el-option label="计提" value="2"></el-option>
+                  <el-option label="支付" value="3"></el-option>
+                  <el-option label="常规" value="4"></el-option>
                 </el-select>
           </el-form-item>
           <el-form-item label="字头" prop="wordHead" :required="true">
@@ -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;

jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/BookServiceImpl.java

@@ -113,6 +113,9 @@ public class BookServiceImpl extends ServiceImpl<BookMapper, Book> implements Bo
         //新增默认科目和现金流量的关系
         standardSubjectCashFlowService.saveTemplateRelationships(dto.getId());
         
+        //新增凭证模板
+        voucherTemplateService.insertBookTemplate(dto.getId(), dto.getStandardId());
+
         //新增账套
         Book newBook = new Book();
         BeanUtil.copyProperties(dto, newBook);

jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/SettlementCarryServiceImpl.java

@@ -81,9 +81,6 @@ public class SettlementCarryServiceImpl extends ServiceImpl<SettlementMapper, Se
     @Autowired
     VoucherService voucherService;
 
-    @Autowired
-    VoucherTemplateService voucherTemplateService;
-
     @Autowired
     VoucherTemplateItemMapper voucherTemplateItemMapper;
 
@@ -100,16 +97,8 @@ public class SettlementCarryServiceImpl extends ServiceImpl<SettlementMapper, Se
     EmployeeSalarySummaryMapper employeeSalarySummaryMapper;
 
     public Message<Page<SettlementCarryforwardVo>> fetchCarry(VoucherTemplatePageDto dto) {
-        dto.setCategory(1);//期末处理模板
         dto.setYearPeriod(configSysService.getCurrentTerm(dto.getBookId()));
         Page<SettlementCarryforwardVo> 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);
     }
 

jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/VoucherTemplateServiceImpl.java

@@ -208,7 +208,6 @@ public class VoucherTemplateServiceImpl extends ServiceImpl<VoucherTemplateMappe
 	public boolean insertBookTemplate(String bookId, String standardId) {
     	LambdaQueryWrapper<VoucherTemplate>templateWrapper = new LambdaQueryWrapper<>();
     	templateWrapper.eq(VoucherTemplate::getRelatedId, standardId);
-    	templateWrapper.eq(VoucherTemplate::getCategory, 1);//期末处理模板
         List<VoucherTemplate> templates = voucherTemplateMapper.selectList(templateWrapper);
         List<VoucherTemplateItem> newItems = new ArrayList<>();
         for(VoucherTemplate template: templates) {