客户/供应商页面

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

@@ -7,9 +7,12 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Entity;
+
 @AllArgsConstructor
 @Data
 @Builder
+@Entity
 @NoArgsConstructor
 @ApiModel(value = "对接人")
 public class Docking extends BaseEntity {

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

@@ -21,7 +21,7 @@ public class Fee extends BaseEntity {
     private Long patentId;
 
     @ApiModelProperty(value = "官费类型名称id")
-    private Long typeMaintenanceId;
+    private Long feeMaintenanceId;
 
     private PayStatus status;
 

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

@@ -0,0 +1,78 @@
+package com.izouma.uwip.domain;
+
+import com.izouma.uwip.enums.ApplyStatus;
+import com.izouma.uwip.enums.PayRatio;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import java.time.LocalDate;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "商标专利申请")
+public class LogoPatent extends BaseEntity {
+    private String name;
+
+    @ApiModelProperty(value = "客户id")
+    private Long clientPartnerId;
+
+    @Enumerated(EnumType.STRING)
+    private ApplyStatus applyStatus;
+
+    @ApiModelProperty(value = "供应商")
+    private Long supplierPartnerId;
+
+    /*
+    客户编码（由客户经理填写）+年份+案件类型+连接符+案件阶段[+国家]+序列号
+    */
+    @ApiModelProperty(value = "寰球案号")
+    private String uwNo;
+
+    @ApiModelProperty(value = "商标申请号")
+    private String applyNo;
+
+    @ApiModelProperty(value = "商标申请日")
+    private LocalDate applyDate;
+
+    @Enumerated(EnumType.STRING)
+    @ApiModelProperty(value = "支付比例")
+    private PayRatio payRatio;
+
+    @ApiModelProperty(value = "是否签约")
+    private boolean contract;
+
+    @ApiModelProperty(value = "是否受理")
+    private boolean accept;
+
+    @ApiModelProperty(value = "回文补正期限")
+    private LocalDate correctionPeriod;
+
+    @ApiModelProperty(value = "是否缴费完成")
+    private boolean payment;
+
+    @ApiModelProperty(value = "是否符合审查要求")
+    private boolean reviewRequire;
+
+    @ApiModelProperty(value = "是否全部驳回")
+    private boolean rejectAll;
+
+    @ApiModelProperty(value = "驳回意见")
+    private boolean rejectContent;
+
+    @ApiModelProperty(value = "是否复审")
+    private boolean rehear;
+
+    @ApiModelProperty(value = "复审缴费信息")
+    private String reHearPayment;
+
+    @ApiModelProperty(value = "复审是否通过")
+    private String rehearResult;
+}

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

@@ -6,10 +6,13 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Entity;
+
 @AllArgsConstructor
 @Data
 @Builder
 @NoArgsConstructor
+@Entity
 @ApiModel(value = "维护信息")
 public class Maintenance extends BaseEntity {
 

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

@@ -9,6 +9,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 
@@ -16,6 +17,7 @@ import javax.persistence.Enumerated;
 @Data
 @Builder
 @NoArgsConstructor
+@Entity
 @ApiModel(value = "客户/供应商管理")
 public class Partner extends BaseEntity {
     /**

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

@@ -0,0 +1,16 @@
+package com.izouma.uwip.enums;
+
+public enum PayRatio {
+    /*
+    全款
+     */
+    FULL_AMOUNT,
+    /*
+    首付80%
+     */
+    DOWN_PAYMENT_80,
+    /*
+    首付50%
+     */
+    DOWN_PAYMENT_50
+}

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,60 @@
+package com.izouma.uwip.web;
+import com.izouma.uwip.domain.Docking;
+import com.izouma.uwip.service.DockingService;
+import com.izouma.uwip.dto.PageQuery;
+import com.izouma.uwip.exception.BusinessException;
+import com.izouma.uwip.repo.DockingRepo;
+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("/docking")
+@AllArgsConstructor
+public class DockingController extends BaseController {
+    private DockingService dockingService;
+    private DockingRepo dockingRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Docking save(@RequestBody Docking record) {
+        if (record.getId() != null) {
+            Docking orig = dockingRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return dockingRepo.save(orig);
+        }
+        return dockingRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<Docking> all(@RequestBody PageQuery pageQuery) {
+        return dockingService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public Docking get(@PathVariable Long id) {
+        return dockingRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        dockingRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Docking> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

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

@@ -0,0 +1,60 @@
+package com.izouma.uwip.web;
+import com.izouma.uwip.domain.Partner;
+import com.izouma.uwip.service.PartnerService;
+import com.izouma.uwip.dto.PageQuery;
+import com.izouma.uwip.exception.BusinessException;
+import com.izouma.uwip.repo.PartnerRepo;
+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("/partner")
+@AllArgsConstructor
+public class PartnerController extends BaseController {
+    private PartnerService partnerService;
+    private PartnerRepo partnerRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Partner save(@RequestBody Partner record) {
+        if (record.getId() != null) {
+            Partner orig = partnerRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return partnerRepo.save(orig);
+        }
+        return partnerRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<Partner> all(@RequestBody PageQuery pageQuery) {
+        return partnerService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public Partner get(@PathVariable Long id) {
+        return partnerRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        partnerRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Partner> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/resources/genjson/Docking.json

@@ -0,0 +1 @@
+{"tableName":"Docking","className":"Docking","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":"partnerId","modelName":"partnerId","remark":"客户id","showInList":true,"showInForm":true,"formType":"number"},{"name":"name","modelName":"name","remark":"姓名","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"phone","modelName":"phone","remark":"电话","showInList":true,"showInForm":true,"formType":"singleLineText","validate":true,"validatorType":"phone"},{"name":"email","modelName":"email","remark":"邮箱","showInList":true,"showInForm":true,"formType":"singleLineText","validate":true,"validatorType":"email"},{"name":"jobTitle","modelName":"jobTitle","remark":"职务","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.uwip","tablePackage":"com.izouma.uwip.domain.Docking"}

src/main/vue/src/router.js

@@ -102,6 +102,38 @@ const router = new Router({
                     meta: {
                         title: '上传'
                     }
+                },
+                {
+                    path: '/partnerEdit',
+                    name: 'PartnerEdit',
+                    component: () => import(/* webpackChunkName: "partnerEdit" */ '@/views/PartnerEdit.vue'),
+                    meta: {
+                        title: '客户管理编辑'
+                    }
+                },
+                {
+                    path: '/partnerList',
+                    name: 'PartnerList',
+                    component: () => import(/* webpackChunkName: "partnerList" */ '@/views/PartnerList.vue'),
+                    meta: {
+                        title: '客户管理'
+                    }
+                },
+                {
+                    path: '/dockingEdit',
+                    name: 'DockingEdit',
+                    component: () => import(/* webpackChunkName: "dockingEdit" */ '@/views/DockingEdit.vue'),
+                    meta: {
+                        title: '对接人编辑'
+                    }
+                },
+                {
+                    path: '/dockingList',
+                    name: 'DockingList',
+                    component: () => import(/* webpackChunkName: "dockingList" */ '@/views/DockingList.vue'),
+                    meta: {
+                        title: '对接人'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/DockingEdit.vue

@@ -0,0 +1,132 @@
+<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">
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="65px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 500px;"
+                >
+                    <el-form-item prop="partnerId" label="客户id">
+                        <el-input-number type="number" v-model="formData.partnerId"></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="phone" label="电话">
+                        <el-input v-model="formData.phone"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="email" label="邮箱">
+                        <el-input v-model="formData.email"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="jobTitle" label="职务">
+                        <el-input v-model="formData.jobTitle"></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: 'DockingEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('docking/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: {
+                phone: [
+                    {
+                        pattern: /^1[3-9]\d{9}$/,
+                        message: '请输入正确的手机号',
+                        trigger: 'blur'
+                    }
+                ],
+                email: [
+                    {
+                        type: 'email',
+                        message: '请输入正确的邮箱地址',
+                        trigger: 'blur'
+                    }
+                ]
+            }
+        };
+    },
+    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('/docking/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(`/docking/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/DockingList.vue

@@ -0,0 +1,166 @@
+<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="partnerId" label="客户id"> </el-table-column>
+            <el-table-column prop="name" label="姓名"> </el-table-column>
+            <el-table-column prop="phone" label="电话"> </el-table-column>
+            <el-table-column prop="email" label="邮箱"> </el-table-column>
+            <el-table-column prop="jobTitle" 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: 'DockingList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/docking/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: '/dockingEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/dockingEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/docking/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(`/docking/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/PartnerEdit.vue

@@ -0,0 +1,168 @@
+<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">
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="136px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 500px;"
+                >
+                    <el-form-item prop="type" label="type">
+                        <el-select v-model="formData.type" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in typeOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="supplierType" label="供应商类型">
+                        <el-select v-model="formData.supplierType" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in supplierTypeOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="code" label="客户代码">
+                        <el-input v-model="formData.code"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="name" label="个人/企业名称中">
+                        <el-input v-model="formData.name"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="enName" label="个人/企业名称英">
+                        <el-input v-model="formData.enName"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="address" label="注册地址中">
+                        <el-input v-model="formData.address"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="enAddress" label="注册地址英">
+                        <el-input v-model="formData.enAddress"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="uscc" label="统一社会信用代码">
+                        <el-input v-model="formData.uscc"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="billingName" label="开票名称">
+                        <el-input v-model="formData.billingName"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="taxID" label="税号">
+                        <el-input v-model="formData.taxID"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="billingAddress" label="开票地址">
+                        <el-input v-model="formData.billingAddress"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="billingPhone" label="开票电话">
+                        <el-input v-model="formData.billingPhone"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="accountBank" label="开户行">
+                        <el-input v-model="formData.accountBank"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="account" label="账号">
+                        <el-input v-model="formData.account"></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: 'PartnerEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('partner/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: {},
+            typeOptions: [
+                { label: '供应商', value: 'SUPPLIER' },
+                { label: '经销商', value: 'CLIENT' }
+            ],
+            supplierTypeOptions: [
+                { label: '境内', value: 'DOMESTIC' },
+                { label: '境外', value: 'ABROAD' }
+            ]
+        };
+    },
+    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('/partner/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(`/partner/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/PartnerList.vue

@@ -0,0 +1,198 @@
+<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="type" label="type" :formatter="typeFormatter"> </el-table-column>
+            <el-table-column prop="supplierType" label="供应商类型" :formatter="supplierTypeFormatter">
+            </el-table-column>
+            <el-table-column prop="code" label="客户代码"> </el-table-column>
+            <el-table-column prop="name" label="个人/企业名称中"> </el-table-column>
+            <el-table-column prop="enName" label="个人/企业名称英"> </el-table-column>
+            <el-table-column prop="address" label="注册地址中"> </el-table-column>
+            <el-table-column prop="enAddress" label="注册地址英"> </el-table-column>
+            <el-table-column prop="uscc" label="统一社会信用代码"> </el-table-column>
+            <el-table-column prop="billingName" label="开票名称"> </el-table-column>
+            <el-table-column prop="taxID" label="税号"> </el-table-column>
+            <el-table-column prop="billingAddress" label="开票地址"> </el-table-column>
+            <el-table-column prop="billingPhone" label="开票电话"> </el-table-column>
+            <el-table-column prop="accountBank" label="开户行"> </el-table-column>
+            <el-table-column prop="account" 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: 'PartnerList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/partner/all',
+            downloading: false,
+            typeOptions: [
+                { label: '供应商', value: 'SUPPLIER' },
+                { label: '经销商', value: 'CLIENT' }
+            ],
+            supplierTypeOptions: [
+                { label: '境内', value: 'DOMESTIC' },
+                { label: '境外', value: 'ABROAD' }
+            ]
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        typeFormatter(row, column, cellValue, index) {
+            let selectedOption = this.typeOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        supplierTypeFormatter(row, column, cellValue, index) {
+            let selectedOption = this.supplierTypeOptions.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: '/partnerEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/partnerEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/partner/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(`/partner/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>