评星定级修改

src/main/java/com/izouma/wenlvju/converter/ReviewTimeListConverter.java

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

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

@@ -0,0 +1,23 @@
+package com.izouma.wenlvju.domain;
+
+import io.swagger.annotations.ApiModel;
+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 GradingOrganization extends BaseEntity {
+    private String code;
+
+    private String name;
+}

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

@@ -55,4 +55,7 @@ public class Organization extends BaseEntity {
     @ApiModelProperty(value = "证件号码")
     private String IDNo;
 
+    @ApiModelProperty(value = "经营范围")
+    private String businessScope;
+
 }

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

@@ -2,8 +2,10 @@ package com.izouma.wenlvju.domain;
 
 import com.izouma.wenlvju.converter.LongArrayConverter;
 import com.izouma.wenlvju.converter.RateAuditListConverter;
+import com.izouma.wenlvju.converter.ReviewTimeListConverter;
 import com.izouma.wenlvju.converter.StringArrayConverter;
 import com.izouma.wenlvju.dto.RateAudit;
+import com.izouma.wenlvju.dto.ReviewTime;
 import com.izouma.wenlvju.enums.OrganizationGrade;
 import com.izouma.wenlvju.enums.RateStatus;
 import io.swagger.annotations.ApiModel;
@@ -88,9 +90,14 @@ public class Rate extends BaseEntity {
 
     @Column(columnDefinition = "TEXT")
     @Convert(converter = StringArrayConverter.class)
-    @ApiModelProperty(value = "消防卫生")
+    @ApiModelProperty(value = "消防安全")
     private List<String> fire;
 
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = StringArrayConverter.class)
+    @ApiModelProperty(value = "卫生防疫")
+    private List<String> hygiene;
+
     @Column(columnDefinition = "TEXT")
     @Convert(converter = StringArrayConverter.class)
     @ApiModelProperty(value = "财务报表")
@@ -117,6 +124,9 @@ public class Rate extends BaseEntity {
     @ApiModelProperty(value = "审核结束时间")
     private LocalDate reviewEndTime;
 
+    @ApiModelProperty(value = "审查时间")
+    private LocalDateTime reviewTime;
+
     /*
     复审结果
     市级录入成绩
@@ -140,4 +150,8 @@ public class Rate extends BaseEntity {
     @Column(columnDefinition = "TEXT")
     @Convert(converter = RateAuditListConverter.class)
     private List<RateAudit> rateAudits = new ArrayList<>();
+
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = ReviewTimeListConverter.class)
+    private List<ReviewTime> reviewTimes = new ArrayList<>();
 }

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

@@ -0,0 +1,27 @@
+package com.izouma.wenlvju.domain;
+
+import io.swagger.annotations.ApiModel;
+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 Setting extends BaseEntity {
+    private Long parent;
+
+    private String name;
+
+    private String code;
+
+    private int flag;
+}

src/main/java/com/izouma/wenlvju/dto/ReviewTime.java

@@ -0,0 +1,21 @@
+package com.izouma.wenlvju.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ReviewTime {
+    private LocalDateTime reviewTime;
+
+    @ApiModelProperty(value = "操作时间")
+    private LocalDateTime operatingTime;
+
+}

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

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

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

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

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

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

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

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

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

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

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

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

src/main/resources/genjson/GradingOrganization.json

@@ -0,0 +1 @@
+{"tableName":"GradingOrganization","className":"GradingOrganization","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":"code","modelName":"code","remark":"代码","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.wenlvju","tablePackage":"com.izouma.wenlvju.domain.GradingOrganization"}

src/main/resources/genjson/Setting.json

@@ -0,0 +1 @@
+{"tableName":"Setting","className":"Setting","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":"code","modelName":"code","remark":"编码","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.wenlvju","tablePackage":"com.izouma.wenlvju.domain.Setting"}

src/main/vue/src/mixins/rateStatus.js

@@ -2,8 +2,9 @@ export default {
     data() {
         return {
             statusOptions: [
+                { label: '草稿', value: '' },
                 { label: '等待初审', value: 'FIRST_REVIEW_PENDING' },
-                { label: '待分配专家组', value: 'ASSIGN_EXPERT' },
+                { label: '已上报', value: 'ASSIGN_EXPERT' },
                 { label: '待专家组考察', value: 'REVIEW_PENDING' },
                 { label: '初审驳回', value: 'FIRST_REVIEW_DENY' },
                 { label: '最终评审', value: 'SUBMIT_GRADE' },

src/main/vue/src/router.js

@@ -116,7 +116,7 @@ const router = new Router({
                     name: 'organization',
                     component: () => import(/* webpackChunkName: "userList" */ '@/views/organization/Organization.vue'),
                     meta: {
-                        title: '评星定级'
+                        title: '等级评定'
                     }
                 },
                 {
@@ -271,7 +271,7 @@ const router = new Router({
                     name: 'RateEdit',
                     component: () => import(/* webpackChunkName: "rateEdit" */ '@/views/organization/RateEdit.vue'),
                     meta: {
-                        title: '评星定级编辑'
+                        title: '等级评定申请'
                     }
                 },
                 {
@@ -280,7 +280,7 @@ const router = new Router({
                     component: () =>
                         import(/* webpackChunkName: "rateList" */ '@/views/organization/RateOrganizerList.vue'),
                     meta: {
-                        title: '评星定级'
+                        title: '等级评定'
                     }
                 },
                 {
@@ -288,7 +288,7 @@ const router = new Router({
                     name: 'RateExpertList',
                     component: () => import(/* webpackChunkName: "rateList" */ '@/views/RateExpertList.vue'),
                     meta: {
-                        title: '评星定级'
+                        title: '等级评定'
                     }
                 },
                 {
@@ -296,7 +296,7 @@ const router = new Router({
                     name: 'RateAudit',
                     component: () => import(/* webpackChunkName: "rateAudit" */ '@/views/RateAudit.vue'),
                     meta: {
-                        title: '评星定级详情'
+                        title: '等级评定申请'
                     }
                 },
                 {
@@ -312,7 +312,7 @@ const router = new Router({
                     name: 'RateList',
                     component: () => import(/* webpackChunkName: "rateList" */ '@/views/RateList.vue'),
                     meta: {
-                        title: '评星定级'
+                        title: '等级评定'
                     }
                 },
                 {
@@ -380,6 +380,40 @@ const router = new Router({
                     meta: {
                         title: '评分细则'
                     }
+                },
+                {
+                    path: '/gradingOrganizationEdit',
+                    name: 'GradingOrganizationEdit',
+                    component: () =>
+                        import(/* webpackChunkName: "gradingOrganizationEdit" */ '@/views/GradingOrganizationEdit.vue'),
+                    meta: {
+                        title: '考级机构编辑'
+                    }
+                },
+                {
+                    path: '/gradingOrganizationList',
+                    name: 'GradingOrganizationList',
+                    component: () =>
+                        import(/* webpackChunkName: "gradingOrganizationList" */ '@/views/GradingOrganizationList.vue'),
+                    meta: {
+                        title: '考级机构'
+                    }
+                },
+                {
+                    path: '/settingEdit',
+                    name: 'SettingEdit',
+                    component: () => import(/* webpackChunkName: "settingEdit" */ '@/views/SettingEdit.vue'),
+                    meta: {
+                        title: '设置编辑'
+                    }
+                },
+                {
+                    path: '/settingList',
+                    name: 'SettingList',
+                    component: () => import(/* webpackChunkName: "settingList" */ '@/views/SettingList.vue'),
+                    meta: {
+                        title: '设置'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/GradingOrganizationEdit.vue

@@ -0,0 +1,95 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="52px"
+            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="code" label="代码">
+                <el-input v-model="formData.code"></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: 'GradingOrganizationEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('gradingOrganization/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('/gradingOrganization/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(`/gradingOrganization/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/GradingOrganizationList.vue

@@ -0,0 +1,157 @@
+<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="code" 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: 'GradingOrganizationList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/gradingOrganization/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: '/gradingOrganizationEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/gradingOrganizationEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/gradingOrganization/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(`/gradingOrganization/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/Login.vue

@@ -2,26 +2,44 @@
     <div class="container" :style="{ backgroundImage: 'url(' + require('../assets/login_bg.jpg') + ')' }">
         <transition :name="`slide-${register ? 'in' : 'out'}`">
             <div class="login-wrapper" @keyup.enter="doRegister" v-if="register" key="register">
-                <div class="title">南京市社会艺术水平考级系统注册</div>
+                <div class="title">南京市社会艺术水平考级管理服务系统注册</div>
                 <el-page-header @back="register = false" title="登录" style="width: 350px; line-height: 55px">
                     <div class="register-title" slot="content">注册账号</div>
                 </el-page-header>
 
                 <el-form :model="registerInfo" style="width: 350px" ref="registerForm">
-                    <el-form-item prop="username" :rules="{ required: true, message: '请输入用户名', trigger: 'blur' }">
+                    <el-form-item
+                        prop="username"
+                        label="用户名"
+                        :rules="{ required: true, message: '请输入用户名', trigger: 'blur' }"
+                    >
                         <el-input v-model="registerInfo.username" placeholder="用户名"> </el-input>
                     </el-form-item>
-                    <el-form-item prop="password" :rules="{ required: true, message: '请输入密码', trigger: 'blur' }">
+                    <el-form-item
+                        prop="password"
+                        label="密码"
+                        :rules="{ required: true, message: '请输入密码', trigger: 'blur' }"
+                    >
+                        <el-input v-model="registerInfo.password" placeholder="密码" type="password"></el-input>
+                    </el-form-item>
+                    <el-form-item
+                        prop="password"
+                        label="确认密码"
+                        :rules="{ required: true, message: '请输入密码', trigger: 'blur' }"
+                    >
                         <el-input v-model="registerInfo.password" placeholder="密码" type="password"></el-input>
                     </el-form-item>
+
                     <el-form-item
                         prop="organizationName"
+                        label="承办单位名称"
                         :rules="{ required: true, message: '请输入承办单位名称', trigger: 'blur' }"
                     >
                         <el-input v-model="registerInfo.organizationName" placeholder="承办单位名称"> </el-input>
                     </el-form-item>
                     <el-form-item
                         prop="phone"
+                        label="手机号"
                         :rules="{
                             required: true,
                             message: '请输入正确的手机号',
@@ -33,6 +51,7 @@
                     </el-form-item>
                     <el-form-item
                         prop="email"
+                        label="电子邮箱"
                         :rules="{
                             required: true,
                             message: '请输入正确的电子邮箱',
@@ -44,6 +63,7 @@
                     </el-form-item>
                     <el-form-item
                         prop="examinationAgency"
+                        label="发证机构"
                         :rules="{ required: true, message: '请选择发证机构', trigger: 'blur' }"
                     >
                         <el-select
@@ -62,6 +82,7 @@
                     </el-form-item>
                     <el-form-item
                         prop="district"
+                        label="注册地址"
                         :rules="{ required: true, message: '请选择注册地址', trigger: 'blur' }"
                     >
                         <!-- <district-choose v-model="registerInfo.district"></district-choose> -->
@@ -88,7 +109,7 @@
                 </el-form>
             </div>
             <div class="login-wrapper" @keyup.enter="login" v-else key="login">
-                <div class="title">南京市社会艺术水平考级系统</div>
+                <div class="title">南京市社会艺术水平考级管理服务系统</div>
                 <el-tabs v-model="activeName" stretch class="tab-list">
                     <el-tab-pane label="用户名登陆" name="first">
                         <el-form size="medium" :model="userInfo" style="width: 380px" ref="form">
@@ -445,6 +466,9 @@ export default {
         padding: 14px 12px;
     }
 }
+.input-width {
+    width: 285px;
+}
 </style>
 <style lang="less">
 .login-wrapper {

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

@@ -53,7 +53,7 @@
                         size="mini"
                         plain
                     >
-                        通过
+                        同意上报
                     </el-button>
                     <el-button
                         v-if="row.status === 'FIRST_REVIEW_PENDING'"
@@ -63,7 +63,7 @@
                         size="mini"
                         plain
                     >
-                        驳回
+                        退回
                     </el-button>
                     <el-button v-if="row.status === 'SUBMIT_GRADE'" @click="openScore(row)" type="warning" plain
                         >填写分数</el-button
@@ -84,7 +84,7 @@
                         @click="saveComplete(row)"
                         >完成</el-button
                     >
-                    <el-button @click="editRow(row)" type="primary" size="mini" plain>查看附件</el-button>
+                    <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>

src/main/vue/src/views/SettingEdit.vue

@@ -0,0 +1,95 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="52px"
+            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="code" label="编码">
+                <el-input v-model="formData.code"></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: 'SettingEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('setting/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('/setting/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(`/setting/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/SettingList.vue

@@ -0,0 +1,157 @@
+<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="code" 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: 'SettingList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/setting/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: '/settingEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/settingEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/setting/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(`/setting/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/organization/OrganizationInfo.vue

@@ -108,6 +108,17 @@
                         ></el-input>
                     </div>
                 </div>
+                <div class="info-item address">
+                    <div class="name">经营范围</div>
+                    <div class="val">
+                        <el-input
+                            type="textarea"
+                            :autosize="{ minRows: 3, maxRows: 4 }"
+                            placeholder="请输入经营范围"
+                            v-model="formData.businessScope"
+                        ></el-input>
+                    </div>
+                </div>
                 <div class="info-item">
                     <div class="name">营业执照</div>
                     <div class="val">

src/main/vue/src/views/organization/RateEdit.vue

@@ -168,11 +168,19 @@
                 <div class="info-item address">
                     <!-- <div class="name">消防卫生</div> -->
                     <div class="val">
-                        <el-form-item prop="fire" label="消防卫生">
+                        <el-form-item prop="fire" label="消防安全">
                             <file-upload v-model="formData.fire" :readonly="readonly"></file-upload>
                         </el-form-item>
                     </div>
                 </div>
+                <div class="info-item address">
+                    <!-- <div class="name">消防卫生</div> -->
+                    <div class="val">
+                        <el-form-item prop="hygiene" label="卫生防疫">
+                            <file-upload v-model="formData.hygiene" :readonly="readonly"></file-upload>
+                        </el-form-item>
+                    </div>
+                </div>
                 <div class="info-item address">
                     <!-- <div class="name">财务报表</div> -->
                     <div class="val">
@@ -344,7 +352,6 @@ export default {
                 privacyPolicy: [
                     {
                         required: true,
-                        regexp: /^[_.@A-Za-z0-9-]*$/,
                         message: '请上传法人资格',
                         trigger: 'blur'
                     }
@@ -352,7 +359,6 @@ export default {
                 business: [
                     {
                         required: true,
-                        regexp: /^[_.@A-Za-z0-9-]*$/,
                         message: '请上传业务内容',
                         trigger: 'blur'
                     }
@@ -360,7 +366,6 @@ export default {
                 credits: [
                     {
                         required: true,
-                        regexp: /^[_.@A-Za-z0-9-]*$/,
                         message: '请上传社会信誉',
                         trigger: 'blur'
                     }
@@ -368,15 +373,20 @@ export default {
                 fire: [
                     {
                         required: true,
-                        regexp: /^[_.@A-Za-z0-9-]*$/,
-                        message: '请上传消防卫生',
+                        message: '请上传消防安全',
+                        trigger: 'blur'
+                    }
+                ],
+                hygiene: [
+                    {
+                        required: true,
+                        message: '请上传卫生防疫',
                         trigger: 'blur'
                     }
                 ],
                 finance: [
                     {
                         required: true,
-                        regexp: /^[_.@A-Za-z0-9-]*$/,
                         message: '请上传财务报表',
                         trigger: 'blur'
                     }
@@ -384,7 +394,6 @@ export default {
                 property: [
                     {
                         required: true,
-                        regexp: /^[_.@A-Za-z0-9-]*$/,
                         message: '请上传房产证明',
                         trigger: 'blur'
                     }
@@ -464,7 +473,7 @@ export default {
 </script>
 <style lang="less" scoped>
 .info-content {
-    background: #f5f7fa;
+    // background: #f5f7fa;
     padding: 30px 10px 25px;
     margin: 2px auto;
     display: flex;