承办单位

src/main/java/com/izouma/wenlvju/domain/ArtType.java

@@ -0,0 +1,29 @@
+package com.izouma.wenlvju.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+@Where(clause = "del = 0")
+@ApiModel(value = "艺术分类")
+public class ArtType extends BaseEntity {
+    @ApiModelProperty(value = "专业代码")
+    private String code;
+
+    private int level;
+
+    private String name;
+
+    private Long parent;
+}

src/main/java/com/izouma/wenlvju/domain/Organization.java

@@ -0,0 +1,79 @@
+package com.izouma.wenlvju.domain;
+
+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.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+@ApiModel(value = "承办单位")
+public class Organization extends BaseEntity {
+    private Long userId;
+
+    @ApiModelProperty(value = "承办单位名称")
+    private String name;
+
+    @ApiModelProperty(value = "统一社会信用代码")
+    private String uscc;
+
+    private String district;
+
+    @ApiModelProperty(value = "营业执照")
+    private String businessLicense;
+
+    @ApiModelProperty(value = "负责人")
+    private String owner;
+
+    @ApiModelProperty(value = "法人姓名")
+    private String privacyPolicy;
+
+    @ApiModelProperty(value = "证件号码")
+    private String IDNo;
+
+    @ApiModelProperty(value = "简介")
+    private String introduction;
+
+    /*
+    评星定级
+     */
+//    private LocalDateTime applyTime;
+
+//    private RateStatus status;
+
+//    @ApiModelProperty(value = "是否承办考级活动")
+//    private Boolean undertakeExamination;
+
+//    @Convert(converter = StringArrayConverter.class)
+//    @ApiModelProperty(value = "承办过的考级机构名称")
+//    private List<String> examination;
+//
+//    @Convert(converter = StringArrayConverter.class)
+//    private List<String> img;
+//
+//    @ApiModelProperty(value = "专家组长")
+//    private Long expertUserId;
+//
+//    @ApiModelProperty(value = "专家组员")
+//    private List<Long> expertMemberUserId;
+//
+//    @ApiModelProperty(value = "审核开始时间")
+//    private LocalDate reviewStartTime;
+//
+//    @ApiModelProperty(value = "审核结束时间")
+//    private LocalDate reviewEndTime;
+
+    /*
+    复审结果
+    市级录入成绩
+     */
+//    private int score;
+
+}

src/main/java/com/izouma/wenlvju/domain/Organizer.java

@@ -1,78 +0,0 @@
-package com.izouma.wenlvju.domain;
-
-import com.izouma.wenlvju.converter.StringArrayConverter;
-import com.izouma.wenlvju.enums.RateStatus;
-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.Convert;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@ApiModel(value = "承办单位")
-public class Organizer extends BaseEntity {
-    private Long userId;
-
-    @ApiModelProperty(value = "承办单位名称")
-    private String name;
-
-    private String district;
-
-    @ApiModelProperty(value = "营业执照")
-    private String businessLicense;
-
-    @ApiModelProperty(value = "负责人")
-    private String owner;
-
-    @ApiModelProperty(value = "法人姓名")
-    private String privacyPolicy;
-
-    @ApiModelProperty(value = "证件号码")
-    private String IDNo;
-
-
-    /*
-    评星定级
-     */
-    private LocalDateTime applyTime;
-
-    private RateStatus status;
-
-    @ApiModelProperty(value = "是否承办考级活动")
-    private Boolean undertakeExamination;
-
-    @Convert(converter = StringArrayConverter.class)
-    @ApiModelProperty(value = "承办过的考级机构名称")
-    private List<String> examination;
-
-    @ApiModelProperty(value = "简介")
-    private String introduction;
-
-    @Convert(converter = StringArrayConverter.class)
-    private List<String> img;
-
-    @ApiModelProperty(value = "专家组长")
-    private Long expertUserId;
-
-    @ApiModelProperty(value = "专家组员")
-    private List<Long> expertMemberUserId;
-
-    @ApiModelProperty(value = "审核开始时间")
-    private LocalDate reviewStartTime;
-
-    @ApiModelProperty(value = "审核结束时间")
-    private LocalDate reviewEndTime;
-
-    private int score;
-
-
-}

src/main/java/com/izouma/wenlvju/domain/Rate.java

@@ -1,5 +1,6 @@
 package com.izouma.wenlvju.domain;
 
+import com.izouma.wenlvju.converter.LongArrayConverter;
 import com.izouma.wenlvju.converter.StringArrayConverter;
 import com.izouma.wenlvju.enums.RateStatus;
 import io.swagger.annotations.ApiModel;
@@ -12,6 +13,7 @@ import lombok.NoArgsConstructor;
 import javax.persistence.Column;
 import javax.persistence.Convert;
 import javax.persistence.Entity;
+import java.time.LocalDate;
 import java.util.List;
 
 @Data
@@ -19,7 +21,7 @@ import java.util.List;
 @NoArgsConstructor
 @Builder
 @Entity
-@ApiModel(value = "评星定级")
+@ApiModel(value = "等级评定")
 public class Rate extends BaseEntity {
     @ApiModelProperty(value = "是否承办考级活动")
     private Boolean undertakeExamination;
@@ -28,8 +30,8 @@ public class Rate extends BaseEntity {
     @ApiModelProperty(value = "承办过的考级机构名称")
     private List<String> examination;
 
-    @ApiModelProperty(value = "简介")
-    private String introduction;
+//    @ApiModelProperty(value = "简介")
+//    private String introduction;
 
     @Convert(converter = StringArrayConverter.class)
     private List<String> img;
@@ -38,8 +40,8 @@ public class Rate extends BaseEntity {
 //    private Long userId;
 
     @ApiModelProperty(value = "承办单位名称")
-    private String organizer;
-//    private Long organizerId;
+//    private String organizer;
+    private Long organizationId;
 
     @ApiModelProperty(value = "年度")
     private String year;
@@ -76,9 +78,23 @@ public class Rate extends BaseEntity {
     @ApiModelProperty(value = "房产证明")
     private List<String> property;
 
-    @ApiModelProperty(value = "专家用户id")
+    @ApiModelProperty(value = "专家组长")
     private Long expertUserId;
 
+    @Convert(converter = LongArrayConverter.class)
+    @ApiModelProperty(value = "专家组员")
+    private List<Long> expertMemberUserId;
+
+    @ApiModelProperty(value = "审核开始时间")
+    private LocalDate reviewStartTime;
+
+    @ApiModelProperty(value = "审核结束时间")
+    private LocalDate reviewEndTime;
+
+    /*
+    复审结果
+    市级录入成绩
+    */
     @ApiModelProperty(value = "分数")
     private int score;
 }

src/main/java/com/izouma/wenlvju/domain/Record.java

@@ -42,7 +42,7 @@ public class Record extends BaseEntity {
 
     @ApiModelProperty(value = "承办单位名称")
     private String organizer;
-//    private Long organizerId;
+//    private Long organizationId;
 
     @ApiModelProperty(value = "统一社会信用代码")
     private String creditCode;

src/main/java/com/izouma/wenlvju/domain/ReviewOrganization.java

@@ -0,0 +1,29 @@
+package com.izouma.wenlvju.domain;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@ApiModel("审查承办单位")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ReviewOrganization extends BaseEntity {
+    private Long userId;
+
+//    private Long organizationId;
+    private Long rateId;
+
+//    @ApiModelProperty(value = "审核时间")
+//    private LocalDateTime reviewTime;
+
+    private String content;
+
+    private List<String> img;
+
+}

src/main/java/com/izouma/wenlvju/domain/ReviewOrganizer.java

@@ -1,16 +0,0 @@
-package com.izouma.wenlvju.domain;
-
-import java.time.LocalDateTime;
-
-public class ReviewOrganizer extends BaseEntity {
-    private Long userId;
-
-    private Long organizerId;
-
-    private int score;
-
-    private LocalDateTime reviewTime;
-
-
-
-}

src/main/java/com/izouma/wenlvju/domain/User.java

@@ -4,10 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.izouma.wenlvju.annotations.Searchable;
 import com.izouma.wenlvju.config.Constants;
-import com.izouma.wenlvju.enums.ArtType;
 import com.izouma.wenlvju.security.Authority;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -75,7 +73,4 @@ public class User extends BaseEntity implements Serializable {
 
     private int age;
 
-    @ApiModelProperty(value = "艺术分类")
-    @Enumerated(EnumType.STRING)
-    private ArtType artType;
 }

src/main/java/com/izouma/wenlvju/enums/ArtType.java

@@ -1,5 +0,0 @@
-package com.izouma.wenlvju.enums;
-
-public enum ArtType {
-
-}

src/main/java/com/izouma/wenlvju/enums/RateStatus.java

@@ -1,6 +1,10 @@
 package com.izouma.wenlvju.enums;
 
 public enum RateStatus {
+    /*
+    待提交
+     */
+    SUBMIT_PENDING,
     /*
     初审中
      */

src/main/java/com/izouma/wenlvju/repo/OrganizationRepo.java

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

src/main/java/com/izouma/wenlvju/service/OrganizationService.java

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

src/main/java/com/izouma/wenlvju/web/OrganizationController.java

@@ -0,0 +1,62 @@
+package com.izouma.wenlvju.web;
+import com.izouma.wenlvju.domain.Organization;
+import com.izouma.wenlvju.service.OrganizationService;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.exception.BusinessException;
+import com.izouma.wenlvju.repo.OrganizationRepo;
+import com.izouma.wenlvju.utils.ObjUtils;
+import com.izouma.wenlvju.utils.SecurityUtils;
+import com.izouma.wenlvju.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("/organization")
+@AllArgsConstructor
+public class OrganizationController extends BaseController {
+    private OrganizationService organizationService;
+    private OrganizationRepo organizationRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Organization save(@RequestBody Organization record) {
+        if (record.getId() != null) {
+            Organization orig = organizationRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return organizationRepo.save(orig);
+        }
+        record.setUserId(SecurityUtils.getAuthenticatedUser().getId());
+        return organizationRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<Organization> all(@RequestBody PageQuery pageQuery) {
+        return organizationService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public Organization get(@PathVariable Long id) {
+        return organizationRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        organizationRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Organization> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/resources/genjson/Organization.json

@@ -0,0 +1 @@
+{"tableName":"Organization","className":"Organization","remark":"承办单位","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/java/com/izouma/wenlvju","viewPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"name","modelName":"name","remark":"承办单位名称","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"district","modelName":"district","remark":"区","showInList":true,"showInForm":true,"formType":"select","apiFlag":"2","optionsMethod":"/district/NJ","optionsValue":"name","optionsLabel":"name"},{"name":"businessLicense","modelName":"businessLicense","remark":"营业执照","showInList":true,"showInForm":true,"formType":"singleImage"},{"name":"owner","modelName":"owner","remark":"负责人","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"privacyPolicy","modelName":"privacyPolicy","remark":"法人姓名","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"IDNo","modelName":"IDNo","remark":"证件号码","showInList":true,"showInForm":true,"formType":"singleLineText","validatorType":"id"},{"name":"introduction","modelName":"introduction","remark":"简介","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.wenlvju","tablePackage":"com.izouma.wenlvju.domain.Organization"}

src/main/vue/src/router.js

@@ -265,6 +265,30 @@ const router = new Router({
                     meta: {
                         title: '评星定级'
                     }
+                },
+                {
+                    path: '/organizationEdit',
+                    name: 'OrganizationEdit',
+                    component: () => import(/* webpackChunkName: "organizationEdit" */ '@/views/OrganizationEdit.vue'),
+                    meta: {
+                        title: '承办单位编辑'
+                    }
+                },
+                {
+                    path: '/organizationList',
+                    name: 'OrganizationList',
+                    component: () => import(/* webpackChunkName: "organizationList" */ '@/views/OrganizationList.vue'),
+                    meta: {
+                        title: '承办单位'
+                    }
+                },
+                {
+                    path: '/organization',
+                    name: 'Organization',
+                    component: () => import(/* webpackChunkName: "organization" */ '@/views/Organization.vue'),
+                    meta: {
+                        title: '承办单位'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/Dashboard.vue

@@ -42,11 +42,11 @@ export default {
     data() {
         return {
             layout: [
-                // { x: 0, y: 0, w: 6, h: 4, i: '0', name: 'UserWidget' },
-                // { x: 6, y: 0, w: 6, h: 4, i: '1', name: 'UserWidget' },
-                // { x: 0, y: 4, w: 6, h: 6, i: '2', name: 'BarChartWidget' },
-                // { x: 0, y: 10, w: 6, h: 6, i: '3', name: 'LineChartWidget' },
-                // { x: 6, y: 4, w: 6, h: 12, i: '4', name: 'PieChartWidget' }
+                { x: 0, y: 0, w: 6, h: 4, i: '0', name: 'UserWidget' },
+                { x: 6, y: 0, w: 6, h: 4, i: '1', name: 'UserWidget' },
+                { x: 0, y: 4, w: 6, h: 6, i: '2', name: 'BarChartWidget' },
+                { x: 0, y: 10, w: 6, h: 6, i: '3', name: 'LineChartWidget' },
+                { x: 6, y: 4, w: 6, h: 12, i: '4', name: 'PieChartWidget' }
             ],
             editable: false
         };

src/main/vue/src/views/Organization.vue

@@ -0,0 +1,32 @@
+<template>
+    <div class="edit-view">
+        <el-tabs v-model="active" @tab-click="handleClick">
+            <el-tab-pane label="基本信息" name="first"><OrganizationEdit ref="page1" @next="goNext"/></el-tab-pane>
+            <el-tab-pane label="申请信息" name="second"><RateEdit ref="page2"/></el-tab-pane>
+        </el-tabs>
+    </div>
+</template>
+<script>
+import OrganizationEdit from './OrganizationEdit.vue';
+import RateEdit from './RateEdit.vue';
+export default {
+    name: 'Organization',
+    created() {},
+    data() {
+        return {
+            active: 'first'
+        };
+    },
+    methods: {
+        goNext(page) {
+            this.active = page;
+            this.$refs.page2.init();
+        }
+    },
+    components: {
+        OrganizationEdit,
+        RateEdit
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/OrganizationEdit.vue

@@ -0,0 +1,138 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="128px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="name" label="承办单位名称">
+                <el-input v-model="formData.name"></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="district" label="区">
+                <el-select v-model="formData.district" clearable filterable placeholder="请选择">
+                    <el-option
+                        v-for="item in districtOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="businessLicense" label="营业执照">
+                <single-upload v-model="formData.businessLicense"></single-upload>
+            </el-form-item>
+            <el-form-item prop="owner" label="负责人">
+                <el-input v-model="formData.owner"></el-input>
+            </el-form-item>
+            <el-form-item prop="privacyPolicy" label="法人姓名">
+                <el-input v-model="formData.privacyPolicy"></el-input>
+            </el-form-item>
+            <el-form-item prop="IDNo" label="证件号码">
+                <el-input v-model="formData.IDNo"></el-input>
+            </el-form-item>
+            <el-form-item prop="introduction" label="简介">
+                <el-input type="textarea" :autosize="{ minRows: 2 }" v-model="formData.introduction"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving" type="primary">保存基本信息</el-button>
+                <!-- <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id">删除 </el-button> -->
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+export default {
+    name: 'OrganizationEdit',
+    created() {
+        if (this.$route.query.organId) {
+            this.$http
+                .get('organization/get/' + this.$route.query.organId)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+        this.$http
+            .get('/district/NJ', { size: 1000, query: { del: false } })
+            .then(res => {
+                if (res.length > 0) {
+                    res.forEach(item => {
+                        this.districtOptions.push({
+                            label: item.name,
+                            value: item.name
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {},
+            districtOptions: []
+        };
+    },
+    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('/organization/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(`/organization/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/OrganizationList.vue

@@ -0,0 +1,171 @@
+<template>
+    <div class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
+            <el-button
+                @click="download"
+                type="primary"
+                icon="el-icon-download"
+                :loading="downloading"
+                class="filter-item"
+                >导出EXCEL
+            </el-button>
+        </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="name" label="承办单位名称"> </el-table-column>
+            <el-table-column prop="district" label="区"> </el-table-column>
+            <el-table-column prop="businessLicense" label="营业执照">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.businessLicense"
+                        fit="cover"
+                        :preview-src-list="[row.businessLicense]"
+                    ></el-image>
+                </template>
+            </el-table-column>
+            <el-table-column prop="owner" label="负责人"> </el-table-column>
+            <el-table-column prop="privacyPolicy" label="法人姓名"> </el-table-column>
+            <el-table-column prop="IDNo" label="证件号码"> </el-table-column>
+            <el-table-column prop="introduction" 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: 'OrganizationList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/organization/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: '/organizationEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/organizationEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/organization/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(`/organization/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/RateEdit.vue

@@ -45,7 +45,10 @@
                 <file-upload v-model="formData.property"></file-upload>
             </el-form-item>
             <el-form-item>
-                <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+                <el-button @click="onSave('SUBMIT_PENDING')" :loading="saving" type="primary">保存申请信息</el-button>
+                <el-button @click="onSave('FIRST_REVIEW_PENDING')" :loading="saving" type="success"
+                    >提交申请信息</el-button
+                >
                 <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id">删除 </el-button>
                 <el-button @click="$router.go(-1)">取消</el-button>
             </el-form-item>
@@ -57,9 +60,9 @@ import { mapState } from 'vuex';
 export default {
     name: 'RateEdit',
     created() {
-        if (this.$route.query.id) {
+        if (this.$route.query.rateId) {
             this.$http
-                .get('rate/get/' + this.$route.query.id)
+                .get('rate/get/' + this.$route.query.rateId)
                 .then(res => {
                     this.formData = res;
                 })
@@ -75,6 +78,7 @@ export default {
             formData: {},
             rules: {},
             statusOptions: [
+                { label: '待提交', value: 'SUBMIT_PENDING' },
                 { label: '初审中', value: 'FIRST_REVIEW_PENDING' },
                 { label: '初审通过', value: 'FIRST_REVIEW_PASS' },
                 { label: '专家通过', value: 'EXPERT_PASS' }
@@ -85,20 +89,20 @@ export default {
         ...mapState(['userInfo'])
     },
     methods: {
-        onSave() {
+        onSave(status) {
             this.$refs.form.validate(valid => {
                 if (valid) {
-                    this.submit();
+                    this.submit(status);
                 } else {
                     return false;
                 }
             });
         },
-        submit() {
+        submit(status) {
             let data = { ...this.formData };
             data.userId = this.userInfo.id;
             data.organizer = this.userInfo.nickname;
-            data.status = 'FIRST_REVIEW_PENDING';
+            // data.status = 'FIRST_REVIEW_PENDING';
 
             this.saving = true;
             this.$http

src/main/vue/src/views/RateList.vue

@@ -192,7 +192,7 @@ export default {
         },
         editRow(row) {
             this.$router.push({
-                path: '/rateEdit',
+                path: '/organization',
                 query: {
                     id: row.id
                 }

src/main/vue/src/views/RateOrganizerList.vue

@@ -108,7 +108,7 @@ export default {
         },
         addRow() {
             this.$router.push({
-                path: '/rateEdit',
+                path: '/organization',
                 query: {
                     ...this.$route.query
                 }
@@ -116,9 +116,10 @@ export default {
         },
         editRow(row) {
             this.$router.push({
-                path: '/rateEdit',
+                path: '/organization',
                 query: {
-                    id: row.id
+                    organId: row.organizationId,
+                    rateId: row.id
                 }
             });
         },

src/main/vue/src/widgets/UserWidget.vue

@@ -2,7 +2,7 @@
     <widget-card :bodyStyle="bodyStyle">
         <i class="fa-fw fas fa-user fa-3x" style="color: #40c9c6;"></i>
         <div class="info">
-            <div class="text">User</div>
+            <div class="text">承办单位</div>
             <div class="num">4,258</div>
         </div>
     </widget-card>