国家申请

src/main/java/com/izouma/uwip/domain/CountryPatent.java

@@ -1,5 +1,7 @@
 package com.izouma.uwip.domain;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.izouma.uwip.dto.CountryPatentDTO;
 import com.izouma.uwip.enums.ApplyRoute;
 import com.izouma.uwip.enums.CountryWorkflow;
 import io.swagger.annotations.ApiModel;
@@ -9,23 +11,24 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
+import javax.persistence.*;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 
 @AllArgsConstructor
 @Data
 @Builder
-//@Entity
+@Entity
 @NoArgsConstructor
 @ApiModel(value = "国家申请")
 public class CountryPatent extends BaseEntity {
 
+    private Long patentId;
+
     @ApiModelProperty(value = "流程")
     private CountryWorkflow workflow;
 
+    @ApiModelProperty(value = "进入国家")
     private String country;
 
     @Enumerated(EnumType.STRING)
@@ -87,4 +90,12 @@ public class CountryPatent extends BaseEntity {
     @ApiModelProperty(value = "办登缴费期限")
     private LocalDate registerPayPeriod;
 
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "patentId", insertable = false, updatable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+    private Patent patent;
+
+    public CountryPatent(CountryPatentDTO dto) {
+        BeanUtil.copyProperties(dto, this);
+    }
+
 }

src/main/java/com/izouma/uwip/domain/InternationalPatent.java

@@ -9,7 +9,6 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import java.math.BigDecimal;

src/main/java/com/izouma/uwip/dto/CountryPatentDTO.java

@@ -0,0 +1,174 @@
+package com.izouma.uwip.dto;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.izouma.uwip.domain.CountryPatent;
+import com.izouma.uwip.domain.Handle;
+import com.izouma.uwip.domain.Patent;
+import com.izouma.uwip.enums.ApplyRoute;
+import com.izouma.uwip.enums.ApplyStatus;
+import com.izouma.uwip.enums.CountryWorkflow;
+import com.izouma.uwip.enums.PatentType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+@AllArgsConstructor
+@Data
+@Builder
+@NoArgsConstructor
+@ApiModel(value = "国家申请")
+public class CountryPatentDTO {
+    private Long cid;
+
+    private Long patentId;
+
+    @ApiModelProperty(value = "流程")
+    private CountryWorkflow workflow;
+
+    private String country;
+
+    @ApiModelProperty(value = "申请途径")
+    private ApplyRoute applyRoute;
+
+    /*
+    选择pct时必填
+    */
+    @ApiModelProperty(value = "pct申请号")
+    private String pctApplyNo;
+
+    @ApiModelProperty(value = "pct申请日")
+    private String pctApplyDate;
+
+    @ApiModelProperty(value = "pct公开号")
+    private String pctPublicNo;
+
+    @ApiModelProperty(value = "pct公开日")
+    private String pctPublicDate;
+
+    @ApiModelProperty(value = "授权号")
+    private String grantNo;
+
+    @ApiModelProperty(value = "授权日")
+    private LocalDate grantDate;
+
+    /*
+    翻译
+     */
+    @ApiModelProperty(value = "翻译字数")
+    private long translateWord;
+
+    @ApiModelProperty(value = "翻译语种")
+    private String translationLanguage;
+
+    @ApiModelProperty(value = "单价/千字")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty(value = "总价")
+    private BigDecimal totalPrice;
+
+    @ApiModelProperty(value = "翻译交期")
+    private LocalDate translationPeriod;
+
+    @ApiModelProperty(value = "是否决定答复")
+    private Boolean decideReply;
+
+    /*
+    true 客户准备
+    false 律师准备
+     */
+    @ApiModelProperty(value = "准备答复意见")
+    private Boolean isClientReady;
+
+    @ApiModelProperty(value = "是否通过答复")
+    private Boolean replyPassed;
+
+    @ApiModelProperty(value = "办登缴费期限")
+    private LocalDate registerPayPeriod;
+
+    @ApiModelProperty(value = "专利名称")
+    private String name;
+
+    private ApplyStatus applyStatus;
+
+    @ApiModelProperty(value = "专利类型")
+    private PatentType type;
+
+    /*
+    客户编码（由客户经理填写）+年份+案件类型+连接符+案件阶段[+国家]+序列号
+     */
+    @ApiModelProperty(value = "寰球案号")
+    private String uwNo;
+
+    @ApiModelProperty(value = "客户id")
+    private Long clientPartnerId;
+
+    @ApiModelProperty(value = "供应商")
+    private Long supplierPartnerId;
+
+    @ApiModelProperty(value = "供应商案号")
+    private String supplierNo;
+
+    @ApiModelProperty(value = "供应商提交期限")
+    private LocalDate supplierSubmitPeriod;
+
+    @ApiModelProperty(value = "申请人名称")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请人英文名称")
+    private String applicantEnName;
+
+    @ApiModelProperty(value = "申请人地址")
+    private String applicantAddress;
+
+    @ApiModelProperty(value = "申请人英文地址")
+    private String applicantEnAddress;
+
+    @ApiModelProperty(value = "发明人名称")
+    private String inventorName;
+
+    @ApiModelProperty(value = "发明人英文名称")
+    private String inventorEnName;
+
+    @ApiModelProperty(value = "优先权号")
+    private String priorityNo;
+
+    @ApiModelProperty(value = "优先权日")
+    private LocalDate priorityDate;
+
+    @ApiModelProperty(value = "优先权国别")
+    private String priorityCountry;
+
+    @ApiModelProperty(value = "提交期限/内部期限")
+    private LocalDate submitPeriod;
+
+    /*
+    =优先权日+30个月
+     */
+    @ApiModelProperty(value = "官方期限")
+    private LocalDate officialPeriod;
+
+    @ApiModelProperty(value = "申请号")
+    private String applyNo;
+
+    @ApiModelProperty(value = "申请日")
+    private LocalDate applyDate;
+
+    private List<Handle> handle = new ArrayList<>();
+
+    public List<AttachmentDTO> attachments;
+
+    public CountryPatentDTO(CountryPatent cPatent, Patent patent) {
+        BeanUtil.copyProperties(cPatent, this);
+        BeanUtil.copyProperties(patent, this);
+        this.cid = cPatent.getId();
+    }
+
+}

src/main/java/com/izouma/uwip/enums/CountryWorkflow.java

@@ -2,30 +2,50 @@ package com.izouma.uwip.enums;
 
 /*
 国家申请流程
+1 客户经理
+2 项目经理
+3 翻译经理
  */
 public enum CountryWorkflow {
-    APPLY_TRANSLATION("待申请翻译文稿"),
-    TRANSLATION_DOCUMENTS("待上传翻译文稿"),
-    FINALIZED_TRANSLATION("待上传翻译定稿"),
-    ADD_SUPPLIERS("待添加供应商"),
-    SUPPLIER_MATERIALS("待提交供应商材料"),
-    MAINTAIN_CASE("待维护案件信息"),
-    REPLY_NOTIFICATION("待上传答复通知"),
-    DETERMINED_REPLY("待确定答复意向"),
-    UPLOADED_REPLY("待上传答复意见书"),
-    RESPONSE_RESULT("待确定答复结果"),
-    AUTHORIZE_REGISTER("授权办登"),
-    AUTHORIZATION_INFORMATION("待维护授权信息"),
-    COMPLETED("已完成"),
+    APPLY_TRANSLATION("待申请翻译文稿", 3),
+    TRANSLATION_DOCUMENTS("待上传翻译文稿", 3),
+    FINALIZED_TRANSLATION("待上传翻译定稿", 1),
+    ADD_SUPPLIERS("待添加供应商", 2),
+    SUPPLIER_MATERIALS("待提交供应商材料", 2),
+    MAINTAIN_CASE("待维护案件信息", 1),
+    REPLY_NOTIFICATION("待上传答复通知", 2),
+    DETERMINED_REPLY("待确定答复意向", 1),
+    NO_REPLY("不答复终止", 1),
+    UPLOADED_REPLY("待上传答复意见书", 1),
+    RESPONSE_RESULT("待确定答复结果", 2),
+    /*
+    授权办登通知日
+    */
+    PENDING_REGISTER("待办登", 1),
+    /*
+    办登凭证/证书扫描件
+     */
+    AUTHORIZE_REGISTER("授权办登", 1),
+    /*
+    授权号/授权日
+     */
+    AUTHORIZATION_INFORMATION("待维护授权信息", 1),
+    COMPLETED("已完成", 1),
     ;
 
     private final String description;
+    private final int    authority;
 
     public String getDescription() {
         return description;
     }
 
-    CountryWorkflow(String description) {
+    public int getAuthority() {
+        return authority;
+    }
+
+    CountryWorkflow(String description, int authority) {
         this.description = description;
+        this.authority = authority;
     }
 }

src/main/java/com/izouma/uwip/repo/CountryPatentRepo.java

@@ -0,0 +1,23 @@
+package com.izouma.uwip.repo;
+
+import com.izouma.uwip.domain.CountryPatent;
+import com.izouma.uwip.dto.CountryPatentDTO;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+import java.util.Optional;
+
+public interface CountryPatentRepo extends JpaRepository<CountryPatent, Long>, JpaSpecificationExecutor<CountryPatent> {
+    @Query("update CountryPatent t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    @Query("select new com.izouma.uwip.dto.CountryPatentDTO(c,p) " +
+            "from CountryPatent c join Patent p on c.patentId = p.id " +
+            "where c.id = ?1 and p.del = false and c.del = false")
+    Optional<CountryPatentDTO> findCountryDTO(Long id);
+}

src/main/java/com/izouma/uwip/service/CountryPatentService.java

@@ -0,0 +1,150 @@
+package com.izouma.uwip.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.izouma.uwip.domain.CountryPatent;
+import com.izouma.uwip.domain.Handle;
+import com.izouma.uwip.domain.InternationalPatent;
+import com.izouma.uwip.domain.Patent;
+import com.izouma.uwip.dto.CountryPatentDTO;
+import com.izouma.uwip.dto.InternationalPatentDTO;
+import com.izouma.uwip.dto.PageQuery;
+import com.izouma.uwip.enums.*;
+import com.izouma.uwip.exception.BusinessException;
+import com.izouma.uwip.repo.CountryPatentRepo;
+import com.izouma.uwip.repo.PatentRepo;
+import com.izouma.uwip.utils.JpaUtils;
+import com.izouma.uwip.utils.ObjUtils;
+import lombok.AllArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@AllArgsConstructor
+public class CountryPatentService {
+
+    private final CountryPatentRepo countryPatentRepo;
+    private final PatentRepo        patentRepo;
+    private final PartnerService    partnerService;
+    private final AttachmentService attachmentService;
+
+
+    public Page<CountryPatent> all(PageQuery pageQuery) {
+        return countryPatentRepo.findAll(JpaUtils.toSpecification(pageQuery, CountryPatent.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    public CountryPatent saveDTO(CountryPatentDTO record, Long userId) {
+        if (record.getCid() != null) {
+            CountryPatent orig = countryPatentRepo.findById(record.getCid())
+                    .orElseThrow(new BusinessException("无记录"));
+            CountryPatent cPatent = new CountryPatent(record);
+            ObjUtils.merge(orig, cPatent);
+            orig = countryPatentRepo.save(orig);
+
+            Patent orig1 = patentRepo.findById(record.getPatentId()).orElseThrow(new BusinessException("无记录"));
+            Patent patent = new Patent();
+            BeanUtil.copyProperties(record, patent);
+            ObjUtils.mergePatent(orig1, patent);
+            List<Handle> handleList = orig1.getHandle();
+            if (handleList == null) {
+                handleList = new ArrayList<>();
+            }
+            handleList.add(Handle.builder()
+                    .workflow(record.getWorkflow().toString())
+                    .userId(userId)
+                    .checkAt(LocalDateTime.now())
+                    .build());
+            orig1.setHandle(handleList);
+            if (ObjectUtil.isNull(record.getApplyStatus()) || !ApplyStatus.COMPLETED.equals(record.getApplyStatus())) {
+                orig1.setApplyStatus(this.getApplyStatus(record.getWorkflow()));
+            }
+            patentRepo.save(orig1);
+
+            // 保存附件
+            if (CollectionUtils.isNotEmpty(record.getAttachments())) {
+                attachmentService.batchSave(record.getAttachments(), userId, record.getCid());
+            }
+            return orig;
+        }
+
+        Patent patent = new Patent();
+        BeanUtil.copyProperties(record, patent);
+        patent.setSort(patentRepo.findMax());
+
+        //寰球案号
+        PatentType type = patent.getType();
+        patent.setUwNo(partnerService.getUwNo(patent.getClientPartnerId(), CaseType.valueOf(type.name()), CaseStage.PCT, patent
+                .getSort()));
+        patent.setApplyStatus(ApplyStatus.APPLY_STAGE);
+        patent = patentRepo.save(patent);
+
+        CountryPatent iPatent = new CountryPatent(record);
+        iPatent.setPatentId(patent.getId());
+        iPatent = countryPatentRepo.save(iPatent);
+
+        // 保存附件
+        if (CollectionUtils.isNotEmpty(record.getAttachments())) {
+            attachmentService.batchSave(record.getAttachments(), userId, record.getCid());
+        }
+        return iPatent;
+    }
+
+    public ApplyStatus getApplyStatus(CountryWorkflow workflow) {
+        switch (workflow) {
+            case APPLY_TRANSLATION://申请翻译文稿
+            case TRANSLATION_DOCUMENTS://上传翻译文稿
+            case FINALIZED_TRANSLATION://上传翻译定稿
+                return ApplyStatus.APPLY_STAGE;//申请阶段
+            case ADD_SUPPLIERS://供应商
+            case SUPPLIER_MATERIALS://供应商材料
+            case MAINTAIN_CASE://案件信息
+            case REPLY_NOTIFICATION://答复通知
+            case DETERMINED_REPLY://答复意向
+            case UPLOADED_REPLY://答复意见书
+            case RESPONSE_RESULT://答复结果
+            case PENDING_REGISTER://办登通知日
+            case AUTHORIZE_REGISTER://办登凭证
+            case AUTHORIZATION_INFORMATION://授权号
+                return ApplyStatus.SUBSTANTIVE_STAGE;// 实审阶段
+            default://不答复终止
+                return ApplyStatus.COMPLETED;
+        }
+    }
+
+    public Page<CountryPatent> allDTO(PageQuery pageQuery) {
+        return countryPatentRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
+            List<Predicate> and = new ArrayList<>();
+            Path<Object> patent = root.get("patent");
+            if (StrUtil.isNotBlank(pageQuery.getSearch())) {
+                List<Predicate> or = new ArrayList<>();
+                or.add(criteriaBuilder.like(patent.get("name"), "%" + pageQuery.getSearch() + "%"));
+                or.add(criteriaBuilder.like(patent.get("uwNo"), "%" + pageQuery.getSearch() + "%"));
+                and.add(criteriaBuilder.or(or.toArray(new Predicate[0])));
+            }
+            Map<String, Object> query = pageQuery.getQuery();
+            query.keySet().forEach(key -> {
+                if (JpaUtils.isExistField(key, InternationalPatent.class)) {
+                    Predicate predicate = JpaUtils.getPredicate(key, query.get(key), InternationalPatent.class, root, criteriaBuilder, false);
+                    if (ObjectUtil.isNotNull(predicate)) {
+                        and.add(predicate);
+                    }
+                } else {
+                    Predicate predicate = JpaUtils.getPredicate(key, query.get(key), Patent.class, root, criteriaBuilder, true);
+                    if (ObjectUtil.isNotNull(predicate)) {
+                        and.add(predicate);
+                    }
+                }
+            });
+            return criteriaBuilder.and(and.toArray(new Predicate[0]));
+        }), JpaUtils.toPageRequest(pageQuery));
+    }
+}

src/main/java/com/izouma/uwip/web/CountryPatentController.java

@@ -0,0 +1,66 @@
+package com.izouma.uwip.web;
+
+import com.izouma.uwip.domain.CountryPatent;
+import com.izouma.uwip.dto.CountryPatentDTO;
+import com.izouma.uwip.dto.PageQuery;
+import com.izouma.uwip.exception.BusinessException;
+import com.izouma.uwip.repo.CountryPatentRepo;
+import com.izouma.uwip.service.CountryPatentService;
+import com.izouma.uwip.utils.ObjUtils;
+import com.izouma.uwip.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/countryPatent")
+@AllArgsConstructor
+public class CountryPatentController extends BaseController {
+    private final CountryPatentService countryPatentService;
+    private final CountryPatentRepo    countryPatentRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public CountryPatent save(@RequestBody CountryPatent record) {
+        if (record.getId() != null) {
+            CountryPatent orig = countryPatentRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return countryPatentRepo.save(orig);
+        }
+        return countryPatentRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<CountryPatent> all(@RequestBody PageQuery pageQuery) {
+        return countryPatentService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public CountryPatent get(@PathVariable Long id) {
+        return countryPatentRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @GetMapping("/getDTO/{id}")
+    public CountryPatentDTO getDTO(@PathVariable Long id) {
+        return countryPatentRepo.findCountryDTO(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        countryPatentRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<CountryPatent> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/vue/src/components/fee/FeeList.vue

@@ -23,7 +23,7 @@
             <el-table-column prop="patentPartner" label="专利权人" min-width="120px"> </el-table-column>
             <el-table-column prop="payPartner" label="支付对象" min-width="120px"> </el-table-column>
             <el-table-column prop="amount" label="金额" min-width="120px"> </el-table-column>
-            <el-table-column prop="currencyMaintenanceId" label="币种" min-width="100px"> </el-table-column>
+            <el-table-column prop="currency" label="币种" min-width="100px"> </el-table-column>
             <el-table-column prop="paymentDeadline" label="支付期限" min-width="100px"> </el-table-column>
             <el-table-column prop="bill" label="账单" min-width="100px"> </el-table-column>
             <el-table-column prop="billImg" label="账单图片" min-width="100px">

src/main/vue/src/router.js

@@ -275,6 +275,24 @@ const router = new Router({
                     meta: {
                         title: '国际专利申请'
                     }
+                },
+                {
+                    path: '/countryPatentEdit',
+                    name: 'CountryPatentEdit',
+                    component: () =>
+                        import(/* webpackChunkName: "countryPatentEdit" */ '@/views/CountryPatentEdit.vue'),
+                    meta: {
+                        title: '国家专利申请编辑'
+                    }
+                },
+                {
+                    path: '/countryPatentList',
+                    name: 'CountryPatentList',
+                    component: () =>
+                        import(/* webpackChunkName: "countryPatentList" */ '@/views/CountryPatentList.vue'),
+                    meta: {
+                        title: '国家专利申请'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/CountryPatentEdit.vue

@@ -0,0 +1,237 @@
+<template>
+    <div class="edit-view">
+        <page-title>
+            <el-button @click="$router.go(-1)">取消</el-button>
+            <el-button @click="del" :loading="$store.state.fetchingData" type="danger" v-if="formData.id">
+                删除
+            </el-button>
+            <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <divider />
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="108px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 500px;"
+                >
+                    <el-form-item prop="workflow" label="流程">
+                        <el-select v-model="formData.workflow" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in workflowOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="country" label="进入国家">
+                        <el-select v-model="formData.country" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in countryOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="applyRoute" label="申请途径">
+                        <el-select v-model="formData.applyRoute" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in applyRouteOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="pctApplyNo" label="pct申请号">
+                        <el-input v-model="formData.pctApplyNo"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="pctApplyDate" label="pct申请日">
+                        <el-input v-model="formData.pctApplyDate"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="pctPublicNo" label="pct公开号">
+                        <el-input v-model="formData.pctPublicNo"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="pctPublicDate" label="pct公开日">
+                        <el-input v-model="formData.pctPublicDate"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="grantNo" label="授权号">
+                        <el-input v-model="formData.grantNo"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="grantDate" label="授权日">
+                        <el-date-picker
+                            v-model="formData.grantDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择日期"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item prop="translateWord" label="翻译字数">
+                        <el-input v-model="formData.translateWord"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="translationLanguage" label="翻译语种">
+                        <el-input v-model="formData.translationLanguage"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="unitPrice" label="单价/千字">
+                        <el-input-number type="number" v-model="formData.unitPrice"></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="totalPrice" label="总价">
+                        <el-input-number type="number" v-model="formData.totalPrice"></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="translationPeriod" label="翻译交期">
+                        <el-date-picker
+                            v-model="formData.translationPeriod"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择日期"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item prop="decideReply" label="是否决定答复">
+                        <el-switch v-model="formData.decideReply"></el-switch>
+                    </el-form-item>
+                    <el-form-item prop="isClientReady" label="准备答复意见">
+                        <el-switch v-model="formData.isClientReady"></el-switch>
+                    </el-form-item>
+                    <el-form-item prop="replyPassed" label="是否通过答复">
+                        <el-switch v-model="formData.replyPassed"></el-switch>
+                    </el-form-item>
+                    <el-form-item prop="registerPayPeriod" label="办登缴费期限">
+                        <el-date-picker
+                            v-model="formData.registerPayPeriod"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择日期"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item class="form-submit">
+                        <el-button @click="onSave" :loading="saving" size="default" type="primary">保存 </el-button>
+                        <el-button @click="onDelete" :loading="saving" size="default" type="danger" v-if="formData.id"
+                            >删除
+                        </el-button>
+                        <el-button @click="$router.go(-1)" size="default">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    name: 'CountryPatentEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('countryPatent/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+        this.$http
+            .post('/maintenance/byDesc', { description: 'Country' })
+            .then(res => {
+                if (res[0].children.length > 0) {
+                    res[0].children.forEach(item => {
+                        this.countryOptions.push({
+                            label: item.name,
+                            value: item.name
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {},
+            workflowOptions: [
+                { label: '待申请翻译文稿', value: 'APPLY_TRANSLATION' },
+                { label: '待上传翻译文稿', value: 'TRANSLATION_DOCUMENTS' },
+                { label: '待上传翻译定稿', value: 'FINALIZED_TRANSLATION' },
+                { label: '待添加供应商', value: 'ADD_SUPPLIERS' },
+                { label: '待提交供应商材料', value: 'SUPPLIER_MATERIALS' },
+                { label: '待维护案件信息', value: 'MAINTAIN_CASE' },
+                { label: '待上传答复通知', value: 'REPLY_NOTIFICATION' },
+                { label: '待确定答复意向', value: 'DETERMINED_REPLY' },
+                { label: '不答复终止', value: 'NO_REPLY' },
+                { label: '待上传答复意见书', value: 'UPLOADED_REPLY' },
+                { label: '待确定答复结果', value: 'RESPONSE_RESULT' },
+                { label: '待办登', value: 'PENDING_REGISTER' },
+                { label: '授权办登', value: 'AUTHORIZE_REGISTER' },
+                { label: '待维护授权信息', value: 'AUTHORIZATION_INFORMATION' },
+                { label: '已完成', value: 'COMPLETED' }
+            ],
+            countryOptions: [],
+            applyRouteOptions: [
+                { label: 'PCT', value: 'PCT' },
+                { label: 'SINGLE', value: '单一国申请' }
+            ]
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/countryPatent/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/countryPatent/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/CountryPatentList.vue

@@ -0,0 +1,226 @@
+<template>
+    <div class="list-view">
+        <page-title>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" :loading="downloading" class="filter-item">
+                新增
+            </el-button>
+            <el-button @click="download" icon="el-icon-upload2" :loading="downloading" class="filter-item">
+                导出
+            </el-button>
+        </page-title>
+        <div class="filters-container">
+            <el-input
+                placeholder="搜索..."
+                v-model="search"
+                clearable
+                class="filter-item search"
+                @keyup.enter.native="getData"
+            >
+                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+            </el-input>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="workflow" label="流程" :formatter="workflowFormatter"> </el-table-column>
+            <el-table-column prop="country" label="进入国家"> </el-table-column>
+            <el-table-column prop="applyRoute" label="申请途径" :formatter="applyRouteFormatter"> </el-table-column>
+            <el-table-column prop="pctApplyNo" label="pct申请号"> </el-table-column>
+            <el-table-column prop="pctApplyDate" label="pct申请日"> </el-table-column>
+            <el-table-column prop="pctPublicNo" label="pct公开号"> </el-table-column>
+            <el-table-column prop="pctPublicDate" label="pct公开日"> </el-table-column>
+            <el-table-column prop="grantNo" label="授权号"> </el-table-column>
+            <el-table-column prop="grantDate" label="授权日"> </el-table-column>
+            <el-table-column prop="translateWord" label="翻译字数"> </el-table-column>
+            <el-table-column prop="translationLanguage" label="翻译语种"> </el-table-column>
+            <el-table-column prop="unitPrice" label="单价/千字"> </el-table-column>
+            <el-table-column prop="totalPrice" label="总价"> </el-table-column>
+            <el-table-column prop="translationPeriod" label="翻译交期"> </el-table-column>
+            <el-table-column prop="decideReply" label="是否决定答复">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.decideReply ? '' : 'info'">{{ row.decideReply }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column prop="isClientReady" label="准备答复意见">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.isClientReady ? '' : 'info'">{{ row.isClientReady }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column prop="replyPassed" label="是否通过答复">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.replyPassed ? '' : 'info'">{{ row.replyPassed }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column prop="registerPayPeriod" label="办登缴费期限"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'CountryPatentList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/countryPatent/all',
+            downloading: false,
+            workflowOptions: [
+                { label: '待申请翻译文稿', value: 'APPLY_TRANSLATION' },
+                { label: '待上传翻译文稿', value: 'TRANSLATION_DOCUMENTS' },
+                { label: '待上传翻译定稿', value: 'FINALIZED_TRANSLATION' },
+                { label: '待添加供应商', value: 'ADD_SUPPLIERS' },
+                { label: '待提交供应商材料', value: 'SUPPLIER_MATERIALS' },
+                { label: '待维护案件信息', value: 'MAINTAIN_CASE' },
+                { label: '待上传答复通知', value: 'REPLY_NOTIFICATION' },
+                { label: '待确定答复意向', value: 'DETERMINED_REPLY' },
+                { label: '不答复终止', value: 'NO_REPLY' },
+                { label: '待上传答复意见书', value: 'UPLOADED_REPLY' },
+                { label: '待确定答复结果', value: 'RESPONSE_RESULT' },
+                { label: '待办登', value: 'PENDING_REGISTER' },
+                { label: '授权办登', value: 'AUTHORIZE_REGISTER' },
+                { label: '待维护授权信息', value: 'AUTHORIZATION_INFORMATION' },
+                { label: '已完成', value: 'COMPLETED' }
+            ],
+            applyRouteOptions: [
+                { label: 'PCT', value: 'PCT' },
+                { label: 'SINGLE', value: '单一国申请' }
+            ]
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        workflowFormatter(row, column, cellValue, index) {
+            let selectedOption = this.workflowOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        applyRouteFormatter(row, column, cellValue, index) {
+            let selectedOption = this.applyRouteOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        beforeGetData() {
+            return { search: this.search };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/countryPatentEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/countryPatentEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/countryPatent/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/countryPatent/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>