diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java index 6e663cf50..1ba513ce4 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java @@ -6,7 +6,9 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.cert.report.entity.ParamsReportEO; +import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO; import com.jero.modules.cert.report.service.IParamsReportEOService; +import com.jero.modules.cert.report.service.IParamsReportExportHistoryEOService; import com.jero.modules.system.util.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -35,6 +37,9 @@ import java.util.List; public class ParamsReportEOController extends JeroController { @Autowired private IParamsReportEOService paramsReportEOService; + + @Autowired + private IParamsReportExportHistoryEOService paramsReportExportHistoryEOService; /** * 分页列表查询 @@ -66,6 +71,37 @@ public class ParamsReportEOController extends JeroController exportHistoryPage(ParamsReportExportHistoryEO paramsReportExportHistoryEO, + @RequestParam(name="cut") String cut, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + if (StringUtils.isNotEmpty(paramsReportExportHistoryEO.getProjectName())) { + paramsReportExportHistoryEO.setProjectName(paramsReportExportHistoryEO.getProjectName().replace("%", "\\%")); + } + + if (StringUtils.isNotEmpty(paramsReportExportHistoryEO.getTitle())) { + paramsReportExportHistoryEO.setTitle(paramsReportExportHistoryEO.getTitle().replace("%", "\\%")); + } + + IPage page = new Page(pageNo, pageSize); + IPage pageList = paramsReportExportHistoryEOService.queryPage(page, paramsReportExportHistoryEO, cut); + return Result.OK(pageList); + } + + + diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java new file mode 100644 index 000000000..67a91a94f --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java @@ -0,0 +1,98 @@ +package com.jero.modules.cert.report.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 上报库导出历史 + * @Author: jero-boot + * @Date: 2022-07-04 + * @Version: V1.0 + */ +@Data +@TableName("params_report_export_history") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="params_report_export_history对象", description="上报库导出历史") +public class ParamsReportExportHistoryEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**上报库id*/ + @Excel(name = "上报库id", width = 15) + @ApiModelProperty(value = "上报库id") + private String paramsManifestId; + + /**导出类型*/ + @Excel(name = "导出类型", width = 15) + @ApiModelProperty(value = "导出类型") + private String exportType; + + /**导出时间*/ + @Excel(name = "导出时间", width = 15, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "导出时间") + private java.util.Date exportTime; + + /**导出文件id*/ + @Excel(name = "导出文件id", width = 15) + @ApiModelProperty(value = "导出文件id") + private String exportFileId; + + @TableField(exist = false) + @ApiModelProperty(value = "导出文件名称") + private String exportFileName; + + @TableField(exist = false) + @ApiModelProperty(value = "项目名称") + private String projectName; + + @TableField(exist = false) + @ApiModelProperty(value = "清单标题") + private String title; +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java new file mode 100644 index 000000000..6a4782be3 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java @@ -0,0 +1,59 @@ +package com.jero.modules.cert.report.enums; + +import com.jero.common.constant.enums.CutEnum; + +import java.util.HashMap; +import java.util.Map; + +public enum ExportTypeEnum { + NORMAL("常规导出","1","Normal export"), + CUSTOM("自定义导出","2","Custom export"); + + String name; + String value; + String enName; + + ExportTypeEnum(String name, String value, String enName) { + this.name = name; + this.value = value; + this.enName = enName; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public static Map toMap(String cut){ + Map map = new HashMap<>(); + if (CutEnum.CN.getValue().equals(cut)) { + for (ExportTypeEnum exportTypeEnum : ExportTypeEnum.values()) { + map.put(exportTypeEnum.getValue(), exportTypeEnum.getName()); + } + } else if (CutEnum.EN.getValue().equals(cut)) { + for (ExportTypeEnum exportTypeEnum : ExportTypeEnum.values()) { + map.put(exportTypeEnum.getValue(), exportTypeEnum.getEnName()); + } + } + return map; + } +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java new file mode 100644 index 000000000..0cf024066 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java @@ -0,0 +1,19 @@ +package com.jero.modules.cert.report.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 上报库导出历史 + * @Author: jero-boot + * @Date: 2022-07-04 + * @Version: V1.0 + */ +public interface ParamsReportExportHistoryEOMapper extends BaseMapper { + + IPage pageInfo(@Param("page") IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO); +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml new file mode 100644 index 000000000..8451ceabe --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + preh.id as id, + preh.export_type as export_type, + preh.export_time as export_time, + preh.export_file_id as export_file_id, + preh.params_manifest_id as params_manifest_id, + pr.create_by as create_by, + pr.create_time as create_time, + pr.update_by as update_by, + pr.update_time as update_time, + pm.title as title, + concat(pni.project_name,'-',pyni.year_name) as project_name + + + + + + + AND project_name LIKE CONCAT(CONCAT('%',#{paramsReportExportHistoryEO.projectName}),'%') + + + AND title LIKE CONCAT(CONCAT('%',#{paramsReportExportHistoryEO.title}),'%') + + + AND params_manifest_id = #{paramsReportExportHistoryEO.paramsManifestId} + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java new file mode 100644 index 000000000..c69874c9c --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java @@ -0,0 +1,64 @@ +package com.jero.modules.cert.report.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 上报库导出历史 + * @Author: jero-boot + * @Date: 2022-07-04 + * @Version: V1.0 + */ +public interface IParamsReportExportHistoryEOService extends IService { + + /** + * 保存 + * + * @param paramsReportExportHistoryEO + * @return + */ + void add(ParamsReportExportHistoryEO paramsReportExportHistoryEO); + + /** + * 更新 + * + * @param paramsReportExportHistoryEO + * @return + */ + void editById(ParamsReportExportHistoryEO paramsReportExportHistoryEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ParamsReportExportHistoryEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + IPage queryPage(IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO, String cut); +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 7a88644e6..d610dc012 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -21,10 +21,13 @@ import com.jero.modules.cert.collect.vo.ParamsConfigDataVO; import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO; import com.jero.modules.cert.report.entity.ParamsReportConfigEO; import com.jero.modules.cert.report.entity.ParamsReportDetailEO; +import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO; +import com.jero.modules.cert.report.enums.ExportTypeEnum; import com.jero.modules.cert.report.mapper.ParamsReportDetailEOMapper; import com.jero.modules.cert.report.service.IParamsReportConfigDataEOService; import com.jero.modules.cert.report.service.IParamsReportConfigEOService; import com.jero.modules.cert.report.service.IParamsReportDetailEOService; +import com.jero.modules.cert.report.service.IParamsReportExportHistoryEOService; import com.jero.modules.cert.report.vo.ParamsReportDetailVO; import com.jero.modules.cert.template.enums.ControlTypeEnum; import com.jero.modules.document.enums.FieldTypeEnum; @@ -43,6 +46,7 @@ import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.ISysDictItemService; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.http.entity.ContentType; import org.apache.poi.common.usermodel.HyperlinkType; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.hssf.util.HSSFColor; @@ -54,7 +58,9 @@ import org.apache.poi.xssf.usermodel.*; import org.aspectj.util.FileUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.mock.web.MockMultipartFile; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -93,6 +99,9 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl implements IParamsReportExportHistoryEOService { + + @Autowired + private ParamsReportExportHistoryEOMapper paramsReportExportHistoryEOMapper; + + @Autowired + private IOSSFileService ossFileService; + /** + * 保存 + * + * @param paramsReportExportHistoryEO + * @return + */ + @Override + public void add(ParamsReportExportHistoryEO paramsReportExportHistoryEO) { + Date now = new Date(); + paramsReportExportHistoryEO.setCreateTime(now); + paramsReportExportHistoryEO.setUpdateTime(now); + save(paramsReportExportHistoryEO); + } + + /** + * 更新 + * + * @param paramsReportExportHistoryEO + * @return + */ + @Override + public void editById(ParamsReportExportHistoryEO paramsReportExportHistoryEO) { + Date now = new Date(); + paramsReportExportHistoryEO.setUpdateTime(now); + saveOrUpdate(paramsReportExportHistoryEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ParamsReportExportHistoryEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + @Override + public IPage queryPage(IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO, String cut) { + IPage pageInfo = paramsReportExportHistoryEOMapper.pageInfo(page, paramsReportExportHistoryEO); + List list = pageInfo.getRecords(); + + Map exportTypeMap = ExportTypeEnum.toMap(cut); + list.forEach(exportHistoryEO -> { + // 处理文件名 + OSSFile ossFile = ossFileService.getById(exportHistoryEO.getExportFileId()); + if (ObjectUtil.isNotEmpty(ossFile)) { + exportHistoryEO.setExportFileName(ossFile.getFileName()); + } + + // 处理导出类型 + exportHistoryEO.setExportType(exportTypeMap.get(exportHistoryEO.getExportType())); + }); + + return pageInfo; + } +} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index 6786e76ff..df73c3ae6 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java @@ -203,6 +203,9 @@ public class OSSFileServiceImpl extends ServiceImpl impl OSSFile oSSFile = new OSSFile(); String ctxPath = uploadCospath; + if (org.apache.commons.lang.StringUtils.isNotBlank(bizPath)) { + ctxPath += bizPath; + } String fileName = null; String fileType = null; @@ -227,7 +230,17 @@ public class OSSFileServiceImpl extends ServiceImpl impl throw new JeroBootException("Only upload pdf,word,excel type of file Please select the file again！"); } } - } else { + } else if ("2".equals(state)) { + String fileTypeStrTwo = ".doc,.DOC,.docx,.DOCX,.xls, .XLS,.xlsx,.XLSX"; + //固定文件 + if (!fileTypeStrTwo.contains(fileType)) { + if (cut.equals(CutEnum.CN.getValue())) { + throw new JeroBootException("只能够上传word,excel类型的文件。请重新选择文件！"); + } else { + throw new JeroBootException("Only upload word,excel type of file Please select the file again！"); + } + } + } else { if (CommonUtils.limitFileSuffix(orgName, fileSuffixLimits)) { if (cut.equals(CutEnum.CN.getValue())) { throw new JeroBootException("不能上传" + StringUtils.join(fileSuffixLimits, ",") + "类型的文件。请重新选择文件！"); diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 973899589..2bf1259d2 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -176,6 +176,8 @@ module.exports = { MenuType: 'Menu type', menu: 'Menu', ButtonsPermissions: 'Buttons / permissions', + ConventionalExport:'Conventional export', + CustomExport:'Custom export', assembly: 'Assembly', route: 'Route', AddSubmenu: 'Add submenu', @@ -385,6 +387,7 @@ module.exports = { StandardDetails: 'Standard Details', whole: 'Whole', DocumentLibrary: 'Document Library', + GeneralExportInformation:'General export information', DocumentComparisonLibrary: 'Document comparison Library', weekly: 'Weekly', SyncLibrary: 'Sync to doc. library', @@ -727,6 +730,7 @@ module.exports = { // 参数收集开始 MaintainConfigureInfo: 'Maintain configuration information', ParameteItemCollectionList: 'Parameter item collection list', + ParameterViewPage:'Parameter View page', Areyousureparameteritems: 'Are you sure to submit the selected parameter items?', Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed', NoConfigurationNotStart: 'No configuration added, unable to start collection, please check', @@ -792,6 +796,10 @@ module.exports = { releaseVersion: 'Release Version', parameterTemplate: 'Parameter Template', contentDescription: 'Content Description', + WhetherMergeParameters:'Whether to merge parameters', + merge:'merge', + nonjoinder:'nonjoinder', + MergeSeparator:'Merge separator', parameterTemplateExportName: 'Parameter List', parameterDataExport: 'Parameter Export Data', // 参数收集结束 @@ -1075,4 +1083,7 @@ module.exports = { TheEngineerAndCertification:'The regulatory engineer and Certification Engineer of cannot be empty', bringInTheProjectInterface:'Bring in the project interface', theCurrentListSaved:'The current list data has been submitted and cannot be temporarily saved', + defaultTemplate:'Default template', + newRequestCommentListTemplate:'New request for comment list template', + NewReleasedStandardTemplate:'New released standard template', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 2aba9452a..3b9a2e3c0 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -178,6 +178,8 @@ module.exports = { MenuType: '菜单类型', menu: '菜单', ButtonsPermissions: '按钮/权限', + ConventionalExport:'常规导出', + CustomExport:'自定义导出', assembly: '组件', route: '路径', AddSubmenu: '添加子菜单', @@ -390,6 +392,7 @@ module.exports = { StandardDetails: '标准详情', whole: '全部', DocumentLibrary: '文档库', + GeneralExportInformation:'常规导出信息', DocumentComparisonLibrary: '文档对比库', weekly: '周报', SyncLibrary: '同步至文档库', @@ -742,6 +745,7 @@ module.exports = { // 参数收集 MaintainConfigureInfo: '维护配置信息', ParameteItemCollectionList: '参数项收集清单', + ParameterViewPage:'参数项查看页', Areyousureparameteritems: '确认提交所选参数项嘛?', Theselectedconfiguration: '参数清单中参数项均为待发起收集或变更时，才能添加配置', NoConfigurationNotStart: '未添加任何配置，无法开始收集，请检查', @@ -807,6 +811,10 @@ module.exports = { releaseVersion: '发布版本', parameterTemplate: '参数模板', contentDescription: '内容说明', + WhetherMergeParameters:'是否合并参数', + merge:'合并', + nonjoinder:'不合并', + MergeSeparator:'合并分隔符', parameterTemplateExportName: '参数项列表', parameterDataExport: '参数项导出数据', // 参数收集结束 @@ -1079,4 +1087,7 @@ module.exports = { requiredParametersEmpty:'必填参数不能为空', bringInTheProjectInterface:'带入工程接口人', theCurrentListSaved:'当前列表数据已全部提交，无法进行暂存', + defaultTemplate:'默认模板', + newRequestCommentListTemplate:'新征求意见清单模板', + NewReleasedStandardTemplate:'新发布标准模板', } \ No newline at end of file diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue index 7d6973111..8a81c237e 100644 --- a/jero-web/src/components/AssignedBy/index.vue +++ b/jero-web/src/components/AssignedBy/index.vue @@ -49,6 +49,7 @@ show-size-changer :page-size.sync="pageSize" :total="total" + :current="pageNo" @change="pageOnChange" @showSizeChange="SizeChange" /> diff --git a/jero-web/src/components/OcrTable/DocTable.vue b/jero-web/src/components/OcrTable/DocTable.vue index 0e7685e2a..f58b83b24 100644 --- a/jero-web/src/components/OcrTable/DocTable.vue +++ b/jero-web/src/components/OcrTable/DocTable.vue @@ -52,6 +52,7 @@ show-size-changer :page-size.sync="pageSize" :total="total" + :current="pageNo" @change="onChange" @showSizeChange="SizeChange" /> diff --git a/jero-web/src/components/OcrTable/index.vue b/jero-web/src/components/OcrTable/index.vue index b9dac4c21..eca906c74 100644 --- a/jero-web/src/components/OcrTable/index.vue +++ b/jero-web/src/components/OcrTable/index.vue @@ -53,6 +53,7 @@ show-size-changer :page-size.sync="pageSize" :total="total" + :current="pageNo" @change="onChange" @showSizeChange="SizeChange" /> diff --git a/jero-web/src/components/SplitDetailTable/index.vue b/jero-web/src/components/SplitDetailTable/index.vue index 8fb036ea0..930453350 100644 --- a/jero-web/src/components/SplitDetailTable/index.vue +++ b/jero-web/src/components/SplitDetailTable/index.vue @@ -51,6 +51,7 @@ show-size-changer :page-size.sync="pageSize" :total="total" + :current="pageNo" @change="onChange" @showSizeChange="SizeChange" /> diff --git a/jero-web/src/components/SplitTable/DocTable.vue b/jero-web/src/components/SplitTable/DocTable.vue index 2ca67b39a..dc12b047b 100644 --- a/jero-web/src/components/SplitTable/DocTable.vue +++ b/jero-web/src/components/SplitTable/DocTable.vue @@ -48,6 +48,7 @@ show-size-changer :page-size.sync="pageSize" :total="total" + :current="pageNo" @change="onChange" @showSizeChange="SizeChange" /> diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue index d017dad75..10b6a4a38 100644 --- a/jero-web/src/components/SplitTable/index.vue +++ b/jero-web/src/components/SplitTable/index.vue @@ -53,6 +53,7 @@ show-size-changer :page-size.sync="pageSize" :total="total" + :current="pageNo" @change="onChange" @showSizeChange="SizeChange" /> diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue index a6c0273bf..2c5c7b703 100644 --- a/jero-web/src/components/Standardselection/index.vue +++ b/jero-web/src/components/Standardselection/index.vue @@ -42,6 +42,7 @@ show-size-changer :page-size.sync="pageSize" :total="total" + :current="pageNo" @change="onChange" @showSizeChange="SizeChange" /> diff --git a/jero-web/src/components/UpdateLog/index.vue b/jero-web/src/components/UpdateLog/index.vue index 2035ca5a8..70f8b1380 100644 --- a/jero-web/src/components/UpdateLog/index.vue +++ b/jero-web/src/components/UpdateLog/index.vue @@ -36,6 +36,7 @@ show-size-changer :page-size.sync="pageSize " :total="total" + :current="pageNo" @change="onChange" @showSizeChange="SizeChange" /> diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue index 2b0eb4638..db26b4bd1 100644 --- a/jero-web/src/components/exporthistory/index.vue +++ b/jero-web/src/components/exporthistory/index.vue @@ -21,7 +21,7 @@ + v-model='formData.title' /> @@ -54,6 +54,7 @@ show-size-changer :page-size.sync="pageSize" :total="total" + :current="pageNo" @change="pageOnChange" @showSizeChange="SizeChange" /> @@ -178,10 +179,11 @@ export default { console.log(this.areaTable,'this.areaTable') this.listVisible = false }, + // 下载文件 editArea(val) { - this.listVisibleRowDate = val + // this.listVisibleRowDate = val console.log(val) - this.listVisible = true + // this.listVisible = true }, pageOnChange(page, pageSize) { this.pageNo = page diff --git a/jero-web/src/components/frameAssembly/index.vue b/jero-web/src/components/frameAssembly/index.vue index b98fb558f..5f1ba686d 100644 --- a/jero-web/src/components/frameAssembly/index.vue +++ b/jero-web/src/components/frameAssembly/index.vue @@ -65,6 +65,7 @@ show-size-changer :page-size.sync="pageSize" :total="total" + :current="pageNo" @change="onChange" @showSizeChange="SizeChange" /> diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index c655dfdc0..d4e712fbe 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -53,6 +53,7 @@ show-size-changer :page-size.sync="pageSize" :total="total" + :current="pageNo" :pageSizeOptions='pageSizeOptions' @change="pageOnChange" @showSizeChange="SizeChange" diff --git a/jero-web/src/components/tableDate/index.vue b/jero-web/src/components/tableDate/index.vue index 7069ad28c..8234abf2b 100644 --- a/jero-web/src/components/tableDate/index.vue +++ b/jero-web/src/components/tableDate/index.vue @@ -51,6 +51,7 @@ show-size-changer :page-size.sync="pageSize" :total="total" + :current="pageNo" @change="onChange" @showSizeChange="SizeChange" /> diff --git a/jero-web/src/components/uploadFileChange/file.vue b/jero-web/src/components/uploadFileChange/file.vue index f07c8a165..5b7c3c846 100644 --- a/jero-web/src/components/uploadFileChange/file.vue +++ b/jero-web/src/components/uploadFileChange/file.vue @@ -2,7 +2,7 @@
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index 45a26c812..9d54df13b 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -84,6 +84,7 @@ show-size-changer :page-size.sync="pageSize" :total="total" + :current="pageNo" @change="pageOnChange" @showSizeChange="SizeChange" /> diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index c57c1a2da..d4942d910 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -65,6 +65,7 @@ show-size-changer :page-size.sync="pageSize" :total="total" + :current="pageNo" @change="pageOnChange" @showSizeChange="SizeChange" /> @@ -90,7 +91,8 @@ return { //url传参严格按照当前命名 url: { - deleteBatch: '' + deleteBatch: '/report/lawsMonthlyReportWriteEO/deleteBatch', + list:'/report/lawsMonthlyReportWriteEO/page', }, loading: false, dataSource: [], @@ -103,7 +105,7 @@ { title: this.$t('chapterContents'), align: 'center', - dataIndex: 'chapterContents', + dataIndex: 'memoriesChapterName', width: 170 }, { @@ -124,21 +126,21 @@ align: 'center', width: 170, ellipsis: true, - dataIndex: 'regulatoryContact' + dataIndex: 'lawsContact' }, { title: this.$t('completedBy'), align: 'center', ellipsis: true, width: 170, - dataIndex: 'completedBy' + dataIndex: 'createBy' }, { title: this.$t('exportStatus'), align: 'center', ellipsis: true, width: 170, - dataIndex: 'exportStatus' + dataIndex: 'exportStateName' }, { title: this.$t('operation'), @@ -183,7 +185,26 @@ this.getList() }, getList() { - + let query = { + pageNo: this.pageNo, + pageSize: this.pageSize, + ...this.queryParam + } + this.loading = true + getAction(this.url.list, query).then((res) => { + if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = res.result.current - 1 + this.getList() + return + } + this.dataSource = res.result.records || [] + this.total = res.result.total + this.loading = false + } else { + this.loading = false + } + }) }, monthlyTitleTemplateClick() { this.$refs.fillTableRef.getData() diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue index 8ffbdf0be..e92a7a565 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue @@ -62,6 +62,7 @@ show-size-changer :page-size.sync="pageSize" :total="total" + :current="pageNo" @change="pageOnChange" @showSizeChange="SizeChange" /> diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index 1fb8577ec..80632e53a 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -7,10 +7,10 @@ {{$t('title')}}
- + @@ -21,10 +21,10 @@ {{$t('englishTitle')}} - + @@ -59,7 +59,7 @@ :title="$t('vehicleType')">{{$t('vehicleType')}} - @@ -75,7 +75,7 @@ :title="$t('scopeOfApplication')">{{$t('scopeOfApplication')}} - @@ -89,7 +89,7 @@ :title="$t('status')">{{$t('status')}} - {{$t('usage')}} - + :triggerChange="false" :dictCode="'yong4_fa3'"/> @@ -120,10 +120,10 @@ {{$t('implementationModel')}} - + @@ -136,10 +136,10 @@ {{$t('releaseDate')}} - + @@ -150,10 +150,10 @@ {{$t('ImplementationDate')}} - + @@ -166,10 +166,10 @@ {{$t('vehicleInProductionDate')}} - + @@ -181,10 +181,10 @@
{{$t('primaryCoverageCn')}}
- + + v-model.trim="formInline.contentCn" :rows="4"/> @@ -195,10 +195,10 @@
{{$t('primaryCoverageEn')}}
- + + v-model.trim="formInline.contentEn" :rows="4"/> @@ -209,10 +209,10 @@
{{$t('workProgressCn')}}
- + + v-model.trim="formInline.workProgressCn" :rows="4"/> @@ -223,10 +223,10 @@
{{$t('workProgressEn')}}
- + + v-model.trim="formInline.workProgressEn" :rows="4"/> @@ -238,10 +238,11 @@ {{$t('regulatoryContact')}} - + @@ -252,7 +253,7 @@
{{$t('link')}}
- + + + + \ No newline at end of file diff --git a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue new file mode 100644 index 000000000..9496747a7 --- /dev/null +++ b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue @@ -0,0 +1,358 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 6b6852905..d3b785d6e 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -4,7 +4,7 @@
- {{ $t('ParameteItemCollectionList') }} + {{ $t('ParameterViewPage') }}
@@ -12,6 +12,17 @@
+ +
+
+ {{$t('certificationCategory')}} +
+ +
+
@@ -30,35 +41,24 @@ v-model="formInline.paramsName">
- -
-
- {{$t('certificationCategory')}} -
- -
- - -
-
- {{$t('areaOfResponsibility')}} -
- -
-
{{$t('completedBy')}}
- + +
+ + +
+
+ {{$t('engineeringInterfacePerson')}} +
+
@@ -71,6 +71,16 @@
+
+
+ + {{$t('ConventionalExport')}} +
+
+ + {{$t('CustomExport')}} +
+
+ +