商标/费用/附件

src/main/java/com/izouma/uwip/converter/HandleListConverter.java

@@ -0,0 +1,25 @@
+package com.izouma.uwip.converter;
+
+import com.alibaba.fastjson.JSON;
+import com.izouma.uwip.domain.Handle;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.persistence.AttributeConverter;
+import java.util.List;
+
+public class HandleListConverter implements AttributeConverter<List<Handle>, String> {
+    @Override
+    public String convertToDatabaseColumn(List<Handle> list) {
+        if (list != null)
+            return JSON.toJSONString(list);
+        return null;
+    }
+
+    @Override
+    public List<Handle> convertToEntityAttribute(String s) {
+        if (StringUtils.isNotEmpty(s)) {
+            return JSON.parseArray(s, Handle.class);
+        }
+        return null;
+    }
+}

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

@@ -7,10 +7,13 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Entity;
+
 @AllArgsConstructor
 @Data
 @Builder
 @NoArgsConstructor
+@Entity
 @ApiModel(value = "附件")
 public class Attachment extends BaseEntity {
     @ApiModelProperty(value = "专利id")
@@ -28,7 +31,7 @@ public class Attachment extends BaseEntity {
     private String size;
 
     @ApiModelProperty(value = "操作人")
-    private Long operateUserId;
+    private Long userId;
 
     @ApiModelProperty(value = "版本")
     private int version;

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

@@ -8,12 +8,14 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Entity;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 
 @AllArgsConstructor
 @Data
 @Builder
+@Entity
 @NoArgsConstructor
 @ApiModel(value = "费用")
 public class Fee extends BaseEntity {
@@ -52,4 +54,6 @@ public class Fee extends BaseEntity {
 
     @ApiModelProperty(value = "是否发票回传")
     private Boolean invoiceReturn;
+
+    private Long userId;
 }

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

@@ -0,0 +1,16 @@
+package com.izouma.uwip.domain;
+
+import com.izouma.uwip.enums.LogoWorkflow;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "处理人")
+public class Handle {
+    private Long userId;
+
+    private Long checkAt;
+
+    private LogoWorkflow logoWorkflow;
+
+}

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

@@ -1,6 +1,8 @@
 package com.izouma.uwip.domain;
 
-import com.izouma.uwip.enums.ApplyStatus;
+import com.izouma.uwip.converter.HandleListConverter;
+import com.izouma.uwip.enums.LogoApplyStatus;
+import com.izouma.uwip.enums.LogoWorkflow;
 import com.izouma.uwip.enums.PayRatio;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,23 +11,30 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
+import javax.persistence.*;
 import java.time.LocalDate;
+import java.util.List;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Entity
 @ApiModel(value = "商标专利申请")
 public class LogoPatent extends BaseEntity {
+    @ApiModelProperty(value = "创建申请人")
+    private Long userId;
+
     private String name;
 
     @ApiModelProperty(value = "客户id")
     private Long clientPartnerId;
 
     @Enumerated(EnumType.STRING)
-    private ApplyStatus applyStatus;
+    private LogoApplyStatus applyStatus;
+
+    @Enumerated(EnumType.STRING)
+    private LogoWorkflow logoWorkflow;
 
     @ApiModelProperty(value = "供应商")
     private Long supplierPartnerId;
@@ -74,5 +83,10 @@ public class LogoPatent extends BaseEntity {
     private String reHearPayment;
 
     @ApiModelProperty(value = "复审是否通过")
-    private String rehearResult;
+    private boolean rehearResult;
+
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = HandleListConverter.class)
+    private List<Handle> handle;
+
 }

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

@@ -9,6 +9,7 @@ import org.hibernate.annotations.Where;
 
 import javax.persistence.Entity;
 import javax.persistence.Transient;
+import javax.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -23,9 +24,11 @@ public class Maintenance extends BaseEntity {
 
     private String name;
 
+    @Size(max = 50)
     private String description;
 
-//    private String type;
+    @Size(min = 1,max = 50)
+    private String flag;
 
     private Long parent;
 

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

@@ -0,0 +1,21 @@
+package com.izouma.uwip.enums;
+
+public enum LogoApplyStatus {
+    APPLY_STAGE("申请阶段"),
+    FIRST_REVIEW_STAGE("初审阶段"),
+    SUBSTANTIVE_STAGE("实审阶段"),
+    REVIEW_STAGE("复审阶段"),
+    GRANT_STAGE("授权阶段"),
+    COMPLETED("已完成")
+    ;
+
+    private final String description;
+
+    public String getDescription() {
+        return description;
+    }
+
+    LogoApplyStatus(String description) {
+        this.description = description;
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.izouma.uwip.enums;
+
+public enum LogoWorkflow {
+    IS_CONTRACT("是否决定签约"),
+    TO_BE_MAINTAINED("待维护案件"),
+    PENDING("待受理"),
+    PENDING_REVIEW("待审查"),
+    DISMISS("驳回处理"),
+    ANNOUNCEMENTS("公告初审"),
+    HANDLE("证件办理"),
+    ;
+
+    private final String description;
+
+    public String getDescription() {
+        return description;
+    }
+
+    LogoWorkflow(String description) {
+        this.description = description;
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.izouma.uwip.repo;
+
+import com.izouma.uwip.domain.Attachment;
+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;
+
+public interface AttachmentRepo extends JpaRepository<Attachment, Long>, JpaSpecificationExecutor<Attachment> {
+    @Query("update Attachment t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

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

@@ -0,0 +1,16 @@
+package com.izouma.uwip.repo;
+
+import com.izouma.uwip.domain.Fee;
+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;
+
+public interface FeeRepo extends JpaRepository<Fee, Long>, JpaSpecificationExecutor<Fee> {
+    @Query("update Fee t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

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

@@ -0,0 +1,16 @@
+package com.izouma.uwip.repo;
+
+import com.izouma.uwip.domain.LogoPatent;
+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;
+
+public interface LogoPatentRepo extends JpaRepository<LogoPatent, Long>, JpaSpecificationExecutor<LogoPatent> {
+    @Query("update LogoPatent t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

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

@@ -7,6 +7,7 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
+import java.util.List;
 
 public interface MaintenanceRepo extends JpaRepository<Maintenance, Long>, JpaSpecificationExecutor<Maintenance> {
     @Query("update Maintenance t set t.del = true where t.id = ?1")
@@ -14,7 +15,7 @@ public interface MaintenanceRepo extends JpaRepository<Maintenance, Long>, JpaSp
     @Transactional
     void softDelete(Long id);
 
-    Maintenance findByDescription(String description);
+    List<Maintenance> findAllByFlag(String description);
 
 
 }

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

@@ -0,0 +1,20 @@
+package com.izouma.uwip.service;
+
+import com.izouma.uwip.domain.Attachment;
+import com.izouma.uwip.dto.PageQuery;
+import com.izouma.uwip.repo.AttachmentRepo;
+import com.izouma.uwip.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class AttachmentService {
+
+    private AttachmentRepo attachmentRepo;
+
+    public Page<Attachment> all(PageQuery pageQuery) {
+        return attachmentRepo.findAll(JpaUtils.toSpecification(pageQuery, Attachment.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.izouma.uwip.service;
+
+import com.izouma.uwip.domain.Fee;
+import com.izouma.uwip.dto.PageQuery;
+import com.izouma.uwip.repo.FeeRepo;
+import com.izouma.uwip.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class FeeService {
+
+    private FeeRepo feeRepo;
+
+    public Page<Fee> all(PageQuery pageQuery) {
+        return feeRepo.findAll(JpaUtils.toSpecification(pageQuery, Fee.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.izouma.uwip.service;
+
+import com.izouma.uwip.domain.LogoPatent;
+import com.izouma.uwip.dto.PageQuery;
+import com.izouma.uwip.repo.LogoPatentRepo;
+import com.izouma.uwip.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class LogoPatentService {
+
+    private LogoPatentRepo logoPatentRepo;
+
+    public Page<LogoPatent> all(PageQuery pageQuery) {
+        return logoPatentRepo.findAll(JpaUtils.toSpecification(pageQuery, LogoPatent.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

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

@@ -0,0 +1,60 @@
+package com.izouma.uwip.web;
+import com.izouma.uwip.domain.Attachment;
+import com.izouma.uwip.service.AttachmentService;
+import com.izouma.uwip.dto.PageQuery;
+import com.izouma.uwip.exception.BusinessException;
+import com.izouma.uwip.repo.AttachmentRepo;
+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.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/attachment")
+@AllArgsConstructor
+public class AttachmentController extends BaseController {
+    private AttachmentService attachmentService;
+    private AttachmentRepo attachmentRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Attachment save(@RequestBody Attachment record) {
+        if (record.getId() != null) {
+            Attachment orig = attachmentRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return attachmentRepo.save(orig);
+        }
+        return attachmentRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<Attachment> all(@RequestBody PageQuery pageQuery) {
+        return attachmentService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public Attachment get(@PathVariable Long id) {
+        return attachmentRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        attachmentRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Attachment> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

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

@@ -0,0 +1,60 @@
+package com.izouma.uwip.web;
+import com.izouma.uwip.domain.Fee;
+import com.izouma.uwip.service.FeeService;
+import com.izouma.uwip.dto.PageQuery;
+import com.izouma.uwip.exception.BusinessException;
+import com.izouma.uwip.repo.FeeRepo;
+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.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/fee")
+@AllArgsConstructor
+public class FeeController extends BaseController {
+    private FeeService feeService;
+    private FeeRepo feeRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Fee save(@RequestBody Fee record) {
+        if (record.getId() != null) {
+            Fee orig = feeRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return feeRepo.save(orig);
+        }
+        return feeRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<Fee> all(@RequestBody PageQuery pageQuery) {
+        return feeService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public Fee get(@PathVariable Long id) {
+        return feeRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        feeRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Fee> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

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

@@ -0,0 +1,60 @@
+package com.izouma.uwip.web;
+import com.izouma.uwip.domain.LogoPatent;
+import com.izouma.uwip.service.LogoPatentService;
+import com.izouma.uwip.dto.PageQuery;
+import com.izouma.uwip.exception.BusinessException;
+import com.izouma.uwip.repo.LogoPatentRepo;
+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.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/logoPatent")
+@AllArgsConstructor
+public class LogoPatentController extends BaseController {
+    private LogoPatentService logoPatentService;
+    private LogoPatentRepo logoPatentRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public LogoPatent save(@RequestBody LogoPatent record) {
+        if (record.getId() != null) {
+            LogoPatent orig = logoPatentRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return logoPatentRepo.save(orig);
+        }
+        return logoPatentRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<LogoPatent> all(@RequestBody PageQuery pageQuery) {
+        return logoPatentService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public LogoPatent get(@PathVariable Long id) {
+        return logoPatentRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        logoPatentRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<LogoPatent> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

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

@@ -26,11 +26,17 @@ public class MaintenanceController extends BaseController {
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     public Maintenance save(@RequestBody Maintenance record) {
+        if (record.getDescription() == null) {
+            throw new BusinessException("父级描述不能为空");
+        }
         if (record.getId() != null) {
             Maintenance orig = maintenanceRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);
             return maintenanceRepo.save(orig);
         }
+        if (record.getParent() == null) {
+            record.setFlag(record.getDescription());
+        }
         return maintenanceRepo.save(record);
     }
 
@@ -64,9 +70,8 @@ public class MaintenanceController extends BaseController {
     }
 
     @PostMapping("/byDesc")
-    public List<Maintenance> byDesc() {
-//        return maintenanceService.getTree()
-        return null;
+    public List<Maintenance> byDesc(@RequestParam String description) {
+        return maintenanceService.getTree(maintenanceRepo.findAllByFlag(description),null);
     }
 }
 

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

@@ -38,7 +38,6 @@ public class MenuController extends BaseController {
                 .stream()
                 .map(Menu::from)
                 .collect(Collectors.toList());
-        menuList.forEach(System.out::println);
 
         List<Menu> root = new ArrayList<>();
 

src/main/resources/genjson/Attachment.json

@@ -0,0 +1 @@
+{"tableName":"Attachment","className":"Attachment","remark":"附件列表","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/uwip/src/main/java/com/izouma/uwip","viewPath":"/Users/qiufangchao/Desktop/project/uwip/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/uwip/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/uwip/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"patentId","modelName":"patentId","remark":"专利id","showInList":true,"showInForm":true,"formType":"number"},{"name":"attachmentName","modelName":"attachmentName","remark":"附件名称","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"fileName","modelName":"fileName","remark":"文件名称","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"remark","modelName":"remark","remark":"备注","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"size","modelName":"size","remark":"大小","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"userId","modelName":"userId","remark":"操作人","showInList":true,"showInForm":true,"formType":"number"},{"name":"version","modelName":"version","remark":"版本","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.uwip","tablePackage":"com.izouma.uwip.domain.Attachment"}

src/main/vue/src/router.js

@@ -158,6 +158,54 @@ const router = new Router({
                     meta: {
                         title: '配置选项'
                     }
+                },
+                {
+                    path: '/logoPatentEdit',
+                    name: 'LogoPatentEdit',
+                    component: () => import(/* webpackChunkName: "logoPatentEdit" */ '@/views/LogoPatentEdit.vue'),
+                    meta: {
+                        title: '商标申请编辑'
+                    }
+                },
+                {
+                    path: '/logoPatentList',
+                    name: 'LogoPatentList',
+                    component: () => import(/* webpackChunkName: "logoPatentList" */ '@/views/LogoPatentList.vue'),
+                    meta: {
+                        title: '商标申请'
+                    }
+                },
+                {
+                    path: '/feeEdit',
+                    name: 'FeeEdit',
+                    component: () => import(/* webpackChunkName: "feeEdit" */ '@/views/FeeEdit.vue'),
+                    meta: {
+                        title: '费用信息编辑'
+                    }
+                },
+                {
+                    path: '/feeList',
+                    name: 'FeeList',
+                    component: () => import(/* webpackChunkName: "feeList" */ '@/views/FeeList.vue'),
+                    meta: {
+                        title: '费用信息'
+                    }
+                },
+                {
+                    path: '/attachmentEdit',
+                    name: 'AttachmentEdit',
+                    component: () => import(/* webpackChunkName: "attachmentEdit" */ '@/views/AttachmentEdit.vue'),
+                    meta: {
+                        title: '附件列表编辑'
+                    }
+                },
+                {
+                    path: '/attachmentList',
+                    name: 'AttachmentList',
+                    component: () => import(/* webpackChunkName: "attachmentList" */ '@/views/AttachmentList.vue'),
+                    meta: {
+                        title: '附件列表'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/AttachmentEdit.vue

@@ -0,0 +1,124 @@
+<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="80px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 500px;"
+                >
+                    <el-form-item prop="patentId" label="专利id">
+                        <el-input-number type="number" v-model="formData.patentId"></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="attachmentName" label="附件名称">
+                        <el-input v-model="formData.attachmentName"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="fileName" label="文件名称">
+                        <el-input v-model="formData.fileName"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="remark" label="备注">
+                        <el-input v-model="formData.remark"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="size" label="大小">
+                        <el-input v-model="formData.size"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="userId" label="操作人">
+                        <el-input-number type="number" v-model="formData.userId"></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="version" label="版本">
+                        <el-input v-model="formData.version"></el-input>
+                    </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: 'AttachmentEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('attachment/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {}
+        };
+    },
+    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('/attachment/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(`/attachment/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/AttachmentList.vue

@@ -0,0 +1,169 @@
+<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="patentId" label="专利id"> </el-table-column> -->
+            <el-table-column prop="attachmentName" label="附件名称"> </el-table-column>
+            <el-table-column prop="fileName" label="上传文件名称"> </el-table-column>
+            <el-table-column prop="remark" label="备注"> </el-table-column>
+            <el-table-column prop="size" label="大小"> </el-table-column>
+            <el-table-column prop="createdAt" label="上传时间"></el-table-column>
+            <el-table-column prop="userId" label="操作人"> </el-table-column>
+            <el-table-column prop="version" 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: 'AttachmentList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/attachment/all',
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            return { search: this.search };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/attachmentEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/attachmentEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/attachment/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(`/attachment/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>

src/main/vue/src/views/FeeEdit.vue

@@ -0,0 +1,263 @@
+<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="121px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 500px;"
+                >
+                    <el-form-item prop="patentId" label="专利id">
+                        <el-input-number type="number" v-model="formData.patentId"></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="feeMaintenanceId" label="官费类型名称id">
+                        <el-select v-model="formData.feeMaintenanceId" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in feeMaintenanceIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="status" label="支付状态">
+                        <el-select v-model="formData.status" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in statusOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="patentPartnerId" label="专利权人">
+                        <el-select v-model="formData.patentPartnerId" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in patentPartnerIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="payPartnerId" label="支付对象">
+                        <el-select v-model="formData.payPartnerId" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in payPartnerIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="amount" label="金额">
+                        <el-input-number type="number" v-model="formData.amount"></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="currencyMaintenanceId" label="币种">
+                        <el-select v-model="formData.currencyMaintenanceId" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in currencyMaintenanceIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="paymentDeadline" label="支付期限">
+                        <el-date-picker
+                            v-model="formData.paymentDeadline"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择日期"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item prop="paymentDate" label="支付日期">
+                        <el-date-picker
+                            v-model="formData.paymentDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择日期"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item prop="remark" label="备注">
+                        <el-input type="textarea" v-model="formData.remark"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="invoiceReturn" label="是否发票回传">
+                        <el-switch v-model="formData.invoiceReturn"></el-switch>
+                    </el-form-item>
+                    <el-form-item prop="userId" label="userId">
+                        <el-input-number type="number" v-model="formData.userId"></el-input-number>
+                    </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: 'FeeEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('fee/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+        this.$http
+            .get('/maintenance/byDesc', { size: 1000, query: { del: false } })
+            .then(res => {
+                if (res.content.length > 0) {
+                    res.content.forEach(item => {
+                        this.feeMaintenanceIdOptions.push({
+                            label: item.name,
+                            value: item.name
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+        this.$http
+            .get('/partner/all', { size: 1000, query: { del: false } })
+            .then(res => {
+                if (res.content.length > 0) {
+                    res.content.forEach(item => {
+                        this.patentPartnerIdOptions.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+        this.$http
+            .get('/partner/all', { size: 1000, query: { del: false } })
+            .then(res => {
+                if (res.content.length > 0) {
+                    res.content.forEach(item => {
+                        this.payPartnerIdOptions.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+        this.$http
+            .get('/maintenance/getTree', { size: 1000, query: { del: false } })
+            .then(res => {
+                if (res.content.length > 0) {
+                    res.content.forEach(item => {
+                        this.currencyMaintenanceIdOptions.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {},
+            feeMaintenanceIdOptions: [],
+            statusOptions: [
+                { label: '已支付', value: 'PAID' },
+                { label: '未支付', value: 'UNPAID' }
+            ],
+            patentPartnerIdOptions: [],
+            payPartnerIdOptions: [],
+            currencyMaintenanceIdOptions: []
+        };
+    },
+    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('/fee/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(`/fee/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/FeeList.vue

@@ -0,0 +1,188 @@
+<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="patentId" label="专利id"> </el-table-column> -->
+            <el-table-column prop="feeMaintenanceId" label="官费类型名称id"> </el-table-column>
+            <el-table-column prop="status" label="支付状态" :formatter="statusFormatter"> </el-table-column>
+            <el-table-column prop="patentPartnerId" label="专利权人"> </el-table-column>
+            <el-table-column prop="payPartnerId" label="支付对象"> </el-table-column>
+            <el-table-column prop="amount" label="金额"> </el-table-column>
+            <el-table-column prop="currencyMaintenanceId" label="币种"> </el-table-column>
+            <el-table-column prop="paymentDeadline" label="支付期限"> </el-table-column>
+            <el-table-column prop="paymentDate" label="支付日期"> </el-table-column>
+            <el-table-column prop="remark" label="备注"> </el-table-column>
+            <el-table-column prop="invoiceReturn" label="是否发票回传">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.invoiceReturn ? '' : 'info'">{{ row.invoiceReturn }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column prop="userId" label="userId"> </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: 'FeeList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/fee/all',
+            downloading: false,
+            statusOptions: [
+                { label: '已支付', value: 'PAID' },
+                { label: '未支付', value: 'UNPAID' }
+            ]
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        statusFormatter(row, column, cellValue, index) {
+            let selectedOption = this.statusOptions.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: '/feeEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/feeEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/fee/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(`/fee/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>

src/main/vue/src/views/LogoPatentEdit.vue

@@ -0,0 +1,271 @@
+<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="136px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 500px;"
+                >
+                    <el-form-item prop="userId" label="创建申请人">
+                        <el-input-number type="number" v-model="formData.userId"></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="name" label="名称">
+                        <el-input v-model="formData.name"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="clientPartnerId" label="客户">
+                        <el-select v-model="formData.clientPartnerId" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in clientPartnerIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="applyStatus" label="案件状态">
+                        <el-select v-model="formData.applyStatus" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in applyStatusOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="logoWorkflow" label="当前流程">
+                        <el-select v-model="formData.logoWorkflow" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in logoWorkflowOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="supplierPartnerId" label="供应商">
+                        <el-select v-model="formData.supplierPartnerId" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in supplierPartnerIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="uwNo" label="寰球案号">
+                        <el-input v-model="formData.uwNo"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="applyNo" label="商标申请号">
+                        <el-input v-model="formData.applyNo"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="applyDate" label="商标申请日">
+                        <el-date-picker
+                            v-model="formData.applyDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择日期"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item prop="payRatio" label="支付比例">
+                        <el-select v-model="formData.payRatio" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in payRatioOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="contract" label="是否签约">
+                        <el-input v-model="formData.contract"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="accept" label="是否受理">
+                        <el-input v-model="formData.accept"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="correctionPeriod" label="回文补正期限">
+                        <el-date-picker
+                            v-model="formData.correctionPeriod"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择日期"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item prop="payment" label="是否缴费完成">
+                        <el-input v-model="formData.payment"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="reviewRequire" label="是否符合审查要求">
+                        <el-input v-model="formData.reviewRequire"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="rejectAll" label="是否全部驳回">
+                        <el-input v-model="formData.rejectAll"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="rejectContent" label="驳回意见">
+                        <el-input v-model="formData.rejectContent"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="rehear" label="是否复审">
+                        <el-input v-model="formData.rehear"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="reHearPayment" label="复审缴费信息">
+                        <el-input v-model="formData.reHearPayment"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="rehearResult" label="复审是否通过">
+                        <el-input v-model="formData.rehearResult"></el-input>
+                    </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: 'LogoPatentEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('logoPatent/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+        this.$http
+            .get('/partner/all', { size: 1000, query: { del: false } })
+            .then(res => {
+                if (res.content.length > 0) {
+                    res.content.forEach(item => {
+                        this.clientPartnerIdOptions.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+        this.$http
+            .get('/partner/all', { size: 1000, query: { del: false } })
+            .then(res => {
+                if (res.content.length > 0) {
+                    res.content.forEach(item => {
+                        this.supplierPartnerIdOptions.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {},
+            clientPartnerIdOptions: [],
+            applyStatusOptions: [
+                { label: '申请阶段', value: 'APPLY_STAGE' },
+                { label: '初审阶段', value: 'FIRST_REVIEW_STAGE' },
+                { label: '实审阶段', value: 'SUBSTANTIVE_STAGE' },
+                { label: '复审阶段', value: 'REVIEW_STAGE' },
+                { label: '授权阶段', value: 'GRANT_STAGE' },
+                { label: '已完成', value: 'COMPLETED' }
+            ],
+            logoWorkflowOptions: [
+                { label: '是否决定签约', value: 'IS_CONTRACT' },
+                { label: '待维护案件', value: 'TO_BE_MAINTAINED' },
+                { label: '待受理', value: 'PENDING' },
+                { label: '待审查', value: 'PENDING_REVIEW' },
+                { label: '驳回处理', value: 'DISMISS' },
+                { label: '公告初审', value: 'ANNOUNCEMENTS' },
+                { label: '证件办理', value: 'HANDLE' }
+            ],
+            supplierPartnerIdOptions: [],
+            payRatioOptions: [
+                { label: '全款', value: 'FULL_AMOUNT' },
+                { label: '首付80%', value: 'DOWN_PAYMENT_80' },
+                { label: '首付50%', value: 'DOWN_PAYMENT_50' }
+            ]
+        };
+    },
+    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('/logoPatent/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(`/logoPatent/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/LogoPatentList.vue

@@ -0,0 +1,224 @@
+<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="applyStatus" label="案件状态" :formatter="applyStatusFormatter"> </el-table-column>
+            <el-table-column prop="uwNo" label="寰球案号"> </el-table-column>
+            <el-table-column prop="name" label="专利名称"> </el-table-column>
+            <el-table-column prop="logoWorkflow" label="当前流程" :formatter="logoWorkflowFormatter"> </el-table-column>
+            <el-table-column prop="userId" label="创建申请人"> </el-table-column>
+            <el-table-column prop="applyDate" label="商标申请日"> </el-table-column>
+            <el-table-column prop="clientPartnerId" label="客户"> </el-table-column>
+            <el-table-column prop="supplierPartnerId" label="供应商"> </el-table-column>
+            <el-table-column prop="applyNo" label="商标申请号"> </el-table-column>
+            <!-- <el-table-column prop="payRatio" label="支付比例" :formatter="payRatioFormatter"> </el-table-column> -->
+            <!-- <el-table-column prop="contract" label="是否签约"> </el-table-column> -->
+            <!-- <el-table-column prop="accept" label="是否受理"> </el-table-column> -->
+            <!-- <el-table-column prop="correctionPeriod" label="回文补正期限"> </el-table-column> -->
+            <!-- <el-table-column prop="payment" label="是否缴费完成"> </el-table-column> -->
+            <!-- <el-table-column prop="reviewRequire" label="是否符合审查要求"> </el-table-column> -->
+            <!-- <el-table-column prop="rejectAll" label="是否全部驳回"> </el-table-column> -->
+            <!-- <el-table-column prop="rejectContent" label="驳回意见"> </el-table-column> -->
+            <!-- <el-table-column prop="rehear" label="是否复审"> </el-table-column> -->
+            <!-- <el-table-column prop="reHearPayment" label="复审缴费信息"> </el-table-column> -->
+            <!-- <el-table-column prop="rehearResult" 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: 'LogoPatentList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/logoPatent/all',
+            downloading: false,
+            applyStatusOptions: [
+                { label: '申请阶段', value: 'APPLY_STAGE' },
+                { label: '初审阶段', value: 'FIRST_REVIEW_STAGE' },
+                { label: '实审阶段', value: 'SUBSTANTIVE_STAGE' },
+                { label: '复审阶段', value: 'REVIEW_STAGE' },
+                { label: '授权阶段', value: 'GRANT_STAGE' },
+                { label: '已完成', value: 'COMPLETED' }
+            ],
+            logoWorkflowOptions: [
+                { label: '是否决定签约', value: 'IS_CONTRACT' },
+                { label: '待维护案件', value: 'TO_BE_MAINTAINED' },
+                { label: '待受理', value: 'PENDING' },
+                { label: '待审查', value: 'PENDING_REVIEW' },
+                { label: '驳回处理', value: 'DISMISS' },
+                { label: '公告初审', value: 'ANNOUNCEMENTS' },
+                { label: '证件办理', value: 'HANDLE' }
+            ],
+            payRatioOptions: [
+                { label: '全款', value: 'FULL_AMOUNT' },
+                { label: '首付80%', value: 'DOWN_PAYMENT_80' },
+                { label: '首付50%', value: 'DOWN_PAYMENT_50' }
+            ]
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        applyStatusFormatter(row, column, cellValue, index) {
+            let selectedOption = this.applyStatusOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        logoWorkflowFormatter(row, column, cellValue, index) {
+            let selectedOption = this.logoWorkflowOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        payRatioFormatter(row, column, cellValue, index) {
+            let selectedOption = this.payRatioOptions.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: '/logoPatentEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/logoPatentEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/logoPatent/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(`/logoPatent/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>

src/main/vue/src/views/Maintenances.vue

@@ -80,10 +80,12 @@ export default {
             this.dialogVisible = true;
         },
         showAddDialog(node, data) {
+            console.log(node.data.flag);
             this.edit = false;
             this.parent = node.data;
             this.menu = {
                 parent: node.data.id,
+                flag: node.data.flag,
                 name: '',
                 description: '',
                 active: true,
@@ -308,11 +310,7 @@ export default {
             }
         }
     },
-    watch: {
-        icon(val) {
-            this.showIcon(val);
-        }
-    }
+    watch: {}
 };
 </script>
 <style lang="less" scoped>

src/test/java/com/izouma/uwip/service/MaintenanceServiceTest.java

@@ -0,0 +1,18 @@
+package com.izouma.uwip.service;
+
+import com.izouma.uwip.ApplicationTests;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import static org.junit.Assert.*;
+
+public class MaintenanceServiceTest extends ApplicationTests {
+
+    @Autowired
+    private MaintenanceService maintenanceService;
+
+    @Test
+    public void addCount() {
+
+    }
+}