Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

2022-07-04 16:28:48 +08:00
parent e8b98d0d90 64fc7d95d8
commit 26c370b3cd
63 changed files with 919 additions and 128 deletions
@@ -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<ParamsReportEO, IParamsReportEOService> {
 	@Autowired
 	private IParamsReportEOService paramsReportEOService;
+
+	@Autowired
+	private IParamsReportExportHistoryEOService paramsReportExportHistoryEOService;
 	
 	/**
 	 * 分页列表查询
@@ -66,6 +71,37 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
 		return Result.OK(pageList);
 	}

+	/**
+	 * 分页列表查询
+	 *
+	 * @param paramsReportExportHistoryEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	@AutoLog(value = "上报库-导出历史分页查询")
+	@ApiOperation(value="上报库-导出历史分页查询", notes="上报库-导出历史分页查询")
+	@GetMapping(value = "/exportHistoryPage")
+//	@RequiresPermissions("params:report:history")
+	public Result<?> 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);
+	}
+
+
+



@@ -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;
+}
@@ -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<String,String> toMap(String cut){
+        Map<String,String> 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;
+    }
+}
@@ -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<ParamsReportExportHistoryEO> {
+
+    IPage pageInfo(@Param("page") IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO);
+}
@@ -0,0 +1,60 @@
+<?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="com.jero.modules.cert.report.mapper.ParamsReportExportHistoryEOMapper">
+    <resultMap id="ParamsReportExportHistoryEOResultMap" type="com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="params_manifest_id" property="paramsManifestId" />
+        <result column="export_type" property="exportType" />
+        <result column="export_time" property="exportTime" />
+        <result column="export_file_id" property="exportFileId" />
+    </resultMap>
+
+    <sql id="BaseColumnList">
+        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
+    </sql>
+
+    <sql id="BaseQuerySql">
+        <where>
+            <if test="paramsReportExportHistoryEO != null">
+                <if test="paramsReportExportHistoryEO.projectName !=null and paramsReportExportHistoryEO.projectName !=''">
+                    AND project_name LIKE CONCAT(CONCAT('%',#{paramsReportExportHistoryEO.projectName}),'%')
+                </if>
+                <if test="paramsReportExportHistoryEO.title !=null and paramsReportExportHistoryEO.title !=''">
+                    AND title LIKE CONCAT(CONCAT('%',#{paramsReportExportHistoryEO.title}),'%')
+                </if>
+                <if test="paramsReportExportHistoryEO.paramsManifestId !=null and paramsReportExportHistoryEO.paramsManifestId !=''">
+                    AND params_manifest_id = #{paramsReportExportHistoryEO.paramsManifestId}
+                </if>
+            </if>
+        </where>
+    </sql>
+
+    <select id="pageInfo" resultMap="ParamsReportExportHistoryEOResultMap">
+        select tmp_tb.* from(
+        select <include refid="BaseColumnList"/>
+        from params_report_export_history preh
+        left join params_report as pr on pr.id = preh.params_manifest_id
+        left join params_manifest as pm on pm.id = pr.old_params_manifest_id
+        left join project_library_base as plb on plb.id = pm.project_id
+        left join project_name_info as pni on plb.project_name_id = pni.id
+        left join project_year_name_info as pyni on plb.year_name_id = pyni.id
+        ) tmp_tb
+        <include refid="BaseQuerySql"/>
+        order by export_time desc
+    </select>
+</mapper>
@@ -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<ParamsReportExportHistoryEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @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<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ParamsReportExportHistoryEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ParamsReportExportHistoryEO> queryList();
+
+	IPage queryPage(IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO, String cut);
+}
@@ -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<ParamsReportDet
 	@Autowired
 	private IOSSFileService ossFileService;

+	@Autowired
+	private IParamsReportExportHistoryEOService paramsReportExportHistoryEOService;
+
 	@Value(value = "${jero.path.upload}")
 	private String uploadpath;

@@ -486,7 +495,10 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 		OutputStream excelOS = null;
 		XSSFWorkbook workbook = new XSSFWorkbook();
 		String fileOriName = "上报库参数项常规导出信息";
-		if (org.apache.commons.lang.StringUtils.isNotEmpty(paramsReportDetailVO.getExportName())) {
+		if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) {
+			fileOriName = "Params report normal data";
+		}
+		if (StringUtils.isNotEmpty(paramsReportDetailVO.getExportName())) {
 			fileOriName = paramsReportDetailVO.getExportName();
 		}
 		//创建临时文件夹
@@ -584,6 +596,18 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 			while ((len = fis.read()) != -1) {
 				os.write(len);
 			}
+
+			// 添加导出历史
+			String uploadFileName = fileOriName + ".zip";
+			MultipartFile mFile = new MockMultipartFile(uploadFileName, uploadFileName, ContentType.APPLICATION_OCTET_STREAM.toString(), fis); // 用于上传
+			OSSFile ossFile = ossFileService.uploadLocalOfCos(mFile, "/report", "", CutEnum.CN.getValue()); // 上传导出的压缩包
+			ParamsReportExportHistoryEO paramsReportExportHistoryEO = new ParamsReportExportHistoryEO();
+			paramsReportExportHistoryEO.setExportType(ExportTypeEnum.NORMAL.getValue());
+			paramsReportExportHistoryEO.setExportFileId(ossFile.getId());
+			paramsReportExportHistoryEO.setParamsManifestId(paramsReportDetailVO.getParamsManifestId());
+			paramsReportExportHistoryEO.setExportTime(new Date());
+			paramsReportExportHistoryEOService.add(paramsReportExportHistoryEO);
+
 			os.flush();
 			os.close(); // 后开先关
 			fis.close(); // 先开后关
@@ -0,0 +1,122 @@
+package com.jero.modules.cert.report.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
+import com.jero.modules.cert.report.enums.ExportTypeEnum;
+import com.jero.modules.cert.report.mapper.ParamsReportExportHistoryEOMapper;
+import com.jero.modules.cert.report.service.IParamsReportExportHistoryEOService;
+import com.jero.modules.oss.entity.OSSFile;
+import com.jero.modules.oss.service.IOSSFileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 上报库导出历史
+ * @Author: jero-boot
+ * @Date:   2022-07-04
+ * @Version: V1.0
+ */
+@Service
+public class ParamsReportExportHistoryEOServiceImpl extends ServiceImpl<ParamsReportExportHistoryEOMapper, ParamsReportExportHistoryEO> 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<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public ParamsReportExportHistoryEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<ParamsReportExportHistoryEO> queryList() {
+        return list();
+    }
+
+	@Override
+	public IPage queryPage(IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO, String cut) {
+		IPage pageInfo = paramsReportExportHistoryEOMapper.pageInfo(page, paramsReportExportHistoryEO);
+		List<ParamsReportExportHistoryEO> list = pageInfo.getRecords();
+
+		Map<String, String> 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;
+	}
+}
@@ -203,6 +203,9 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> 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<OSSFileMapper, OSSFile> 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, ",") + "类型的文件。请重新选择文件！");
@@ -1083,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',
 }
@@ -1087,4 +1087,7 @@ module.exports = {
  requiredParametersEmpty:'必填参数不能为空',
  bringInTheProjectInterface:'带入工程接口人',
  theCurrentListSaved:'当前列表数据已全部提交，无法进行暂存',
+  defaultTemplate:'默认模板',
+  newRequestCommentListTemplate:'新征求意见清单模板',
+  NewReleasedStandardTemplate:'新发布标准模板',
 }
@@ -49,6 +49,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="pageOnChange"
        @showSizeChange="SizeChange"
      />
@@ -52,6 +52,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="onChange"
        @showSizeChange="SizeChange"
      />
@@ -53,6 +53,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="onChange"
        @showSizeChange="SizeChange"
      />
@@ -51,6 +51,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="onChange"
        @showSizeChange="SizeChange"
      />
@@ -48,6 +48,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="onChange"
        @showSizeChange="SizeChange"
      />
@@ -53,6 +53,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="onChange"
        @showSizeChange="SizeChange"
      />
@@ -42,6 +42,7 @@
            show-size-changer
            :page-size.sync="pageSize"
            :total="total"
+            :current="pageNo"
            @change="onChange"
            @showSizeChange="SizeChange"
          />
@@ -36,6 +36,7 @@
        show-size-changer
        :page-size.sync="pageSize "
        :total="total"
+        :current="pageNo"
        @change="onChange"
        @showSizeChange="SizeChange"
      />
@@ -54,6 +54,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="pageOnChange"
        @showSizeChange="SizeChange"
      />
@@ -65,6 +65,7 @@
          show-size-changer
          :page-size.sync="pageSize"
          :total="total"
+          :current="pageNo"
          @change="onChange"
          @showSizeChange="SizeChange"
        />
@@ -53,6 +53,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        :pageSizeOptions='pageSizeOptions'
        @change="pageOnChange"
        @showSizeChange="SizeChange"
@@ -51,6 +51,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="onChange"
        @showSizeChange="SizeChange"
      />
@@ -29,6 +29,7 @@
            show-size-changer
            :page-size.sync="pageSize"
            :total="total"
+            :current="pageNo"
            @change="pageOnChange"
            @showSizeChange="SizeChange"
          />
@@ -84,6 +84,7 @@
          show-size-changer
          :page-size.sync="pageSize"
          :total="total"
+          :current="pageNo"
          @change="pageOnChange"
          @showSizeChange="SizeChange"
        />
@@ -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()
@@ -62,6 +62,7 @@
          show-size-changer
          :page-size.sync="pageSize"
          :total="total"
+          :current="pageNo"
          @change="pageOnChange"
          @showSizeChange="SizeChange"
        />
@@ -7,10 +7,10 @@
              <span class="title-text-text"
                    :title="$t('title')">{{$t('title')}}</span>
          </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="titleCn">
            <a-input class="box-input"
                     :disabled="false"
-                     v-model="formInline.title"
+                     v-model="formInline.titleCn"
                     :placeholder="$t('PleaseEnter')+$t('title')"/>
          </a-form-model-item>
        </div>
@@ -21,10 +21,10 @@
              <span class="title-text-text"
                    :title="$t('englishTitle')">{{$t('englishTitle')}}</span>
          </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="titleEn">
            <a-input class="box-input"
                     :disabled="false"
-                     v-model="formInline.englishTitle"
+                     v-model="formInline.titleEn"
                     :placeholder="$t('PleaseEnter')+$t('englishTitle')"/>
          </a-form-model-item>
        </div>
@@ -59,7 +59,7 @@
                    :title="$t('vehicleType')">{{$t('vehicleType')}}</span>
          </div>
          <a-form-model-item class="itemModel-multi">
-            <j-multi-select-tag class="box-input" v-model="formInline.vehicleType"
+            <j-multi-select-tag class="box-input" v-model="formInline.applyCar"
                                :placeholder="$t('PleaseSelect')+$t('vehicleType')"
                                :type="'select'"
                                :triggerChange="false" :dictCode="'car_type'"/>
@@ -75,7 +75,7 @@
                      :title="$t('scopeOfApplication')">{{$t('scopeOfApplication')}}</span>
          </div>
          <a-form-model-item class="itemModel-multi">
-            <j-multi-select-tag class="box-input" v-model="formInline.shi4_yong4_fan4_wei2"
+            <j-multi-select-tag class="box-input" v-model="formInline.applyScope"
                                :placeholder="$t('PleaseSelect')+$t('scopeOfApplication')"
                                :type="'select'"
                                :triggerChange="false" :dictCode="'apply_scope'"/>
@@ -89,7 +89,7 @@
                    :title="$t('status')">{{$t('status')}}</span>
          </div>
          <a-form-model-item class="itemModel">
-            <j-dict-select-tag class="box-input" v-model="formInline.status"
+            <j-dict-select-tag class="box-input" v-model="formInline.state"
                               @input="handleInput('status')"
                               :placeholder="$t('PleaseSelect')+$t('status')"
                               :type="'select'"
@@ -106,11 +106,11 @@
                    :title="$t('usage')">{{$t('usage')}}</span>
          </div>
          <a-form-model-item class="itemModel">
-            <j-dict-select-tag class="box-input" v-model="formInline.usage"
+            <j-dict-select-tag class="box-input" v-model="formInline.useMethod"
                               @input="handleInput('usage')"
                               :placeholder="$t('PleaseSelect')+$t('usage')"
                               :type="'select'"
-                               :triggerChange="false" :dictCode="'usage'"/>
+                               :triggerChange="false" :dictCode="'yong4_fa3'"/>
          </a-form-model-item>
        </div>
      </a-col>
@@ -120,10 +120,10 @@
                <span class="title-text-text"
                      :title="$t('implementationModel')">{{$t('implementationModel')}}</span>
          </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="implementCar">
            <a-input class="box-input"
                     :disabled="disabled"
-                     v-model="formInline.implementationModel"
+                     v-model="formInline.implementCar"
                     :placeholder="$t('PleaseEnter')+$t('implementationModel')"/>
          </a-form-model-item>
        </div>
@@ -136,10 +136,10 @@
                <span class="title-text-text"
                      :title="$t('releaseDate')">{{$t('releaseDate')}}</span>
          </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="issueTime">
            <a-input class="box-input"
                     :disabled="disabled"
-                     v-model="formInline.releaseDate"
+                     v-model="formInline.issueTime"
                     :placeholder="$t('PleaseEnter')+$t('releaseDate')"/>
          </a-form-model-item>
        </div>
@@ -150,10 +150,10 @@
                <span class="title-text-text"
                      :title="$t('ImplementationDate')">{{$t('ImplementationDate')}}</span>
          </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="newCarImplementTime">
            <a-input class="box-input"
                     :disabled="disabled"
-                     v-model="formInline.ImplementationDate"
+                     v-model="formInline.newCarImplementTime"
                     :placeholder="$t('PleaseEnter')+$t('ImplementationDate')"/>
          </a-form-model-item>
        </div>
@@ -166,10 +166,10 @@
                <span class="title-text-text"
                      :title="$t('vehicleInProductionDate')">{{$t('vehicleInProductionDate')}}</span>
          </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="productionCarImplementTime">
            <a-input class="box-input"
                     :disabled="disabled"
-                     v-model="formInline.vehicleInProductionDate"
+                     v-model="formInline.productionCarImplementTime"
                     :placeholder="$t('PleaseEnter')+$t('vehicleInProductionDate')"/>
          </a-form-model-item>
        </div>
@@ -181,10 +181,10 @@
          <div class="title-text">
            <span class="title-text-text" :title="$t('primaryCoverageCn')">{{$t('primaryCoverageCn')}}</span>
          </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="contentCn">
            <a-textarea
              :placeholder="$t('PleaseEnter')+$t('primaryCoverageCn')"
-              v-model.trim="formInline.useExplain" :rows="4"/>
+              v-model.trim="formInline.contentCn" :rows="4"/>
          </a-form-model-item>
        </div>
      </a-col>
@@ -195,10 +195,10 @@
          <div class="title-text">
            <span class="title-text-text" :title="$t('primaryCoverageEn')">{{$t('primaryCoverageEn')}}</span>
          </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="contentEn">
            <a-textarea
              :placeholder="$t('PleaseEnter')+$t('primaryCoverageEn')"
-              v-model.trim="formInline.useExplain" :rows="4"/>
+              v-model.trim="formInline.contentEn" :rows="4"/>
          </a-form-model-item>
        </div>
      </a-col>
@@ -209,10 +209,10 @@
          <div class="title-text">
            <span class="title-text-text" :title="$t('workProgressCn')">{{$t('workProgressCn')}}</span>
          </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="workProgressCn">
            <a-textarea
              :placeholder="$t('PleaseEnter')+$t('workProgressCn')"
-              v-model.trim="formInline.useExplain" :rows="4"/>
+              v-model.trim="formInline.workProgressCn" :rows="4"/>
          </a-form-model-item>
        </div>
      </a-col>
@@ -223,10 +223,10 @@
          <div class="title-text">
            <span class="title-text-text" :title="$t('workProgressEn')">{{$t('workProgressEn')}}</span>
          </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="workProgressEn">
            <a-textarea
              :placeholder="$t('PleaseEnter')+$t('workProgressEn')"
-              v-model.trim="formInline.useExplain" :rows="4"/>
+              v-model.trim="formInline.workProgressEn" :rows="4"/>
          </a-form-model-item>
        </div>
      </a-col>
@@ -238,10 +238,11 @@
            <span class="title-text-text" :title="$t('regulatoryContact')">{{$t('regulatoryContact')}}</span>
          </div>
          <a-form-model-item class="itemModel">
-            <a-input class="box-input"
-                     :disabled="false"
-                     v-model="formInline.regulatoryContact"
-                     :placeholder="$t('PleaseEnter')+$t('regulatoryContact')"/>
+            <PersonnelSelection
+              :query="{db_field_name:'lawsContact',db_field_txt:$t('regulatoryContact')}"
+              :personneQuery="formInline"
+              @change="PersonnelSelectionChange"
+              v-model="formInline.lawsContactName"/>
          </a-form-model-item>
        </div>
      </a-col>
@@ -252,7 +253,7 @@
          <div class="title-text">
            <span class="title-text-text" :title="$t('link')">{{$t('link')}}</span>
          </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="link">
            <a-input class="box-input"
                     :disabled="false"
                     v-model="formInline.link"
@@ -265,32 +266,93 @@
 </template>

 <script>
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import { mapGetters } from 'vuex'
+  import { getAction, postAction, downloadFile } from '@/api/manage'
+
  export default {
    name: 'defaultTemplate',
+    props: ['formInlineQuery'],
+    components: {
+      PersonnelSelection
+    },
    data() {
      return {
        rules: {
-          name: [
-            {
-              required: true,
-              message: this.$t('VirtualListName') + this.$t('cannotEmpty'),
-              trigger: 'blur'
-            },
+          titleCn: [
            {
              max: 100,
-              message: this.$t('VirtualListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              message: this.$t('title') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
              trigger: 'blur'
            }
          ],
-          useExplain: [
+          titleEn: [
            {
-              required: true,
-              message: this.$t('instructionForUse') + this.$t('cannotEmpty'),
+              max: 100,
+              message: this.$t('englishTitle') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
              trigger: 'blur'
-            },
+            }
+          ],
+          productionCarImplementTime: [
            {
-              max: 500,
-              message: this.$t('instructionForUse') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+              max: 100,
+              message: this.$t('vehicleInProductionDate') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          newCarImplementTime: [
+            {
+              max: 100,
+              message: this.$t('ImplementationDate') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          issueTime: [
+            {
+              max: 100,
+              message: this.$t('releaseDate') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          implementCar: [
+            {
+              max: 100,
+              message: this.$t('implementationModel') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          link: [
+            {
+              max: 100,
+              message: this.$t('link') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          workProgressEn: [
+            {
+              max: 300,
+              message: this.$t('workProgressEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          workProgressCn: [
+            {
+              max: 300,
+              message: this.$t('workProgressEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          contentEn: [
+            {
+              max: 300,
+              message: this.$t('primaryCoverageEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          contentCn: [
+            {
+              max: 300,
+              message: this.$t('primaryCoverageCn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
              trigger: 'blur'
            }
          ]
@@ -301,14 +363,55 @@
      }
    },
    mounted() {
-
+      this.getSysCategoryTree()
+      this.$nextTick(() => {
+        if (this.formInlineQuery.id) {
+          this.formInline = JSON.parse(JSON.stringify(this.formInlineQuery))
+          if(this.formInline.technologyTerritory){
+            this.formInline.technologyTerritory = this.formInline.technologyTerritory.split(',')
+          }
+          this.formInline = { ...this.formInline }
+        } else {
+          this.formInline = {}
+          this.formInline.lawsContactName = this.userInfo().username
+          this.formInline.lawsContact = this.userInfo().id
+          this.formInline = { ...this.formInline }
+        }
+      })
    },
    methods: {
+      ...mapGetters(['userInfo']),
+      getSysCategoryTree() {
+        getAction('/sys/category/getSysCategoryTree', {}).then((res) => {
+          if (res.success) {
+            this.CategoryTreeList = res.result
+          } else {
+            this.CategoryTreeList = []
+          }
+        })
+      },
      handleInput(value) {
        this.$nextTick(() => {
          this.formInline = { ...this.formInline }
          this.$refs.ruleForm.validateField([value])
        })
+      },
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
+      getData(callback) {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            let formInline = JSON.parse(JSON.stringify(this.formInline))
+            Object.keys(formInline).forEach(res => {
+              if (formInline[res] && formInline[res] instanceof Array) {
+                formInline[res] = formInline[res].join(',')
+              }
+            })
+            callback && callback(formInline)
+          }
+        })
      }
    }
  }
@@ -15,12 +15,13 @@
            <a-col :span="12">
              <div class="box-title-text">
                <div class="title-text">
-              <span class="title-text-text"
-                    :title="$t('fillInTheMonth')">{{$t('fillInTheMonth')}}</span>
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('fillInTheMonth')">{{$t('fillInTheMonth')}}</span>
                </div>
-                <a-form-model-item class="itemModel">
+                <a-form-model-item class="itemModel" prop="month">
                  <a-month-picker class="box-input"
-                                  v-model="formInline.fillInTheMonth"
+                                  v-model="formInline.month"
                                  :placeholder="$t('fillInTheMonth')"/>
                </a-form-model-item>
              </div>
@@ -35,34 +36,33 @@
            <a-col :span="12">
              <div class="box-title-text">
                <div class="title-text">
-              <span class="title-text-text"
-                    :title="$t('chapterContents')">{{$t('chapterContents')}}</span>
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('chapterContents')">{{$t('chapterContents')}}</span>
                </div>
-                <a-form-model-item class="itemModel">
-                  <a-select :placeholder="$t('PleaseSelect')+$t('chapterContents')"
-                            :disabled="disabled"
-                            class="box-input"
-                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                            allowClear
-                            v-model="formInline.chapterContents">
-                    <a-select-option v-for="(item, key) in chapterContentsList"
-                                     :key="key"
-                                     :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name ">
-                           {{ item.name }}
-                     </span>
-                    </a-select-option>
-                  </a-select>
+                <a-form-model-item class="itemModel-multi" prop="memoriesChapter">
+                  <a-tree-select
+                    tree-node-filter-prop="title"
+                    v-model="formInline.memoriesChapter"
+                    :maxTagCount="1"
+                    :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                    class="box-input"
+                    style="width: 100%"
+                    :tree-data="chapterContentsList"
+                    tree-checkable
+                    :placeholder="$t('PleaseSelect')+$t('chapterContents')"
+                  />
                </a-form-model-item>
              </div>
            </a-col>
            <a-col :span="12">
              <div class="box-title-text">
                <div class="title-text">
-              <span class="title-text-text"
-                    :title="$t('contentTemplate')">{{$t('contentTemplate')}}</span>
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('contentTemplate')">{{$t('contentTemplate')}}</span>
                </div>
-                <a-form-model-item class="itemModel">
+                <a-form-model-item class="itemModel" prop="contentTemplate">
                  <a-select :placeholder="$t('PleaseSelect')+$t('contentTemplate')"
                            :disabled="disabled"
                            class="box-input"
@@ -81,9 +81,12 @@
              </div>
            </a-col>
          </a-row>
-          <defaultTemplate v-if="formInline.contentTemplate == 1"/>
-          <solicitOpinions v-else-if="formInline.contentTemplate == 2"/>
-          <releaseStandard v-else-if="formInline.contentTemplate == 3"/>
+          <defaultTemplate :formInlineQuery="formInline" ref="defaultTemplateRef"
+                           v-if="formInline.contentTemplate == '1'"/>
+          <solicitOpinions :formInlineQuery="formInline " ref="solicitOpinionsRef"
+                           v-else-if="formInline.contentTemplate == '2'"/>
+          <releaseStandard :formInlineQuery="formInline" ref="releaseStandardRef"
+                           v-else-if="formInline.contentTemplate == '3'"/>
        </a-form-model>
      </a-spin>
      <div class="drawer-bootom-button">
@@ -98,6 +101,7 @@
  import defaultTemplate from './defaultTemplate'
  import solicitOpinions from './solicitOpinions'
  import releaseStandard from './releaseStandard'
+  import { getAction, postAction, downloadFile } from '@/api/manage'

  export default {
    name: 'fillAdd',
@@ -109,28 +113,25 @@
    data() {
      return {
        rules: {
-          name: [
+          month: [
            {
              required: true,
-              message: this.$t('VirtualListName') + this.$t('cannotEmpty'),
-              trigger: 'blur'
-            },
-            {
-              max: 100,
-              message: this.$t('VirtualListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
-              trigger: 'blur'
+              message: this.$t('fillInTheMonth') + this.$t('cannotEmpty'),
+              trigger: 'change'
            }
          ],
-          useExplain: [
+          memoriesChapter: [
            {
              required: true,
-              message: this.$t('instructionForUse') + this.$t('cannotEmpty'),
-              trigger: 'blur'
-            },
+              message: this.$t('chapterContents') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          contentTemplate: [
            {
-              max: 500,
-              message: this.$t('instructionForUse') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
-              trigger: 'blur'
+              required: true,
+              message: this.$t('contentTemplate') + this.$t('cannotEmpty'),
+              trigger: 'change'
            }
          ]
        },
@@ -142,40 +143,66 @@
        chapterContentsList: [],
        contentTemplateList: [
          {
-            id: 1,
-            text: '默认模板'
+            id: '1',
+            text: this.$t('defaultTemplate')
          },
          {
-            id: 2,
-            text: '新征求意见清单模板'
+            id: '2',
+            text: this.$t('newRequestCommentListTemplate')
          },
          {
-            id: 3,
-            text: '新发布标准模板'
+            id: '3',
+            text: this.$t('NewReleasedStandardTemplate')
          }
-        ]
+        ],
+        url: {
+          add: '/report/lawsMonthlyReportWriteEO/add',
+          edit: '/report/lawsMonthlyReportWriteEO/edit',
+          queryById: '/report/lawsMonthlyReportWriteEO/queryById'
+        }
      }
    },
    mounted() {
    },
    methods: {
+      getTree() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: 1000
+        }
+        getAction('/report/lawsMonthlyReportTitleTemplateEO/page', query).then((res) => {
+          if (res.success) {
+            this.chapterContentsList = res.result.records || []
+            this.chapterContentsList.forEach(res => {
+
+            })
+          } else {
+            this.chapterContentsList = []
+          }
+        })
+      },
      add() {
+        this.getTree()
        this.title = this.$t('addContent')
        this.visible = true
        this.disabled = false
        this.$nextTick(() => {
          this.formInline = {}
-          this.formInline.contentTemplate = 1
+          this.formInline.contentTemplate = '1'
          this.formInline = { ...this.formInline }
          this.$refs.ruleForm.clearValidate()
        })
      },
      edit(row) {
+        this.getTree()
        this.title = this.$t('editContent')
        this.visible = true
        this.disabled = false
        this.$nextTick(() => {
          this.formInline = row
+          if (this.formInline.memoriesChapter) {
+            this.formInline.memoriesChapter = this.formInline.memoriesChapter.split(',')
+          }
          this.$refs.ruleForm.clearValidate()
        })
      },
@@ -192,7 +219,50 @@
        this.visible = false
      },
      handleSubmit() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            let text = ''
+            if (this.$refs.defaultTemplateRef) {
+              text = 'defaultTemplateRef'
+            } else if (this.$refs.solicitOpinionsRef) {
+              text = 'solicitOpinionsRef'
+            } else if (this.$refs.releaseStandardRef) {
+              text = 'releaseStandardRef'
+            }
+            this.$refs[text].getData((val) => {
+              this.confirmLoading = true
+              let url = ''
+              if (this.formInline.id) {
+                url = this.url.edit
+              } else {
+                url = this.url.add
+              }
+              let formInline = JSON.parse(JSON.stringify(this.formInline))
+              Object.keys(formInline).forEach(res => {
+                if (formInline[res] && formInline[res] instanceof Array) {
+                  formInline[res] = formInline[res].join(',')
+                }
+              })
+              let query = Object.assign(val, {
+                month: formInline.month,
+                memoriesChapter: formInline.memoriesChapter,
+                contentTemplate: formInline.contentTemplate
+              })

+              postAction(url, query).then((res) => {
+                if (res.success) {
+                  this.$message.success(this.$t('OperationSuccessful'))
+                  this.visible = false
+                  this.confirmLoading = false
+                  this.$emit('fillTableAddForm')
+                } else {
+                  this.confirmLoading = false
+                  this.$message.warning(this.$t('operationFailed'))
+                }
+              })
+            })
+          }
+        })
      }
    }
  }
@@ -42,6 +42,7 @@
          show-size-changer
          :page-size.sync="pageSize "
          :total="total"
+          :current="pageNo"
          @change="onChange"
          @showSizeChange="SizeChange"
        />
@@ -53,8 +53,8 @@
                  <a-select-option v-for="(item, key) in ParentList"
                                   :key="item.id"
                                   :value="item.id">
-                     <span style="display: inline-block;width: 100%" :title="item.title ">
-                           {{ item.title }}
+                     <span style="display: inline-block;width: 100%" :title="item.titleCn ">
+                           {{ item.titleCn }}
                     </span>
                  </a-select-option>
                </a-select>
@@ -21,7 +21,7 @@
            <a-form-model-item class="itemModel" prop="standardNo">
              <a-input class="box-input"
                       :disabled="false"
-                       v-model="formInline.standardNo"
+                       v-model="formInline.standardNumber"
                       :placeholder="$t('PleaseEnter')+$t('standardNo')"/>
            </a-form-model-item>
          </div>
@@ -63,10 +63,10 @@
            <a-form-model-item class="itemModel">
              <a-date-picker class="box-input"
                             :placeholder="$t('PleaseSelect')+$t('releaseDate')"
-                             @change="dateChange('releaseDate')"
+                             @change="dateChange('issueTime',index)"
                             :getCalendarContainer="(trigger) => trigger.parentNode"
                             format="YYYY-MM-DD"
-                             v-model="formInline['releaseDate']"
+                             v-model="formInline['issueTime']"
                             :disabled="disabled"
                             style="width: 100%"/>
            </a-form-model-item>
@@ -82,10 +82,10 @@
            <a-form-model-item class="itemModel">
              <a-date-picker class="box-input"
                             :placeholder="$t('PleaseSelect')+$t('implemenDate')"
-                             @change="dateChange('implemenDate')"
+                             @change="dateChange('implementTime',index)"
                             :getCalendarContainer="(trigger) => trigger.parentNode"
                             format="YYYY-MM-DD"
-                             v-model="formInline['implemenDate']"
+                             v-model="formInline['implementTime']"
                             :disabled="disabled"
                             style="width: 100%"/>
            </a-form-model-item>
@@ -101,19 +101,34 @@

  export default {
    name: 'releaseStandard',
+    props:['formInlineQuery'],
    data() {
      return {
        rules: {},
        formInline: {},
        CategoryTreeList: [],
        disabled: false,
-        dataList: [
-          { id: 1 }
-        ]
+        dataList: []
      }
    },
    mounted() {
-
+      this.$nextTick(() => {
+        if (this.formInlineQuery.id) {
+          this.formInline = JSON.parse(JSON.stringify(this.formInlineQuery))
+          this.formInline = { ...this.formInline }
+        } else {
+          this.dataList = [
+            {
+              standardNumber: '',
+              standardNameCn: '',
+              standardNameEn: '',
+              issueTime: '',
+              implementTime:'',
+            }
+          ]
+          this.dataList = [...this.dataList]
+        }
+      })
    },
    methods: {
      handleInput(value) {
@@ -124,7 +139,11 @@
      },
      addData() {
        this.dataList.push({
-          id: 2
+          standardNumber: '',
+          standardNameCn: '',
+          standardNameEn: '',
+          issueTime: '',
+          implementTime:'',
        })
        this.dataList = [...this.dataList]
      },
@@ -132,8 +151,15 @@
        this.dataList.pop()
        this.dataList = [...this.dataList]
      },
-      dateChange(item) {
-        this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
+      dateChange(item,index) {
+        this.dataList[index][item] = this.dataList[index][item] ? moment(this.dataList[index][item]).format('YYYY-MM-DD') : ''
+      },
+      getData(callback) {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            callback && callback(this.formInline)
+          }
+        })
      }
    }
  }
@@ -21,7 +21,7 @@
            <a-form-model-item class="itemModel" prop="planNoChinese">
              <a-input class="box-input"
                       :disabled="false"
-                       v-model="formInline.planNoChinese"
+                       v-model="item.planNumberCn"
                       :placeholder="$t('PleaseEnter')+$t('planNoChinese')"/>
            </a-form-model-item>
          </div>
@@ -35,7 +35,7 @@
            <a-form-model-item class="itemModel" prop="standardNameCn">
              <a-input class="box-input"
                       :disabled="false"
-                       v-model="formInline.standardNameCn"
+                       v-model="item.standardNameCn"
                       :placeholder="$t('PleaseEnter')+$t('standardNameCn')"/>
            </a-form-model-item>
          </div>
@@ -50,7 +50,7 @@
            <a-form-model-item class="itemModel">
              <a-input class="box-input"
                       :disabled="false"
-                       v-model="formInline.standardNameEn"
+                       v-model="item.standardNameEn"
                       :placeholder="$t('PleaseEnter')+$t('standardNameEn')"/>
            </a-form-model-item>
          </div>
@@ -63,10 +63,10 @@
            <a-form-model-item class="itemModel">
              <a-date-picker class="box-input"
                             :placeholder="$t('PleaseSelect')+$t('deadlineForComments')"
-                             @change="dateChange('deadlineForComments')"
+                             @change="dateChange('expirationDate',index)"
                             :getCalendarContainer="(trigger) => trigger.parentNode"
                             format="YYYY-MM-DD"
-                             v-model="formInline['deadlineForComments']"
+                             v-model="item['expirationDate']"
                             :disabled="disabled"
                             style="width: 100%"/>
            </a-form-model-item>
@@ -82,19 +82,33 @@

  export default {
    name: 'solicitOpinions',
+    props: ['formInlineQuery'],
    data() {
      return {
        rules: {},
        formInline: {},
        CategoryTreeList: [],
        disabled: false,
-        dataList: [
-          { id: 1 }
-        ]
+        dataList: []
      }
    },
    mounted() {
-
+      this.$nextTick(() => {
+        if (this.formInlineQuery.id) {
+          this.formInline = JSON.parse(JSON.stringify(this.formInlineQuery))
+          this.formInline = { ...this.formInline }
+        } else {
+          this.dataList = [
+            {
+              planNumberCn: '',
+              standardNameCn: '',
+              standardNameEn: '',
+              expirationDate: ''
+            }
+          ]
+          this.dataList = [...this.dataList]
+        }
+      })
    },
    methods: {
      handleInput(value) {
@@ -105,7 +119,10 @@
      },
      addData() {
        this.dataList.push({
-          id: 2
+          planNumberCn: '',
+          standardNameCn: '',
+          standardNameEn: '',
+          expirationDate: ''
        })
        this.dataList = [...this.dataList]
      },
@@ -113,8 +130,15 @@
        this.dataList.pop()
        this.dataList = [...this.dataList]
      },
-      dateChange(item) {
-        this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
+      dateChange(item, index) {
+        this.dataList[index][item] = this.dataList[index][item] ? moment(this.dataList[index][item]).format('YYYY-MM-DD') : ''
+      },
+      getData(callback) {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            callback && callback(this.formInline)
+          }
+        })
      }
    }
  }
@@ -193,6 +193,7 @@
          show-size-changer
          :page-size.sync="pageSize "
          :total="total"
+          :current="pageNo"
          @change="onChange"
          @showSizeChange="SizeChange"
        />
@@ -88,6 +88,7 @@
        show-size-changer
        :page-size.sync="queryParams.pageSize"
        :total="total"
+        :current="pageNo"
        @change="onChangePage"
        @showSizeChange="SizeChange"
      />
@@ -200,6 +200,7 @@
              show-size-changer
              :page-size.sync="pageSize"
              :total="total"
+              :current="pageNo"
              @change="pageOnChange"
              @showSizeChange="SizeChange"
            />
@@ -80,6 +80,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="pageOnChange"
        @showSizeChange="SizeChange"
      />
@@ -73,6 +73,7 @@
          show-size-changer
          :page-size.sync="pageSize"
          :total="total"
+          :current="pageNo"
          @change="onChange"
          @showSizeChange="SizeChange"
        />
@@ -96,6 +96,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="pageOnChange"
        @showSizeChange="SizeChange"
      />
@@ -79,6 +79,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="pageOnChange"
        @showSizeChange="SizeChange"
      />
@@ -60,6 +60,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="pageOnChange"
        @showSizeChange="SizeChange"
      />
@@ -109,6 +109,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="pageOnChange"
        @showSizeChange="SizeChange"
      />
@@ -59,6 +59,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="pageOnChange"
        @showSizeChange="SizeChange"
      />
@@ -96,6 +96,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="pageOnChange"
        @showSizeChange="SizeChange"
      />
@@ -271,6 +271,7 @@
          show-quick-jumper
          :page-size.sync="pageSize"
          :total="total"
+          :current="pageNo"
          @change="pageOnChange"
        />
      </div>
@@ -33,6 +33,7 @@
          show-size-changer
          :page-size.sync="pageSize"
          :total="total"
+          :current="pageNo"
          @change="onChange"
          @showSizeChange="SizeChange"
        />
@@ -28,6 +28,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="onChange"
        @showSizeChange="SizeChange"
      />
@@ -28,6 +28,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="onChange"
        @showSizeChange="SizeChange"
      />
@@ -28,6 +28,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="onChange"
        @showSizeChange="SizeChange"
      />
@@ -25,6 +25,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="onChange"
        @showSizeChange="SizeChange"
      />
@@ -23,6 +23,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="onChange"
        @showSizeChange="SizeChange"
      />
@@ -78,6 +78,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="pageOnChange"
        @showSizeChange="SizeChange"
      />
@@ -44,6 +44,7 @@
            show-size-changer
            :page-size.sync="pageSize"
            :total="total"
+            :current="pageNo"
            @change="onChange"
            @showSizeChange="SizeChange"
          />
@@ -70,6 +70,7 @@
          show-size-changer
          :page-size.sync="pageSize"
          :total="total"
+          :current="pageNo"
          @change="onChange"
          @showSizeChange="SizeChange"
        />
@@ -73,6 +73,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="pageOnChange"
        @showSizeChange="SizeChange"
      />
@@ -47,6 +47,7 @@
          show-size-changer
          :page-size.sync="pageSize"
          :total="total"
+          :current="pageNo"
          @change="onChange"
          @showSizeChange="SizeChange"
        />
@@ -54,6 +54,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="pageOnChange"
        @showSizeChange="SizeChange"
      />
@@ -103,6 +103,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="pageOnChange"
        @showSizeChange="SizeChange"
      />
@@ -67,6 +67,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="pageOnChange"
        @showSizeChange="SizeChange"
      />
@@ -144,6 +144,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="pageOnChange"
        @showSizeChange="SizeChange"
      />
@@ -173,6 +173,7 @@
        show-size-changer
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="pageOnChange"
        @showSizeChange="SizeChange"
      />
@@ -43,6 +43,7 @@
          show-size-changer
          :page-size.sync="pageSize"
          :total="total"
+          :current="pageNo"
          @change="pageOnChange"
          @showSizeChange="SizeChange"
        />
@@ -91,6 +91,7 @@
        :show-total="total => $t('total')+` ${total} `+$t('strip')"
        :page-size.sync="pageSize"
        :total="total"
+        :current="pageNo"
        @change="pageOnChange"
        @showSizeChange="SizeChange"
      />