等级评定

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

@@ -4,6 +4,7 @@ import com.izouma.wenlvju.converter.LongArrayConverter;
 import com.izouma.wenlvju.converter.RateAuditListConverter;
 import com.izouma.wenlvju.converter.StringArrayConverter;
 import com.izouma.wenlvju.dto.RateAudit;
+import com.izouma.wenlvju.enums.OrganizationGrade;
 import com.izouma.wenlvju.enums.RateStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -123,6 +124,13 @@ public class Rate extends BaseEntity {
     @ApiModelProperty(value = "分数")
     private int score;
 
+    /*
+    优秀/合格/不合格
+     */
+    @Enumerated(EnumType.STRING)
+    @ApiModelProperty(value = "等级")
+    private OrganizationGrade grade;
+
     @Transient
     private String organizer;
 

src/main/java/com/izouma/wenlvju/security/WebSecurityConfig.java

@@ -64,6 +64,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/user/register").permitAll()
                 .antMatchers("/user/regOrganization").permitAll()
                 .antMatchers("/district").permitAll()
+                .antMatchers("/district/NJ").permitAll()
                 .antMatchers("/upload/**").permitAll()
                 .antMatchers("/files/**").permitAll()
                 .antMatchers("/static/**").permitAll()

src/main/vue/src/views/AssignExpert.vue

@@ -52,12 +52,12 @@
                                 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.phone }}</span>
                             </el-option>
                         </el-select>
-                        <el-button @click="chooseEmp">添加</el-button>
+                        <el-button @click="chooseEmp" v-if="formData.status == 'ASSIGN_EXPERT'">添加</el-button>
                     </div>
                     <el-table :data="emps">
                         <el-table-column prop="nickname" label="用户名"></el-table-column>
                         <el-table-column prop="phone" label="手机号"></el-table-column>
-                        <el-table-column label="操作">
+                        <el-table-column label="操作" v-if="formData.status == 'ASSIGN_EXPERT'">
                             <template slot-scope="{ row }">
                                 <el-button @click="remove(row)" type="danger" size="mini" plain>移除</el-button>
                             </template>

src/main/vue/src/views/Login.vue

@@ -34,12 +34,12 @@
                         :rules="{ required: true, message: '请选择注册地址', trigger: 'blur' }"
                     >
                         <!-- <district-choose v-model="registerInfo.district"></district-choose> -->
-                        <el-select v-model="formData.district">
+                        <el-select v-model="registerInfo.district">
                             <el-option
-                                v-for="item in district"
-                                :key="item.id"
-                                :value="item.name"
-                                :label="item.name"
+                                v-for="(item, index) in districtOptions"
+                                :key="index"
+                                :value="item.label"
+                                :label="item.value"
                             ></el-option>
                         </el-select>
                     </el-form-item>
@@ -161,9 +161,28 @@ export default {
             },
             activeName: 'first',
             time: 0,
-            sending: false
+            sending: false,
+            districtOptions: []
         };
     },
+    created() {
+        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);
+            });
+    },
     methods: {
         login() {
             this.$refs.form.validate(valid => {

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

@@ -34,7 +34,7 @@
                     <el-button
                         v-if="row.status === 'FIRST_REVIEW_PENDING'"
                         :loading="row.loading"
-                        @click="audit(row, 'REVIEW_PENDING', '通过')"
+                        @click="audit(row, 'ASSIGN_EXPERT', '通过')"
                         type="success"
                         size="mini"
                         plain
@@ -54,7 +54,9 @@
                     <el-button @click="sorce(row)" type="primary" size="mini" plain v-if="row.status === 'EXPERT_PASS'"
                         >查看分数</el-button
                     >
-                    <el-button v-if="row.status === 'SUBMIT_GRADE'">填写分数</el-button>
+                    <el-button v-if="row.status === 'SUBMIT_GRADE'" @click="dialogScore = true" type="warning" plain
+                        >填写分数</el-button
+                    >
                     <el-button
                         @click="supervision(row.id)"
                         type="success"
@@ -111,6 +113,23 @@
                 </el-table>
             </div>
         </el-dialog>
+        <el-dialog title="填写分数等级" :visible.sync="dialogScore" width="400px" center>
+            <div style="margin-bottom: 10px">
+                <label style="margin: 0 10px 0 30px">总分</label><el-input style="width: 220px;"></el-input>
+            </div>
+            <div style="margin-bottom: 10px">
+                <label style="margin: 0 10px 0 30px">等级</label>
+                <el-select style="width: 220px" v-model="grade" placeholder="请选择的等级">
+                    <el-option
+                        v-for="item in gradeOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    ></el-option>
+                </el-select>
+            </div>
+            <div style="margin-left: 230px"><el-button type="primary">提交</el-button></div>
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -137,7 +156,14 @@ export default {
             supervisor: [],
             dialogVisible: false,
             rateId: '',
-            display: false
+            display: false,
+            dialogScore: false,
+            gradeOptions: [
+                { label: '优秀', value: 'EXCELLENT' },
+                { label: '合格', value: 'ELIGIBLE' },
+                { label: '不合格', value: 'NOT_ELIGIBLE' }
+            ],
+            grade: ''
         };
     },
     created() {