会计核算

SC-boot/linkage-scm/src/main/java/jnpf/accounting/controller/AccountingController.java

@@ -0,0 +1,390 @@
+
+
+package jnpf.accounting.controller;
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import jnpf.base.ActionResult;
+import jnpf.base.vo.PageListVO;
+import jnpf.base.vo.PaginationVO;
+import jnpf.base.UserInfo;
+import jnpf.base.vo.DownloadVO;
+import jnpf.config.ConfigValueUtil;
+import jnpf.exception.DataException;
+import jnpf.saleorder.entity.SaleorderitemEntity;
+import jnpf.saleorder.entity.Salesorder_item0Entity;
+import jnpf.vehicle.entity.VehicleEntity;
+import org.springframework.transaction.annotation.Transactional;
+import jnpf.base.entity.ProvinceEntity;
+import jnpf.accounting.model.accounting.*;
+import jnpf.accounting.model.accounting.AccountingPagination;
+import jnpf.entity.*;
+import jnpf.util.*;
+import jnpf.base.util.*;
+import jnpf.base.vo.ListVO;
+import jnpf.util.context.SpringContext;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.extern.slf4j.Slf4j;
+import lombok.Cleanup;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import jnpf.accounting.entity.AccountingEntity;
+import jnpf.accounting.service.AccountingService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.multipart.MultipartFile;
+import javax.validation.Valid;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import jnpf.util.GeneraterSwapUtil;
+import java.util.*;
+
+import jnpf.util.file.UploadUtil;
+import jnpf.util.enums.FileTypeEnum;
+
+/**
+ *
+ * accounting
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-06-19
+ */
+@Slf4j
+@RestController
+@Api(tags = "accounting" , value = "example")
+@RequestMapping("/api/example/Accounting")
+public class AccountingController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private ConfigValueUtil configValueUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private AccountingService accountingService;
+
+
+
+
+    /**
+     * 列表
+     *
+     * @param accountingPagination
+     * @return
+     */
+	@PostMapping("/getList")
+    public ActionResult list(@RequestBody AccountingPagination accountingPagination)throws IOException{
+        List<AccountingEntity> list= accountingService.getList(accountingPagination);
+        //处理id字段转名称，若无需转或者为空可删除
+    for(AccountingEntity entity:list){
+    }
+	List<AccountingListVO> listVO=JsonUtil.getJsonToList(list,AccountingListVO.class);
+    for(AccountingListVO accountingVO:listVO){
+            }
+
+
+        PageListVO vo=new PageListVO();
+        vo.setList(listVO);
+        PaginationVO page=JsonUtil.getJsonToBean(accountingPagination,PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+
+
+    /**
+     * 创建
+     *
+     * @param accountingCrForm
+     * @return
+     */
+    @PostMapping
+    @Transactional
+    public ActionResult create(@RequestBody @Valid AccountingCrForm accountingCrForm) throws DataException {
+        String mainId =RandomUtil.uuId();
+        UserInfo userInfo=userProvider.get();
+
+        QueryWrapper<AccountingEntity> accountingWrapper=new QueryWrapper<>();
+        accountingWrapper.lambda().eq(AccountingEntity::getFiscalYear,accountingCrForm.getFiscalYear());
+        accountingWrapper.lambda().eq(AccountingEntity::getIntervals,accountingCrForm.getIntervals());
+
+        List<AccountingEntity> accountingEntityList = accountingService.list(accountingWrapper);
+        if (accountingEntityList.size()>0){
+            return ActionResult.fail("已经存在该会计年度的会计期间");
+        }else {
+            accountingCrForm.setCreatorUserName(userInfo.getUserId());
+            accountingCrForm.setCreatorTime(DateUtil.getNow());
+            AccountingEntity entity = JsonUtil.getJsonToBean(accountingCrForm, AccountingEntity.class);
+            entity.setId(mainId);
+            entity.setStatus("0");
+            entity.setStatus("0");
+            entity.setEndDate(accountingCrForm.getEndDate());
+            accountingService.save(entity);
+            return ActionResult.success("创建成功");
+        }
+
+}
+
+
+
+    /**
+    * 模板下载
+    *
+    * @return
+    */
+    @ApiOperation("模板下载")
+    @GetMapping("/templateDownload")
+    public ActionResult<DownloadVO>  TemplateDownload(){
+        UserInfo userInfo=userProvider.get();
+        DownloadVO vo=DownloadVO.builder().build();
+        try{
+            vo.setName("职员信息.xlsx");
+            vo.setUrl(UploaderUtil.uploaderFile("/api/Common/DownloadModel?encryption=" ,userInfo.getId()+"#"+"职员信息.xlsx"+"#"+"Temporary"));
+        }catch(Exception e){
+            log.error("信息导出Excel错误:{}" ,e.getMessage());
+        }
+        return ActionResult.success(vo);
+    }
+    /**
+    * 导出Excel
+    *
+    * @return
+    */
+    @ApiOperation("导出Excel")
+    @GetMapping("/Actions/Export")
+    public ActionResult Export(AccountingPaginationExportModel accountingPaginationExportModel) throws IOException {
+        if (StringUtil.isEmpty(accountingPaginationExportModel.getSelectKey())){
+            return ActionResult.fail("请选择导出字段");
+        }
+        AccountingPagination accountingPagination=JsonUtil.getJsonToBean(accountingPaginationExportModel, AccountingPagination.class);
+        List<AccountingEntity> list=  accountingService.getTypeList(accountingPagination,accountingPaginationExportModel.getDataType());
+        //处理id字段转名称，若无需转或者为空可删除
+    for(AccountingEntity entity:list){
+    }
+	List<AccountingListVO> listVO=JsonUtil.getJsonToList(list,AccountingListVO.class);
+    for(AccountingListVO accountingVO:listVO){
+            }
+
+        //转换为map输出
+        List<Map<String, Object>>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss"));
+        String[]keys=!StringUtil.isEmpty(accountingPaginationExportModel.getSelectKey())?accountingPaginationExportModel.getSelectKey().split(","):new String[0];
+        UserInfo userInfo=userProvider.get();
+        DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),mapList,keys,userInfo);
+        return ActionResult.success(vo);
+    }
+    //导出表格
+    public DownloadVO creatModelExcel(String path,List<Map<String, Object>>list,String[]keys,UserInfo userInfo){
+        DownloadVO vo=DownloadVO.builder().build();
+            List<ExcelExportEntity> entitys=new ArrayList<>();
+            if(keys.length>0){
+                for(String key:keys){
+                    switch(key){
+                    case "fiscalYear" :
+                    entitys.add(new ExcelExportEntity("会计年度 2023 " ,"fiscalYear"));
+                    break;
+                    case "intervals" :
+                    entitys.add(new ExcelExportEntity("会计区间 05" ,"intervals"));
+                    break;
+                    case "startDate" :
+                    entitys.add(new ExcelExportEntity("开始日期 2023-05-01" ,"startDate"));
+                    break;
+                    case "endDate" :
+                    entitys.add(new ExcelExportEntity("结束日期 2023-05-30" ,"endDate"));
+                    break;
+                    case "status" :
+                    entitys.add(new ExcelExportEntity("0未关账 1已关账 2未核算 3已核算 4未结账 5已结账" ,"status"));
+                    break;
+            default:
+                    break;
+                    }
+                }
+            }
+
+        ExportParams exportParams = new ExportParams(null, "表单信息");
+        exportParams.setType(ExcelType.XSSF);
+        try{
+		@Cleanup Workbook workbook = new HSSFWorkbook();
+        if (entitys.size()>0){
+            workbook = ExcelExportUtil.exportExcel(exportParams, entitys, list);
+        }
+        String name = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
+
+        String fileName = configValueUtil.getTemporaryFilePath() + name;
+        @Cleanup FileOutputStream output = new FileOutputStream(XSSEscape.escapePath(fileName));
+        workbook.write(output);
+        //上传文件
+        UploadUtil.uploadFile(configValueUtil.getFileType(), fileName, FileTypeEnum.TEMPORARY, name);
+
+        vo.setName(name);
+        vo.setUrl(UploaderUtil.uploaderFile(userInfo.getId() + "#" + name + "#" + "Temporary"));
+        } catch (Exception e) {
+            log.error("信息导出Excel错误:{}", e.getMessage());
+            e.printStackTrace();
+        }
+        return vo;
+    }
+
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/batchRemove/{ids}")
+    @Transactional
+    public ActionResult batchRemove(@PathVariable("ids") String ids){
+        String[] idList = ids.split(",");
+		int i =0;
+        for (String allId : idList){
+            this.delete(allId);
+            i++;
+        }
+        if (i == 0 ){
+            return ActionResult.fail("删除失败");
+        }
+            return ActionResult.success("删除成功");
+    }
+
+
+    /**
+    * 信息
+    *
+    * @param id
+    * @return
+    */
+    @GetMapping("/{id}")
+    public ActionResult<AccountingInfoVO> info(@PathVariable("id") String id){
+        AccountingEntity entity= accountingService.getInfo(id);
+        AccountingInfoVO vo=JsonUtil.getJsonToBean(entity, AccountingInfoVO.class);
+
+    //子表
+    //副表
+        return ActionResult.success(vo);
+    }
+
+    /**
+    * 表单信息(详情页)
+    *
+    * @param id
+    * @return
+    */
+    @GetMapping("/detail/{id}")
+    public ActionResult<AccountingInfoVO> detailInfo(@PathVariable("id") String id){
+        AccountingEntity entity= accountingService.getInfo(id);
+        AccountingInfoVO vo=JsonUtil.getJsonToBean(entity, AccountingInfoVO.class);
+
+ //子表数据转换
+
+ //附表数据转换
+
+//添加到详情表单对象中
+
+        return ActionResult.success(vo);
+		}
+
+
+
+
+   /**
+    * 更新
+    *
+    * @param id
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Transactional
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid AccountingUpForm accountingUpForm) throws DataException {
+        UserInfo userInfo=userProvider.get();
+        AccountingEntity entity= accountingService.getInfo(id);
+        if(entity!=null){
+            AccountingEntity subentity=JsonUtil.getJsonToBean(accountingUpForm, AccountingEntity.class);
+            accountingService.update(id, subentity);
+        return ActionResult.success("更新成功");
+        }else{
+            return ActionResult.fail("更新失败，数据不存在");
+        }
+    }
+
+
+
+   /**
+    * 删除
+    *
+    * @param id
+    * @return
+    */
+    @DeleteMapping("/{id}")
+    @Transactional
+    public ActionResult delete(@PathVariable("id") String id){
+        AccountingEntity entity= accountingService.getInfo(id);
+        if(entity!=null){
+            accountingService.delete(entity);
+
+        }
+        return ActionResult.success("删除成功");
+    }
+
+
+
+    /**
+     * 开启
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/openstatus/{id}")
+    @Transactional
+    public ActionResult openstatus(@PathVariable("id") String id){
+        UserInfo userInfo=userProvider.get();
+        AccountingEntity entity= accountingService.getInfo(id);
+        QueryWrapper<AccountingEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(AccountingEntity::getId,entity.getId());
+        if(entity!=null){
+            entity.setStatus("1");
+            accountingService.update(id, entity);
+            return ActionResult.success("更新成功");
+        }else{
+            return ActionResult.fail("更新失败，数据不存在");
+        }
+    }
+
+    /**
+     * 关闭
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/closestatus/{id}")
+    @Transactional
+    public ActionResult closestatus(@PathVariable("id") String id){
+        UserInfo userInfo=userProvider.get();
+        AccountingEntity entity= accountingService.getInfo(id);
+        QueryWrapper<AccountingEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(AccountingEntity::getId,entity.getId());
+        if(entity!=null){
+            entity.setStatus("0");
+            accountingService.update(id, entity);
+            return ActionResult.success("更新成功");
+        }else{
+            return ActionResult.fail("更新失败，数据不存在");
+        }
+    }
+
+
+
+
+
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/accounting/entity/AccountingEntity.java

@@ -0,0 +1,78 @@
+package jnpf.accounting.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+/**
+ *
+ * 会计核算 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-06-19
+ */
+@Data
+@TableName("jg_accounting")
+public class AccountingEntity  {
+
+    @TableId("ID")
+    private String id;
+
+    @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
+    private String creatorUserId;
+
+    @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
+    private String creatorUserName;
+
+    @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
+    private Date creatorTime;
+
+    @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE)
+    private String lastModifyUserId;
+
+    @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE)
+    private String lastModifyUserName;
+
+    @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE)
+    private Date lastModifyTime;
+
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
+    private String deleteUserId;
+
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
+    private String deleteUserName;
+
+    @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
+    private Date deleteTime;
+
+    @TableField("DELETE_MARK")
+    @TableLogic
+    private String deleteMark;
+
+    @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)
+    private String orgnizeId;
+
+    @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT)
+    private String departmentId;
+
+    @TableField("FISCAL_YEAR")
+    private String fiscalYear;
+
+    @TableField("INTERVALS")
+    private String intervals;
+
+    @TableField("START_DATE")
+    private Date startDate;
+
+    @TableField("END_DATE")
+    private Date endDate;
+
+    @TableField("STATUS")
+    private String status;
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/accounting/mapper/AccountingMapper.java

@@ -0,0 +1,17 @@
+package jnpf.accounting.mapper;
+
+
+import jnpf.accounting.entity.AccountingEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * accounting
+ * 版本： V3.2.0
+ * 版权： LINKAGE-BOOT
+ * 作者： LINKAGE-BOOT研发团队
+ * 日期： 2023-06-19
+ */
+public interface AccountingMapper extends BaseMapper<AccountingEntity> {
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/accounting/model/accounting/AccountingCrForm.java

@@ -0,0 +1,53 @@
+
+
+package jnpf.accounting.model.accounting;
+
+import lombok.Data;
+
+import java.sql.Date;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-06-19
+ */
+@Data
+public class AccountingCrForm  {
+
+    /** 会计年度 2023  **/
+    @JsonProperty("fiscalYear")
+    private String fiscalYear;
+
+    /** 会计区间 05 **/
+    @JsonProperty("intervals")
+    private String intervals;
+
+    /** 开始日期 2023-05-01 **/
+    @JsonProperty("startDate")
+    private Date  startDate;
+
+    /** 结束日期 2023-05-30 **/
+    @JsonProperty("endDate")
+    private Date endDate;
+
+    /** 0未关账 1已关账 2未核算 3已核算 4未结账 5已结账 **/
+    @JsonProperty("status")
+    private String status;
+
+    /** 制单人 **/
+    @JsonProperty("creatorUserName")
+    private String creatorUserName;
+
+    /** 制单时间 **/
+    @JsonProperty("creatorTime")
+    private String creatorTime;
+
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/accounting/model/accounting/AccountingInfoVO.java

@@ -0,0 +1,48 @@
+
+
+
+package jnpf.accounting.model.accounting;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.sql.Date;
+import java.util.List;
+import java.math.BigDecimal;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-06-19
+ */
+@Data
+public class AccountingInfoVO{
+        /** 主键 **/
+        @JsonProperty("id")
+        private String id;
+
+        /** 会计年度 2023  **/
+        @JsonProperty("fiscalYear")
+        private String fiscalYear;
+
+        /** 会计区间 05 **/
+        @JsonProperty("intervals")
+        private String intervals;
+
+        /** 开始日期 2023-05-01 **/
+        @JsonProperty("startDate")
+        private Date startDate;
+
+        /** 结束日期 2023-05-30 **/
+        @JsonProperty("endDate")
+        private Date  endDate;
+
+        /** 0未关账 1已关账 2未核算 3已核算 4未结账 5已结账 **/
+        @JsonProperty("status")
+        private String status;
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/accounting/model/accounting/AccountingListQuery.java

@@ -0,0 +1,30 @@
+package jnpf.accounting.model.accounting;
+
+import lombok.Data;
+import java.util.Date;
+import jnpf.base.Pagination;
+import java.util.List;
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-06-19
+ */
+@Data
+public class AccountingListQuery extends Pagination {
+
+        /** 会计年度 2023  */
+        private String fiscalYear;
+
+        /** 会计区间 05 */
+        private String intervals;
+
+        /** 0未关账 1已关账 2未核算 3已核算 4未结账 5已结账 */
+        private String status;
+	/**
+    * 菜单id
+    */
+    private String menuId;
+}

SC-boot/linkage-scm/src/main/java/jnpf/accounting/model/accounting/AccountingListVO.java

@@ -0,0 +1,54 @@
+
+
+package jnpf.accounting.model.accounting;
+
+
+import lombok.Data;
+import java.sql.Time;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.math.BigDecimal;
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-06-19
+ */
+@Data
+public class AccountingListVO{
+
+    /** 主键 */
+    private String id;
+
+
+    /** 会计年度 2023  **/
+    @JsonProperty("fiscalYear")
+    private String fiscalYear;
+
+
+    /** 会计区间 05 **/
+    @JsonProperty("intervals")
+    private String intervals;
+
+
+    /** 开始日期 2023-05-01 **/
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonProperty("startDate")
+    private Date  startDate;
+
+
+    /** 结束日期 2023-05-30 **/
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonProperty("endDate")
+    private Date  endDate;
+
+
+    /** 0未关账 1已关账 2未核算 3已核算 4未结账 5已结账 **/
+    @JsonProperty("status")
+    private String status;
+
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/accounting/model/accounting/AccountingPagination.java

@@ -0,0 +1,31 @@
+package jnpf.accounting.model.accounting;
+
+
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-06-19
+ */
+@Data
+public class AccountingPagination extends Pagination {
+
+        /** 会计年度 2023  */
+        private String fiscalYear;
+
+        /** 会计区间 05 */
+        private String intervals;
+
+        /** 0未关账 1已关账 2未核算 3已核算 4未结账 5已结账 */
+        private String status;
+	/**
+    * 菜单id
+    */
+	private String menuId;
+}

SC-boot/linkage-scm/src/main/java/jnpf/accounting/model/accounting/AccountingPaginationExportModel.java

@@ -0,0 +1,32 @@
+package jnpf.accounting.model.accounting;
+
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.*;
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-06-19
+ */
+@Data
+public class AccountingPaginationExportModel extends Pagination {
+
+    private String selectKey;
+
+    private String json;
+
+    private String dataType;
+
+
+			/** 会计年度 2023  */
+    private String fiscalYear;
+
+			/** 会计区间 05 */
+    private String intervals;
+
+			/** 0未关账 1已关账 2未核算 3已核算 4未结账 5已结账 */
+    private String status;
+}

SC-boot/linkage-scm/src/main/java/jnpf/accounting/model/accounting/AccountingUpForm.java

@@ -0,0 +1,52 @@
+
+
+package jnpf.accounting.model.accounting;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-06-19
+ */
+@Data
+public class AccountingUpForm{
+    /** 主键 */
+    private String id;
+
+
+    /** 会计年度 2023  **/
+    @JsonProperty("fiscalYear")
+    private String fiscalYear;
+
+
+    /** 会计区间 05 **/
+    @JsonProperty("intervals")
+    private String intervals;
+
+
+    /** 开始日期 2023-05-01 **/
+    @JsonProperty("startDate")
+    private Long startDate;
+
+
+    /** 结束日期 2023-05-30 **/
+    @JsonProperty("endDate")
+    private Long endDate;
+
+
+    /** 0未关账 1已关账 2未核算 3已核算 4未结账 5已结账 **/
+    @JsonProperty("status")
+    private String status;
+
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/accounting/service/AccountingService.java

@@ -0,0 +1,34 @@
+package jnpf.accounting.service;
+
+import jnpf.accounting.entity.AccountingEntity;
+import com.baomidou.mybatisplus.extension.service.IService;
+import jnpf.accounting.model.accounting.AccountingPagination;
+import java.util.*;
+/**
+ *
+ * accounting
+ * 版本： V3.2.0
+ * 版权： LINKAGE-BOOT
+ * 作者： LINKAGE-BOOT研发团队
+ * 日期： 2023-06-19
+ */
+public interface AccountingService extends IService<AccountingEntity> {
+
+    List<AccountingEntity> getList(AccountingPagination accountingPagination);
+
+    List<AccountingEntity> getTypeList(AccountingPagination accountingPagination,String dataType);
+
+
+
+    AccountingEntity getInfo(String id);
+
+    void delete(AccountingEntity entity);
+
+    void create(AccountingEntity entity);
+
+    boolean update( String id, AccountingEntity entity);
+    
+//  子表方法
+
+    //列表子表数据方法
+}

SC-boot/linkage-scm/src/main/java/jnpf/accounting/service/impl/AccountingServiceImpl.java

@@ -0,0 +1,242 @@
+package jnpf.accounting.service.impl;
+
+import jnpf.accounting.entity.*;
+import jnpf.accounting.mapper.AccountingMapper;
+import jnpf.accounting.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.util.RandomUtil;
+import java.math.BigDecimal;
+import cn.hutool.core.util.ObjectUtil;
+import jnpf.permission.model.authorize.AuthorizeConditionModel;
+
+
+import jnpf.accounting.model.accounting.AccountingPagination;
+
+import jnpf.permission.service.AuthorizeService;
+import java.lang.reflect.Field;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.util.stream.Collectors;
+
+
+
+
+
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.text.SimpleDateFormat;
+import jnpf.util.*;
+import java.util.*;
+
+/**
+ *
+ * accounting
+ * 版本： V3.2.0
+ * 版权： LINKAGE-BOOT
+ * 作者： LINKAGE-BOOT研发团队
+ * 日期： 2023-06-19
+ */
+@Service
+public class AccountingServiceImpl extends ServiceImpl<AccountingMapper, AccountingEntity> implements AccountingService{
+
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private AuthorizeService authorizeService;
+
+
+
+
+
+    @Override
+    public List<AccountingEntity> getList(AccountingPagination accountingPagination){
+        String userId=userProvider.get().getUserId();
+        List<String> AllIdList =new ArrayList();
+        int total=0;
+		int accountingNum =0;
+        QueryWrapper<AccountingEntity> accountingQueryWrapper=new QueryWrapper<>();
+    boolean pcPermission = true;
+    boolean appPermission = true;
+    boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+    if(isPc && pcPermission){
+		if (!userProvider.get().getIsAdministrator()){
+				Object accountingObj=authorizeService.getCondition(new AuthorizeConditionModel(accountingQueryWrapper,accountingPagination.getMenuId(),"jg_accounting"));
+            if (ObjectUtil.isEmpty(accountingObj)){
+                return new ArrayList<>();
+            } else {
+                accountingQueryWrapper = (QueryWrapper<AccountingEntity>)accountingObj;
+                accountingNum++;
+            }
+        }
+    }
+    if(!isPc && appPermission){
+		if (!userProvider.get().getIsAdministrator()){
+			Object accountingObj=authorizeService.getCondition(new AuthorizeConditionModel(accountingQueryWrapper,accountingPagination.getMenuId(),"jg_accounting"));
+            if (ObjectUtil.isEmpty(accountingObj)){
+                return new ArrayList<>();
+            } else {
+            accountingQueryWrapper = (QueryWrapper<AccountingEntity>)accountingObj;
+             accountingNum++;
+			}
+
+
+		}
+    }
+			if(StringUtil.isNotEmpty(accountingPagination.getFiscalYear())){
+            accountingNum++;
+            accountingQueryWrapper.lambda().like(AccountingEntity::getFiscalYear,accountingPagination.getFiscalYear());
+                    }
+
+			if(StringUtil.isNotEmpty(accountingPagination.getIntervals())){
+            accountingNum++;
+            accountingQueryWrapper.lambda().like(AccountingEntity::getIntervals,accountingPagination.getIntervals());
+                    }
+
+			if(StringUtil.isNotEmpty(accountingPagination.getStatus())){
+            accountingNum++;
+                accountingQueryWrapper.lambda().eq(AccountingEntity::getStatus,accountingPagination.getStatus());
+                    }
+
+        if(AllIdList.size()>0){
+            accountingQueryWrapper.lambda().in(AccountingEntity::getId, AllIdList);
+        }
+        //排序
+        if(StringUtil.isEmpty(accountingPagination.getSidx())){
+        accountingQueryWrapper.lambda().orderByDesc(AccountingEntity::getCreatorTime);
+        }else{
+            try {
+                String sidx = accountingPagination.getSidx();
+                AccountingEntity accountingEntity = new AccountingEntity();
+                Field declaredField = accountingEntity.getClass().getDeclaredField(sidx);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                accountingQueryWrapper="asc".equals(accountingPagination.getSort().toLowerCase())?accountingQueryWrapper.orderByAsc(value):accountingQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+        if((total>0 && AllIdList.size()>0) || total==0){
+        Page<AccountingEntity> page=new Page<>(accountingPagination.getCurrentPage(), accountingPagination.getPageSize());
+        IPage<AccountingEntity> userIPage=this.page(page, accountingQueryWrapper);
+        return accountingPagination.setData(userIPage.getRecords(),userIPage.getTotal());
+        }else{
+            List<AccountingEntity> list = new ArrayList();
+            return accountingPagination.setData(list, list.size());
+        }
+    }
+    @Override
+    public List<AccountingEntity> getTypeList(AccountingPagination accountingPagination,String dataType){
+        String userId=userProvider.get().getUserId();
+        List<String> AllIdList =new ArrayList();
+		int total=0;
+		int accountingNum =0;
+        QueryWrapper<AccountingEntity> accountingQueryWrapper=new QueryWrapper<>();
+    boolean pcPermission = true;
+    boolean appPermission = true;
+    boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+    if(isPc && pcPermission){
+		if (!userProvider.get().getIsAdministrator()){
+				Object accountingObj=authorizeService.getCondition(new AuthorizeConditionModel(accountingQueryWrapper,accountingPagination.getMenuId(),"jg_accounting"));
+            if (ObjectUtil.isEmpty(accountingObj)){
+                return new ArrayList<>();
+            } else {
+                accountingQueryWrapper = (QueryWrapper<AccountingEntity>)accountingObj;
+                accountingNum++;
+            }
+        }
+    }
+    if(!isPc && appPermission){
+		if (!userProvider.get().getIsAdministrator()){
+			Object accountingObj=authorizeService.getCondition(new AuthorizeConditionModel(accountingQueryWrapper,accountingPagination.getMenuId(),"jg_accounting"));
+            if (ObjectUtil.isEmpty(accountingObj)){
+                return new ArrayList<>();
+            } else {
+            accountingQueryWrapper = (QueryWrapper<AccountingEntity>)accountingObj;
+             accountingNum++;
+			}
+
+
+		}
+    }
+			if(StringUtil.isNotEmpty(accountingPagination.getFiscalYear())){
+            accountingNum++;
+            accountingQueryWrapper.lambda().like(AccountingEntity::getFiscalYear,accountingPagination.getFiscalYear());
+                    }
+
+			if(StringUtil.isNotEmpty(accountingPagination.getIntervals())){
+            accountingNum++;
+            accountingQueryWrapper.lambda().like(AccountingEntity::getIntervals,accountingPagination.getIntervals());
+                    }
+
+			if(StringUtil.isNotEmpty(accountingPagination.getStatus())){
+            accountingNum++;
+                accountingQueryWrapper.lambda().eq(AccountingEntity::getStatus,accountingPagination.getStatus());
+                    }
+
+		if(AllIdList.size()>0){
+        accountingQueryWrapper.lambda().in(AccountingEntity::getId, AllIdList);
+				}
+        //排序
+        if(StringUtil.isEmpty(accountingPagination.getSidx())){
+        accountingQueryWrapper.lambda().orderByDesc(AccountingEntity::getCreatorTime);
+        }else{
+            try {
+            	String sidx = accountingPagination.getSidx();
+                AccountingEntity accountingEntity = new AccountingEntity();
+				Field declaredField = accountingEntity.getClass().getDeclaredField(sidx);
+				declaredField.setAccessible(true);
+				String value = declaredField.getAnnotation(TableField.class).value();
+                 accountingQueryWrapper="asc".equals(accountingPagination.getSort().toLowerCase())?accountingQueryWrapper.orderByAsc(value):accountingQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<AccountingEntity> page=new Page<>(accountingPagination.getCurrentPage(), accountingPagination.getPageSize());
+                IPage<AccountingEntity> userIPage=this.page(page, accountingQueryWrapper);
+                return accountingPagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<AccountingEntity> list = new ArrayList();
+                return accountingPagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(accountingQueryWrapper);
+        }
+    }
+
+    @Override
+    public AccountingEntity getInfo(String id){
+        QueryWrapper<AccountingEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(AccountingEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+
+    @Override
+    public void create(AccountingEntity entity){
+        this.save(entity);
+    }
+
+    @Override
+    public boolean update(String id, AccountingEntity entity){
+        entity.setId(id);
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(AccountingEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    //子表方法
+
+    //列表子表数据方法
+
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java

@@ -986,7 +986,7 @@ public class TradeuploadController {
                             tradeuploadService.update(id, subentity);
                             return ActionResult.success("更新成功");
                         } else if (s21 != s22) {
-                            return ActionResult.fail("提了付款申请不能修改客户");
+                            return ActionResult.fail("已生成了付款申请，则不能修改客户");
                         }
                     }
                 }

SC-boot/linkage-scm/src/main/resources/mapper/accounting/AccountingMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="jnpf.mapper.AccountingMapper">
+
+
+
+</mapper>

SC-web/src/views/scm/basicInformation/accounting/Detail.vue

@@ -0,0 +1,104 @@
+<template>
+<el-dialog title="详情"
+           :close-on-click-modal="false" append-to-body
+           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
+           width="600px">
+<el-row :gutter="15" class="">
+<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" >
+    <template v-if="!loading">
+            <el-col :span="24" >
+                <el-form-item  label="会计年度 2023 "
+ prop="fiscalYear" >
+                        <p>{{dataForm.fiscalYear}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="24" >
+                <el-form-item  label="会计区间 05"
+ prop="intervals" >
+                        <p>{{dataForm.intervals}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="24" >
+                <el-form-item  label="开始日期 2023-05-01"
+ prop="startDate" >
+                        <p>{{jnpf.dateFormat(dataForm.startDate)}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="24" >
+                <el-form-item  label="结束日期 2023-05-30"
+ prop="endDate" >
+                        <p>{{jnpf.dateFormat(dataForm.endDate)}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="24" >
+                <el-form-item  label="0未关账"
+ prop="status" >
+                         <p>{{ dataForm.status | dynamicText(statusOptions) }} </p>
+                </el-form-item>
+            </el-col>
+    </template>
+</el-form>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+        <el-button @click="visible = false"> 取 消</el-button>
+    </span>
+    </el-dialog>
+</template>
+<script>
+    import request from '@/utils/request'
+    import PrintBrowse from '@/components/PrintBrowse'
+    import jnpf from '@/utils/jnpf'
+    export default {
+        components: {PrintBrowse},
+        props: [],
+        data() {
+            return {
+                visible: false,
+                loading: false,
+                printBrowseVisible: false,
+                printId: '',
+            dataForm: {
+                id :'',
+                            fiscalYear : '',
+                            intervals : '',
+                            startDate : '',
+                            endDate : '',
+                            status : "",
+            },
+                                statusOptions:[{"fullName":" 未关账","id":" 0"},{"fullName":"已关账","id":"1"},{"fullName":"未核算","id":"2"},{"fullName":"已核算","id":"3"},{"fullName":"已核算","id":"4"},{"fullName":"已结账","id":"5"}],
+
+        }
+        },
+        computed: {},
+        watch: {},
+        created() {
+
+        },
+        mounted() {},
+        methods: {
+            dataInfo(dataAll){
+                let _dataAll =dataAll
+                this.dataForm = _dataAll
+            },
+
+            init(id) {
+                this.dataForm.id = id || 0;
+                this.visible = true;
+                this.$nextTick(() => {
+                    if(this.dataForm.id){
+                        this.loading = true
+                        request({
+                            url: '/api/example/Accounting/detail/'+this.dataForm.id,
+                            method: 'get'
+                        }).then(res => {
+                            this.dataInfo(res.data)
+                            this.loading = false
+                        })
+                    }
+
+                })
+            },
+        },
+    }
+
+</script>

SC-web/src/views/scm/basicInformation/accounting/ExportBox.vue

@@ -0,0 +1,68 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="JNPF-dialog JNPF-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.checkAll = true
+      this.isIndeterminate = false
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>

SC-web/src/views/scm/basicInformation/accounting/Form.vue

@@ -0,0 +1,253 @@
+<template>
+  <el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
+             :close-on-click-modal="false" append-to-body
+             :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
+             width="800px">
+    <el-row :gutter="15" class="">
+      <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
+        <template v-if="!loading">
+          <el-col :span="24">
+            <el-form-item label="会计年度"
+                          prop="fiscalYear">
+              <el-input v-model="dataForm.fiscalYear" @change="grossChange" :precision="6" :min="0"
+                        placeholder="请输入会计年度" clearable :style='{"width":"100%"}'>
+
+              </el-input>
+            </el-form-item>
+          </el-col>
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="会计区间"-->
+<!--                          prop="intervals">-->
+<!--              <el-input v-model="dataForm.intervals"-->
+<!--                        placeholder="请输入" clearable :style='{"width":"100%"}'>-->
+
+<!--              </el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+
+                    <el-col :span="24">
+                      <el-form-item label="会计区间"
+                                    prop="intervals">
+                        <el-select v-model="dataForm.intervals" @change="grossChange" :precision="6" :min="0"
+                                   placeholder="请选择会计区间" clearable :style='{"width":"100%"}'>
+                          <el-option v-for="(item, index) in intervalsOptions" :key="index" :label="item.fullName" :value="item.id"
+                                     :disabled="item.disabled"></el-option>
+
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+
+
+
+          <el-col :span="24">
+            <el-form-item label="开始日期"
+                          prop="startDate">
+              <el-date-picker v-model="dataForm.startDate"
+                              placeholder="请选择" readonly clearable :style='{"width":"100%"}' type="date"
+                              format="yyyy-MM-dd" value-format="timestamp">
+
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="结束日期"
+                          prop="endDate">
+              <el-date-picker v-model="dataForm.endDate"
+                              placeholder="请选择" readonly clearable :style='{"width":"100%"}' type="date"
+                              format="yyyy-MM-dd" value-format="timestamp">
+
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="0未关账"-->
+<!--                          prop="status">-->
+<!--              <el-select v-model="dataForm.status"-->
+<!--                         placeholder="请选择" clearable :style='{"width":"100%"}'>-->
+<!--                <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id"-->
+<!--                           :disabled="item.disabled"></el-option>-->
+
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+        </template>
+      </el-form>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+        <el-button @click="visible = false"> 取 消</el-button>
+        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+  import request from '@/utils/request'
+  import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
+  import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
+  var dayjs = require('dayjs')
+  export default {
+
+    components: {},
+    props: [],
+    data() {
+      return {
+        visible: false,
+        loading: false,
+        isDetail: false,
+        dataForm: {
+          fiscalYear: '',
+          intervals: '',
+          startDate: '',
+          endDate: '',
+          status: "",
+        },
+        rules:
+          {
+            fiscalYear: [
+              {
+                required: true,
+                message: '请输入会计年度',
+                trigger: 'blur'
+              },
+            ],
+            intervals: [
+              {
+                required: true,
+                message: '请输入会计期间',
+                trigger: 'blur'
+              },
+            ],
+          },
+        intervalsOptions: [
+          {"fullName": "01", "id": "01"},
+          {"fullName": "02", "id": "02"},
+          {"fullName": "03", "id": "03"},
+          {"fullName": "04", "id": "04"},
+          {"fullName": "05", "id": "05"},
+          {"fullName": "06", "id": "06"},
+          {"fullName": "07", "id": "07"},
+          {"fullName": "08", "id": "08"},
+          {"fullName": "09", "id": "09"},
+          {"fullName": "10", "id": "10"},
+          {"fullName": "11", "id": "11"},
+          {"fullName": "12", "id": "12"}
+          ],
+
+      }
+    },
+    computed: {},
+    watch: {},
+    created() {
+    },
+    mounted() {
+    },
+    methods: {
+      grossChange(e, f) {
+        var e = this.dataForm.fiscalYear +"-"+ this.dataForm.intervals + "-01" + " 22:15:01"
+        // console.log(this.dataForm.fiscalYear + "-" + this.dataForm.intervals + "-01" +" 22:15:01" )
+        // var C = dayjs(b).add(1, dataForm.intervals).subtract(1, 'year').year(dataForm.fiscalYear).toString()
+        this.dataForm.startDate=dayjs(e).startOf('month')
+        this.dataForm.endDate= dayjs(e).endOf('month')
+      },
+
+      clearData(data) {
+        for (let key in data) {
+          if (data[key] instanceof Array) {
+            data[key] = [];
+          } else if (data[key] instanceof Object) {
+            this.clearData(data[key]);
+          } else {
+            data[key] = "";
+          }
+        }
+      },
+      init(id, isDetail) {
+        this.dataForm.id = id || 0;
+        this.visible = true;
+        this.isDetail = isDetail || false;
+        this.$nextTick(() => {
+          this.$refs['elForm'].resetFields();
+          if (this.dataForm.id) {
+            this.loading = true
+            request({
+              url: '/api/example/Accounting/' + this.dataForm.id,
+              method: 'get'
+            }).then(res => {
+              this.dataInfo(res.data)
+              this.loading = false
+            });
+          } else {
+            this.clearData(this.dataForm)
+          }
+        });
+        this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+      },
+      // 表单提交
+      dataFormSubmit() {
+        var fiscalYear1 = parseInt(this.dataForm.fiscalYear);
+        let date = new Date();
+        let year = date.getFullYear();
+        let year1 =parseInt(year)+1;
+        if (fiscalYear1 <2000 || fiscalYear1 > year1 || fiscalYear1 == year1) {
+          this.$message({
+            message: '会计年度不能小于2000年和大于当前年份',
+            type: 'warning',
+            duration: 2500
+          })
+          return
+        }else {
+          this.$refs['elForm'].validate((valid) => {
+            if (valid) {
+              this.request()
+            }
+          })
+        }
+
+      },
+      request() {
+        var _data = this.dataList()
+        if (!this.dataForm.id) {
+          request({
+            url: '/api/example/Accounting',
+            method: 'post',
+            data: _data
+          }).then((res) => {
+            this.$message({
+              message: res.msg,
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refresh', true)
+              }
+            })
+          })
+        } else {
+          request({
+            url: '/api/example/Accounting/' + this.dataForm.id,
+            method: 'PUT',
+            data: _data
+          }).then((res) => {
+            this.$message({
+              message: res.msg,
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refresh', true)
+              }
+            })
+          })
+        }
+      },
+      dataList() {
+        var _data = JSON.parse(JSON.stringify(this.dataForm));
+        return _data;
+      },
+      dataInfo(dataAll) {
+        let _dataAll = dataAll
+        this.dataForm = _dataAll
+      },
+    },
+  }
+
+</script>

SC-web/src/views/scm/basicInformation/accounting/index.vue

@@ -0,0 +1,349 @@
+<template>
+  <div class="JNPF-common-layout">
+
+    <div class="JNPF-common-layout-center">
+      <el-row class="JNPF-common-search-box" :gutter="16">
+        <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="会计年度">
+              <el-input v-model="query.fiscalYear" placeholder="请输入会计年度" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="会计区间">
+              <el-input v-model="query.intervals" placeholder="请输入会计区间" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="未关账">
+              <el-select v-model="query.status" placeholder="请选择状态"
+                         clearable>
+                <el-option v-for="(item, index) in statusOptions" :key="index"
+                           :label="item.fullName" :value="item.id"
+                           :disabled="item.disabled"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div class="JNPF-common-layout-main JNPF-flex-main">
+        <div class="JNPF-common-head">
+          <div>
+            <el-button type="primary" icon="el-icon-plus" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
+            </el-button>
+            <el-button type="text" icon="el-icon-download" @click="exportData()" v-has="'btn_download'">导出
+            </el-button>
+            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" v-has="'btn_batchRemove'">批量删除
+            </el-button>
+          </div>
+          <div class="JNPF-common-head-right">
+            <el-tooltip effect="dark" content="刷新" placement="top">
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                       @click="reset()"/>
+            </el-tooltip>
+            <screenfull isContainer/>
+          </div>
+        </div>
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+                    @selection-change="handleSelectionChange"
+                    border
+                    >
+          <el-table-column prop="fiscalYear" label="会计年度" width="100px"  align="center"
+          />
+          <el-table-column prop="intervals" label="会计区间" width="0"  align="center"
+          />
+          <el-table-column prop="startDate" label="开始日期" width="0" align="center"
+          />
+          <el-table-column prop="endDate" label="结束日期" width="0" align="center"
+          />
+<!--          <el-table-column label="未关账" width="0" prop="status" algin="center">-->
+<!--            <template slot-scope="scope">-->
+<!--              {{ scope.row.status | dynamicText(statusOptions) }}-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+
+          <el-table-column label="状态" width="0" prop="status" align="center">
+
+            <template slot-scope="scope">
+              <el-tag type="success" v-if="scope.row.status == 0"
+              >未关账</el-tag
+              >
+              <el-tag type="info" v-else-if="scope.row.status == 1"
+              >已关账</el-tag
+              >
+              <el-tag type="warning" v-else-if="scope.row.status == 2"
+              >未核算</el-tag
+              >
+              <el-tag type="danger" v-else-if="scope.row.status == 3">已核算</el-tag>
+              <el-tag type="primary" v-else-if="scope.row.status == 4">未结账</el-tag>
+              <el-tag type="" v-else-if="scope.row.status == 5">已结账</el-tag>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作" fixed="right"
+                           width="150"
+                            align="center">
+            <template slot-scope="scope">
+<!--              <el-button type="text"-->
+<!--                         @click="addOrUpdateHandle(scope.row.id)" v-has="'btn_edit'">编辑-->
+<!--              </el-button>-->
+              <el-button type="text"
+                         @click="addends(scope.row.id)" v-has="'btn_ends'">关账
+              </el-button>
+              <el-button type="text"
+                         @click="addOstarts(scope.row.id)" v-has="'btn_starts'">开启
+              </el-button>
+              <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
+              </el-button>
+<!--              <el-button type="text" v-has="'btn_detail'"-->
+<!--                         @click="goDetail(scope.row.id)">详情-->
+<!--              </el-button>-->
+            </template>
+          </el-table-column>
+        </JNPF-table>
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+                    @pagination="initData"/>
+      </div>
+    </div>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
+    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+  </div>
+</template>
+
+<script>
+  import request from '@/utils/request'
+  import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
+  import JNPFForm from './Form'
+  import ExportBox from './ExportBox'
+  import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
+  import Detail from './Detail'
+
+  export default {
+    components: {JNPFForm, ExportBox, Detail},
+    data() {
+      return {
+        detailVisible: false,
+        query: {
+          fiscalYear: undefined,
+          intervals: undefined,
+          status: undefined,
+        },
+        treeProps: {
+          children: 'children',
+          label: 'fullName',
+          value: 'id'
+        },
+        list: [],
+        listLoading: true,
+        multipleSelection: [], total: 0,
+        listQuery: {
+          currentPage: 1,
+          pageSize: 20,
+          sort: "desc",
+          sidx: "creatorTime",
+        },
+        formVisible: false,
+        exportBoxVisible: false,
+        columnList: [
+          {prop: 'fiscalYear', label: '会计年度'},
+          {prop: 'intervals', label: '会计区间'},
+          {prop: 'startDate', label: '开始日期'},
+          {prop: 'endDate', label: '结束日期'},
+          {prop: 'status', label: '未关账'},
+        ],
+        statusOptions: [
+          {"fullName": "未关账", "id": "0"},
+          {"fullName": "已关账", "id": "1"},
+          {"fullName": "未核算", "id": "2"},
+          {"fullName": "已核算", "id": "3"},
+          {"fullName": "已核算", "id": "4"},
+          {"fullName": "已结账", "id": "5"}],
+        statusProps: {"label": "fullName", "value": "id"},
+      }
+    },
+    computed: {
+      menuId() {
+        return this.$route.meta.modelId || ''
+      }
+    },
+    created() {
+      this.initData()
+    },
+    methods: {
+      goDetail(id) {
+        this.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(id)
+        })
+      },
+      sortChange({column, prop, order}) {
+        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+        this.listQuery.sidx = !order ? '' : prop
+        this.initData()
+      },
+      initData() {
+        this.listLoading = true;
+        let _query = {
+          ...this.listQuery,
+          ...this.query,
+          menuId: this.menuId
+        };
+        request({
+          url: `/api/example/Accounting/getList`,
+          method: 'post',
+          data: _query
+        }).then(res => {
+          var _list = [];
+          for (let i = 0; i < res.data.list.length; i++) {
+            let _data = res.data.list[i];
+            _list.push(_data)
+          }
+          this.list = _list
+          this.total = res.data.pagination.total
+
+          this.listLoading = false
+        })
+      },
+      handleDel(id) {
+        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/example/Accounting/${id}`,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
+                this.initData()
+              }
+            });
+          })
+        }).catch(() => {
+        });
+      },
+      addends(id) {
+        this.$confirm('此操作将关账, 是否继续?', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/example/Accounting/closestatus/${id}`,
+            method: 'Post'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
+                this.initData()
+              }
+            });
+          })
+        }).catch(() => {
+        });
+      },
+      addOstarts(id) {
+        this.$confirm('此操作将开启, 是否继续?', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/example/Accounting/openstatus/${id}`,
+            method: 'Post'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
+                this.initData()
+              }
+            });
+          })
+        }).catch(() => {
+        });
+      },
+      handleSelectionChange(val) {
+        const res = val.map(item => item.id)
+        this.multipleSelection = res
+      },
+      handleBatchRemoveDel() {
+        if (!this.multipleSelection.length) {
+          this.$message({
+            type: 'error',
+            message: '请选择一条数据',
+            duration: 1500,
+          })
+          return
+        }
+        const ids = this.multipleSelection.join()
+        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/example/Accounting/batchRemove/${ids}`,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
+                this.initData()
+              }
+            });
+          })
+        }).catch(() => {
+        })
+      },
+      addOrUpdateHandle(id, isDetail) {
+        this.formVisible = true
+        this.$nextTick(() => {
+          this.$refs.JNPFForm.init(id, isDetail)
+        })
+      },
+      exportData() {
+        this.exportBoxVisible = true
+        this.$nextTick(() => {
+          this.$refs.ExportBox.init(this.columnList)
+        })
+      },
+      download(data) {
+        let query = {...data, ...this.listQuery, ...this.query, menuId: this.menuId}
+        request({
+          url: `/api/example/Accounting/Actions/Export`,
+          method: 'GET',
+          data: query
+        }).then(res => {
+          if (!res.data.url) return
+          this.jnpf.downloadFile(res.data.url)
+          this.$refs.ExportBox.visible = false
+          this.exportBoxVisible = false
+        })
+      },
+      search() {
+        this.listQuery = {
+          currentPage: 1,
+          pageSize: 20,
+          sort: "desc",
+          sidx: "creatorTime",
+        }
+        this.initData()
+      },
+      refresh(isrRefresh) {
+        this.formVisible = false
+        if (isrRefresh) this.reset()
+      },
+      reset() {
+        for (let key in this.query) {
+          this.query[key] = undefined
+        }
+        this.search()
+      }
+    }
+  }
+</script>