Merge branch 'dev' of licailing/wenlvju into master

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

@@ -1,6 +1,7 @@
 package com.izouma.wenlvju.domain;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -23,24 +24,30 @@ import java.time.LocalDateTime;
 public abstract class BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
+    @ExcelIgnore
     private Long id;
 
     @JsonIgnore
+    @ExcelIgnore
     @CreatedBy
     private String createdBy;
 
     @JsonIgnore
+    @ExcelProperty(value = "申请时间")
     @CreatedDate
     private LocalDateTime createdAt;
 
     @JsonIgnore
+    @ExcelIgnore
     @LastModifiedBy
     private String modifiedBy;
 
     @JsonIgnore
+    @ExcelIgnore
     @LastModifiedDate
     private LocalDateTime modifiedAt;
 
+    @ExcelIgnore
     private boolean del;
 
     public Long getId() {

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

@@ -5,6 +5,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 
 @Data
@@ -14,6 +15,7 @@ import javax.persistence.Entity;
 @NoArgsConstructor
 public class GradeRule extends BaseEntity {
     private String name;
+    @Column(columnDefinition = "TEXT")
     private String content;
     private int    score;
     private String parentName;

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

@@ -1,5 +1,8 @@
 package com.izouma.wenlvju.domain;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.wenlvju.annotations.Searchable;
 import com.izouma.wenlvju.converter.LongArrayConverter;
 import com.izouma.wenlvju.converter.StringArrayConverter;
 import io.swagger.annotations.ApiModel;
@@ -10,6 +13,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
+import javax.persistence.Column;
 import javax.persistence.Convert;
 import javax.persistence.Entity;
 import java.util.List;
@@ -19,49 +23,67 @@ import java.util.List;
 @NoArgsConstructor
 @Builder
 @Entity
-@ApiModel(value = "承办单位")
+@ApiModel(value = "Organization", description = "承办单位")
 @Where(clause = "del = 0")
 public class Organization extends BaseEntity {
+    @ExcelIgnore
     private Long userId;
 
+    @Searchable
+    @ExcelProperty(value = "承办单位名称")
     @ApiModelProperty(value = "承办单位名称")
     private String name;
 
+    @ExcelIgnore
     @Convert(converter = LongArrayConverter.class)
     @ApiModelProperty(value = "考级机构名称")
     private List<Long> gradingOrganizationId;
 
+    @ExcelProperty(value = "统一社会信用代码")
     @ApiModelProperty(value = "统一社会信用代码")
     private String uscc;
 
+    @ExcelProperty(value = "地址")
     private String district;
 
+    @ExcelIgnore
     @Convert(converter = StringArrayConverter.class)
     private List<String> district1;
 
+    @ExcelProperty(value = "详细地址")
     private String address;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "营业执照")
     private String businessLicense;
 
+    @ExcelProperty(value = "负责人")
     @ApiModelProperty(value = "负责人")
     private String owner;
 
+    @ExcelProperty(value = "负责人联系方式")
     private String ownerPhone;
 
+    @ExcelProperty(value = "负责人邮箱")
     private String ownerEmail;
 
+    @ExcelProperty(value = "法人姓名")
     @ApiModelProperty(value = "法人姓名")
     private String privacyPolicy;
 
+    @ExcelProperty(value = "法人证件号码")
     @ApiModelProperty(value = "证件号码")
     private String idNo;
 
+    @ExcelProperty(value = "经营范围")
+    @Column(columnDefinition = "TEXT")
     @ApiModelProperty(value = "经营范围")
     private String businessScope;
 
+    @ExcelIgnore
     private int sort;
 
+    @ExcelProperty(value = "编码")
     private String code;
 
 }

src/main/vue/src/components/DistrictSelect.vue

@@ -1,6 +1,6 @@
 <template>
     <div style="display:inline-block">
-        <el-select v-model="district" style="width:100%">
+        <el-select :value="district" style="width:100%" placeholder="请选择区县" clearable>
             <el-option v-for="item in districts" :key="item.id" :value="item.name" :label="item.name"></el-option>
         </el-select>
     </div>
@@ -18,10 +18,6 @@ export default {
             district: ''
         };
     },
-
-    mounted() {
-        this.district = this.value;
-    },
     created() {
         this.$http
             .post('/setting/byFlag', { flag: 2 })
@@ -33,16 +29,10 @@ export default {
                 this.$message.error(e.error);
             });
     },
-    // methods: {
-    //     onChange(e) {
-    //         this.$nextTick(() => {
-    //             this.$emit('input', this.district);
-    //         });
-    //     }
-    // },
     watch: {
-        district(val) {
-            this.district = this.value;
+        value() {
+            this.district = value;
+            console.log(this.value);
         }
     }
 };

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

@@ -15,6 +15,14 @@ export default {
                 { label: '待区县提交材料', value: 'COLLECT_PAPER_MATERIALS' },
                 { label: '完成', value: 'COMPLETE' },
                 { label: '撤回', value: 'CANCEL' }
+            ],
+            statusOptions2: [
+                { label: '区县已上报', value: 'ASSIGN_EXPERT' },
+                { label: '待线下考察', value: 'REVIEW_PENDING' },
+                { label: '待最终评审', value: 'SUBMIT_GRADE' },
+                { label: '待承办单位提交材料', value: 'SUBMIT_PAPER_MATERIALS' },
+                { label: '待区县提交材料', value: 'COLLECT_PAPER_MATERIALS' },
+                { label: '完成', value: 'COMPLETE' }
             ]
         };
     },

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

@@ -52,7 +52,12 @@
             </el-form-item> -->
             <div class="info-content">
                 <el-form-item label="承办单位名称" prop="name">
-                    <el-input v-model="formData.name" placeholder="请输入承办单位名称" readonly></el-input>
+                    <el-input
+                        v-model="formData.name"
+                        placeholder="请输入承办单位名称"
+                        readonly
+                        style="width:490px"
+                    ></el-input>
                 </el-form-item>
                 <el-form-item label="负责人" prop="owner">
                     <el-input v-model="formData.owner" placeholder="请输入负责人" readonly></el-input>
@@ -70,12 +75,7 @@
                     <el-input v-model="formData.idNo" placeholder="请输入证件号码" readonly></el-input>
                 </el-form-item>
                 <el-form-item label="信用代码" prop="uscc">
-                    <el-input
-                        v-model="formData.uscc"
-                        placeholder="请输入统一社会信用代码"
-                        style="width:490px"
-                        readonly
-                    ></el-input>
+                    <el-input v-model="formData.uscc" placeholder="请输入统一社会信用代码" readonly></el-input>
                 </el-form-item>
                 <el-form-item label="地址" prop="district" class="address">
                     <el-select v-model="formData.district" style="width:100%">

src/main/vue/src/views/organization/OrganizationList.vue

@@ -1,18 +1,74 @@
 <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"
-                :disabled="totalElements <= 0"
-                >导出EXCEL
-            </el-button>
+            <el-col :span="7">
+                <span class="span-size">承办单位名称</span>
+                <el-input
+                    placeholder="输入承办单位名称"
+                    v-model="search"
+                    clearable
+                    class="filter-item"
+                    style="width: 220px"
+                    @change="getData"
+                ></el-input>
+            </el-col>
+            <el-col :span="7">
+                <label class="span-size">承办单位地址</label>
+                <el-select v-model="district" style="width: 220px" @change="getData" clearable>
+                    <el-option
+                        v-for="item in districts"
+                        :key="item.id"
+                        :value="item.name"
+                        :label="item.name"
+                    ></el-option>
+                </el-select>
+            </el-col>
+            <el-col :span="10">
+                <label class="span-size">注册时间</label>
+                <el-date-picker
+                    v-model="dateRange"
+                    type="daterange"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    start-placeholder="请选择开始时间"
+                    end-placeholder="请选择结束时间"
+                    range-separator="至"
+                    :default-time="['00:00:00', '23:59:59']"
+                    class="filter-item"
+                    @change="getData"
+                >
+                </el-date-picker>
+            </el-col>
+            <!-- <el-col :span="8">
+                    <span class="span-size">考级机构</span>
+                    <el-select
+                        v-model="agency"
+                        placeholder="所属考级机构"
+                        multiple
+                        class="filter-item"
+                        style="width: 220px"
+                        @change="getData"
+                    >
+                        <el-option
+                            v-for="(item, index) in examination"
+                            :key="index"
+                            :value="item.value"
+                            :label="item.label"
+                        ></el-option>
+                    </el-select>
+                </el-col> -->
+            <!-- <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>-->
+            <el-col :span="24">
+                <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"
+                    :disabled="totalElements <= 0"
+                    >导出EXCEL
+                </el-button>
+            </el-col>
         </div>
         <el-table
             :data="tableData"
@@ -29,7 +85,7 @@
             <el-table-column prop="name" label="承办单位名称" show-overflow-tooltip> </el-table-column>
             <el-table-column prop="uscc" label="统一社会信用代码" show-overflow-tooltip></el-table-column>
             <el-table-column prop="district" label="所属区县"> </el-table-column>
-            <el-table-column prop="businessLicense" label="营业执照">
+            <el-table-column prop="businessLicense" label="营业执照" min-width="50">
                 <template slot-scope="{ row }">
                     <el-image
                         style="width: 30px; height: 30px"
@@ -41,8 +97,7 @@
             </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="证件号码" show-overflow-tooltip> </el-table-column>
-            <el-table-column prop="businessScope" label="经营范围" min-width="150"> </el-table-column>
+            <el-table-column prop="createdAt" label="注册时间" :formatter="datetimeFormatter"> </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>
@@ -76,18 +131,33 @@
 <script>
 import { mapState } from 'vuex';
 import pageableTable from '@/mixins/pageableTable';
+import formatters from '@/mixins/formatters';
 
 export default {
     name: 'OrganizationList',
-    mixins: [pageableTable],
+    mixins: [pageableTable, formatters],
     data() {
         return {
             multipleMode: false,
             search: '',
             url: '/organization/all',
-            downloading: false
+            downloading: false,
+            dateRange: '',
+            district: '',
+            districts: []
         };
     },
+    created() {
+        this.$http
+            .post('/setting/byFlag', { flag: 2 })
+            .then(res => {
+                this.districts = res;
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+    },
     computed: {
         selection() {
             return this.$refs.table.selection.map(i => i.id);
@@ -95,10 +165,25 @@ export default {
     },
     methods: {
         beforeGetData() {
-            return {
+            // return {
+            //     sort: 'createdAt,desc',
+            //     search: this.search
+            // };
+            let data = {
                 sort: 'createdAt,desc',
-                search: this.search
+                query: {}
             };
+
+            if (this.search) {
+                data.search = this.search;
+            }
+            if (this.district) {
+                data.query.district = this.district;
+            }
+            if (this.dateRange && this.dateRange.length > 0) {
+                data.query.createdAt = this.dateRange[0] + ',' + this.dateRange[1];
+            }
+            return data;
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;
@@ -173,4 +258,11 @@ export default {
     }
 };
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.span-size {
+    font-size: 14px;
+    color: #565b66;
+    line-height: 15px;
+    padding: 0 10px 0 10px;
+}
+</style>

src/main/vue/src/views/rate/RateDistrictList.vue

@@ -3,7 +3,7 @@
         <div class="filters-container">
             <!-- <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
              <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">创建申请 </el-button> -->
-            <el-button
+            <!-- <el-button
                 @click="download"
                 type="primary"
                 icon="el-icon-download"
@@ -50,8 +50,119 @@
                     :label="item.label"
                     :value="item.value"
                 ></el-option>
-            </el-select>
-            <!-- <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button> -->
+            </el-select> -->
+            <div>
+                <el-col :span="7">
+                    <span class="span-size">申请年度</span>
+                    <el-select
+                        v-model="year"
+                        placeholder="请选择年度"
+                        class="filter-item"
+                        clearable
+                        style="width: 220px"
+                        @change="getData"
+                    >
+                        <el-option v-for="item in years" :key="item" :value="item" :label="item + '年'"></el-option>
+                    </el-select>
+                </el-col>
+                <el-col :span="7">
+                    <span class="span-size">承办单位名称</span>
+                    <el-input
+                        placeholder="输入承办单位名称"
+                        v-model="search"
+                        clearable
+                        class="filter-item"
+                        style="width: 220px"
+                        @change="getData"
+                    ></el-input>
+                </el-col>
+                <el-col :span="10">
+                    <label class="span-size">申请时间</label>
+                    <el-date-picker
+                        v-model="dateRange"
+                        type="daterange"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        start-placeholder="请选择开始时间"
+                        end-placeholder="请选择结束时间"
+                        range-separator="至"
+                        :default-time="['00:00:00', '23:59:59']"
+                        class="filter-item"
+                        @change="getData"
+                    >
+                    </el-date-picker>
+                </el-col>
+                <!-- <el-col :span="8">
+                    <span class="span-size">考级机构</span>
+                    <el-select
+                        v-model="agency"
+                        placeholder="所属考级机构"
+                        multiple
+                        class="filter-item"
+                        style="width: 220px"
+                        @change="getData"
+                    >
+                        <el-option
+                            v-for="(item, index) in examination"
+                            :key="index"
+                            :value="item.value"
+                            :label="item.label"
+                        ></el-option>
+                    </el-select>
+                </el-col> -->
+            </div>
+            <div>
+                <el-col :span="7">
+                    <label class="span-size">申请状态</label>
+                    <el-select
+                        class="filter-item"
+                        v-model="status"
+                        clearable
+                        placeholder="请选择状态"
+                        style="width: 220px"
+                        @change="getData"
+                    >
+                        <el-option
+                            v-for="item in statusOptions"
+                            :key="item.value"
+                            :value="item.value"
+                            :label="item.label"
+                        ></el-option>
+                    </el-select>
+                </el-col>
+                <el-col :span="7">
+                    <label class="span-size">申请评定等级</label>
+                    <el-select
+                        style="width: 220px"
+                        v-model="grade"
+                        placeholder="请选择的等级"
+                        class="filter-item"
+                        multiple
+                        clearable
+                        @change="getData"
+                    >
+                        <el-option
+                            v-for="item in gradeOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                </el-col>
+            </div>
+            <div style="padding-left: 10px">
+                <!-- <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">查询 </el-button> -->
+                <el-col :span="24">
+                    <el-button
+                        @click="download"
+                        type="primary"
+                        icon="el-icon-download"
+                        :loading="downloading"
+                        class="filter-item"
+                        :disabled="totalElements <= 0"
+                        >导出EXCEL
+                    </el-button>
+                </el-col>
+            </div>
         </div>
         <el-table
             :data="tableData"
@@ -241,7 +352,10 @@ export default {
             form: {},
             grade: '',
             status: [],
-            loading: false
+            loading: false,
+            years: [2021, 2022, 2023, 2024, 2025],
+            year: '',
+            dateRange: ''
         };
     },
     computed: {
@@ -287,6 +401,12 @@ export default {
             if (this.grade) {
                 data.query.grade = this.grade;
             }
+            if (this.dateRange && this.dateRange.length > 0) {
+                data.query.createdAt = this.dateRange[0] + ',' + this.dateRange[1];
+            }
+            if (this.year) {
+                data.query.year = this.year;
+            }
             return data;
         },
         toggleMultipleMode(multipleMode) {
@@ -569,4 +689,10 @@ export default {
 .el-link {
     font-size: 12px;
 }
+.span-size {
+    font-size: 14px;
+    color: #565b66;
+    line-height: 15px;
+    padding: 0 10px 0 10px;
+}
 </style>

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

@@ -3,7 +3,7 @@
         <div class="filters-container">
             <!-- <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
              <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">创建申请 </el-button> -->
-            <el-button
+            <!-- <el-button
                 @click="download"
                 type="primary"
                 icon="el-icon-download"
@@ -12,7 +12,17 @@
                 :disabled="totalElements <= 0"
                 >导出EXCEL
             </el-button>
-            <el-select class="filter-item" placeholder="请选择考级机构"> </el-select>
+            <el-select v-model="year" placeholder="请选择年度" class="filter-item" clearable>
+                <el-option v-for="item in years" :key="item" :value="item" :label="item + '年'"></el-option>
+            </el-select>
+            <el-select v-model="agency" placeholder="所属考级机构" multiple class="filter-item">
+                <el-option
+                    v-for="(item, index) in examination"
+                    :key="index"
+                    :value="item.value"
+                    :label="item.label"
+                ></el-option>
+            </el-select>
             <el-input
                 placeholder="输入承办单位名称"
                 v-model="search"
@@ -51,64 +61,131 @@
                     :label="item.label"
                     :value="item.value"
                 ></el-option>
-            </el-select>
+            </el-select> -->
             <!-- <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button> -->
-            <!-- <div>
-                <span class="span-width">
+            <div>
+                <el-col :span="7">
+                    <span class="span-size">申请年度</span>
+                    <el-select
+                        v-model="year"
+                        placeholder="请选择年度"
+                        class="filter-item"
+                        clearable
+                        style="width: 220px"
+                        @change="getData"
+                    >
+                        <el-option v-for="item in years" :key="item" :value="item" :label="item + '年'"></el-option>
+                    </el-select>
+                </el-col>
+                <el-col :span="7">
                     <span class="span-size">承办单位名称</span>
-                    <el-input placeholder="输入承办单位名称" v-model="search" clearable class="filter-item"></el-input>
-                </span>
-                <span class="span-width">
-                    <span class="span-size">考级机构名称</span>
-                    <el-input placeholder="输入考级机构名称" v-model="agency" clearable class="filter-item"></el-input>
-                </span>
-                <span class="span-width2">
+                    <el-input
+                        placeholder="输入承办单位名称"
+                        v-model="search"
+                        clearable
+                        class="filter-item"
+                        style="width: 220px"
+                        @change="getData"
+                    ></el-input>
+                </el-col>
+                <el-col :span="10">
                     <label class="span-size">申请时间</label>
                     <el-date-picker
                         v-model="dateRange"
                         type="daterange"
-                        value-format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd HH:mm:ss"
                         start-placeholder="请选择开始时间"
                         end-placeholder="请选择结束时间"
                         range-separator="至"
+                        :default-time="['00:00:00', '23:59:59']"
                         class="filter-item"
+                        @change="getData"
                     >
                     </el-date-picker>
-                </span>
+                </el-col>
+                <!-- <el-col :span="8">
+                    <span class="span-size">考级机构</span>
+                    <el-select
+                        v-model="agency"
+                        placeholder="所属考级机构"
+                        multiple
+                        class="filter-item"
+                        style="width: 220px"
+                        @change="getData"
+                    >
+                        <el-option
+                            v-for="(item, index) in examination"
+                            :key="index"
+                            :value="item.value"
+                            :label="item.label"
+                        ></el-option>
+                    </el-select>
+                </el-col> -->
             </div>
-            <div style="padding-left: 70px">
-                <label class="span-size">地址</label>
-                <district-choose style="width: 202px"></district-choose>
-                <span class="span-width" style="padding-left: 10px">
-                    <label class="span-size">状态</label>
+            <div>
+                <el-col :span="7">
+                    <label class="span-size">申请状态</label>
                     <el-select
                         class="filter-item"
                         v-model="status"
                         clearable
                         placeholder="请选择状态"
-                        style="width: 200px"
+                        style="width: 220px"
+                        @change="getData"
                     >
                         <el-option
-                            v-for="item in statusOptions"
+                            v-for="item in statusOptions2"
                             :key="item.value"
                             :value="item.value"
                             :label="item.label"
                         ></el-option>
                     </el-select>
-                </span>
+                </el-col>
+                <el-col :span="7">
+                    <label class="span-size">承办单位地址</label>
+                    <el-select v-model="district" style="width: 220px" @change="getData" clearable>
+                        <el-option
+                            v-for="item in districts"
+                            :key="item.id"
+                            :value="item.name"
+                            :label="item.name"
+                        ></el-option>
+                    </el-select>
+                </el-col>
+                <el-col :span="7">
+                    <label class="span-size">评定等级</label>
+                    <el-select
+                        style="width: 220px"
+                        v-model="grade"
+                        placeholder="请选择的等级"
+                        class="filter-item"
+                        multiple
+                        clearable
+                        @change="getData"
+                    >
+                        <el-option
+                            v-for="item in gradeOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                </el-col>
+            </div>
+            <div style="padding-left: 10px">
+                <!-- <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">查询 </el-button> -->
+                <el-col :span="24">
+                    <el-button
+                        @click="download"
+                        type="primary"
+                        icon="el-icon-download"
+                        :loading="downloading"
+                        class="filter-item"
+                        :disabled="totalElements <= 0"
+                        >导出EXCEL
+                    </el-button>
+                </el-col>
             </div>
-            <div style="padding-left: 20px">
-                <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">查询 </el-button>
-                <el-button
-                    @click="download"
-                    type="primary"
-                    icon="el-icon-download"
-                    :loading="downloading"
-                    class="filter-item"
-                    :disabled="totalElements <= 0"
-                    >导出EXCEL
-                </el-button>
-            </div> -->
         </div>
         <el-table
             :data="tableData"
@@ -148,18 +225,13 @@
                     <span v-else><el-link :underline="false" type="info">暂无</el-link></span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="right" fixed="right" min-width="150">
+            <el-table-column label="操作" align="right" fixed="right" min-width="200">
                 <template slot-scope="{ row }">
-                    <!-- <el-button
-                        v-if="row.status === 'FIRST_REVIEW_PENDING'"
-                        :loading="row.loading"
-                        @click="audit(row, 'ASSIGN_EXPERT', '通过')"
-                        type="success"
-                        size="mini"
-                        plain
-                    >
-                        同意上报
-                    </el-button> -->
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>
+                        <span v-if="row.status == 'ASSIGN_EXPERT'">审核材料</span>
+                        <span v-else-if="row.status == 'SUBMIT_GRADE'">最终评审</span>
+                        <span v-else>查看材料</span>
+                    </el-button>
                     <el-button
                         @click="supervision(row.id)"
                         type="success"
@@ -176,7 +248,7 @@
                         size="mini"
                         plain
                     >
-                        退回
+                        退回申请
                     </el-button>
                     <el-button
                         v-if="row.status === 'COLLECT_PAPER_MATERIALS'"
@@ -186,11 +258,6 @@
                         @click="saveComplete(row)"
                         >收取纸质材料</el-button
                     >
-                    <el-button @click="editRow(row)" type="primary" size="mini" plain>
-                        <span v-if="row.status == 'ASSIGN_EXPERT'">审核材料</span>
-                        <span v-else-if="row.status == 'SUBMIT_GRADE'">最终评审</span>
-                        <span v-else>查看材料</span>
-                    </el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -229,33 +296,6 @@
                 </el-table>
             </div>
         </el-dialog>
-        <el-dialog title="填写分数等级" :visible.sync="dialogScore" width="400px" center>
-            <el-form :model="scoreInfo" style="width: 400px;" label-width="70px">
-                <el-form-item
-                    label="总分"
-                    prop="score"
-                    :rules="{ required: true, message: '请输入分数', trigger: 'blur' }"
-                >
-                    <el-input-number type="number" v-model="scoreInfo.score" placeholder="分数" style="width: 220px;">
-                    </el-input-number>
-                </el-form-item>
-                <el-form-item
-                    label="等级"
-                    prop="grade"
-                    :rules="{ required: true, message: '请输入等级', trigger: 'blur' }"
-                >
-                    <el-select style="width: 220px" v-model="scoreInfo.grade" placeholder="请选择的等级">
-                        <el-option
-                            v-for="item in gradeOptions"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item><el-button type="primary" size="mini" @click="saveScore()">提交</el-button></el-form-item>
-            </el-form>
-        </el-dialog>
         <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
             <div style="height: 150px;width:400px;margin:2px auto">
                 <el-input
@@ -274,10 +314,11 @@
 <script>
 import { mapState } from 'vuex';
 import pageableTable from '@/mixins/pageableTable';
+import rateStatus from '@/mixins/rateStatus';
 
 export default {
     name: 'RateList',
-    mixins: [pageableTable],
+    mixins: [pageableTable, rateStatus],
     data() {
         return {
             multipleMode: false,
@@ -294,26 +335,45 @@ export default {
                 { label: '合格', value: 'ELIGIBLE' },
                 { label: '不合格', value: 'NOT_ELIGIBLE' }
             ],
-            scoreInfo: {
-                score: 0,
-                grade: ''
-            },
             dialogDismiss: false,
             reason: '',
             dismissReason: ['资料不全', '缺少附件', '无资格'],
             form: {},
             grade: '',
             status: [],
-            statusOptions: [
-                { label: '区县已上报', value: 'ASSIGN_EXPERT' },
-                { label: '待线下考察', value: 'REVIEW_PENDING' },
-                { label: '待最终评审', value: 'SUBMIT_GRADE' },
-                { label: '待承办单位提交材料', value: 'SUBMIT_PAPER_MATERIALS' },
-                { label: '待区县提交材料', value: 'COLLECT_PAPER_MATERIALS' },
-                { label: '完成', value: 'COMPLETE' }
-            ]
+            years: [2021, 2022, 2023, 2024, 2025],
+            year: '',
+            districts: [],
+            district: '',
+            dateRange: ''
         };
     },
+    created() {
+        // this.$http
+        //     .post('/gradingOrganization/all', { size: 1000 }, { body: 'json' })
+        //     .then(res => {
+        //         if (res.content.length > 0) {
+        //             res.content.forEach(item => {
+        //                 this.examination.push({
+        //                     label: item.name,
+        //                     value: item.id
+        //                 });
+        //             });
+        //         }
+        //     })
+        //     .catch(e => {
+        //         console.log(e);
+        //     });
+        this.$http
+            .post('/setting/byFlag', { flag: 2 })
+            .then(res => {
+                this.districts = res;
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+    },
     computed: {
         selection() {
             return this.$refs.table.selection.map(i => i.id);
@@ -364,6 +424,15 @@ export default {
             if (this.grade) {
                 data.query.grade = this.grade;
             }
+            if (this.year) {
+                data.query.year = this.year;
+            }
+            if (this.district) {
+                data.query.district = this.district;
+            }
+            if (this.dateRange && this.dateRange.length > 0) {
+                data.query.createdAt = this.dateRange[0] + ',' + this.dateRange[1];
+            }
             return data;
         },
         toggleMultipleMode(multipleMode) {
@@ -626,6 +695,7 @@ export default {
 }
 .span-width {
     width: 330px;
+    // width: 80%;
     display: inline-block;
     text-align: right;
 }