Merge branch 'message' of licailing/wenlvju into master

src/main/h5/src/views/Home.vue

@@ -70,7 +70,7 @@
           <div v-if="info.programmeStatus == 'INITIAL'">未提交</div>
           <div v-if="info.programmeStatus == 'AUDIT_FAILED'">初审未通过</div>
           <div v-if="info.programmeStatus == 'REVIEW_FAILED'">复审未通过</div>
-          <div v-if="info.programmeStatus == 'COMPLETE'">已评奖</div>
+          <div v-if="info.programmeStatus == 'COMPLETE'">已完成</div>
         </div>
         <div class="base-info-item" v-if="info.showAward">
           <div class="text1">奖项</div>

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

@@ -42,5 +42,10 @@ public enum PerformanceStatus {
     /*
     待评分
      */
-    SECOND_RATE
+    SECOND_RATE,
+
+    /*
+    完成
+     */
+    COMPLETE
 }

src/main/vue/src/components/ProgrammeLog.vue

@@ -162,7 +162,7 @@
                                         row-class-name="table-row"
                                         cell-class-name="table-cell"
                                     >
-                                        <el-table-column prop="img" label="证件照">
+                                        <el-table-column prop="img" label="证件照" min-width="80">
                                             <template slot-scope="{ row }">
                                                 <el-image
                                                     style="width: 30px; height: 30px;"
@@ -173,9 +173,9 @@
                                             </template>
                                         </el-table-column>
                                         <el-table-column prop="name" label="姓名" min-width="80"> </el-table-column>
-                                        <el-table-column prop="birthday" label="出生年月" min-width="100">
+                                        <el-table-column prop="birthday" label="出生年月" min-width="90">
                                         </el-table-column>
-                                        <el-table-column prop="sex" label="性别" min-width="70"> </el-table-column>
+                                        <el-table-column prop="sex" label="性别" min-width="50"> </el-table-column>
                                         <el-table-column prop="phone" label="联系方式" min-width="100">
                                         </el-table-column>
                                         <el-table-column prop="certificate" label="考级证书">
@@ -188,7 +188,7 @@
                                                 ></el-image>
                                             </template>
                                         </el-table-column>
-                                        <el-table-column prop="idNo" label="身份证号" min-width="100">
+                                        <el-table-column prop="idNo" label="身份证号" min-width="140">
                                         </el-table-column>
                                     </el-table>
                                 </el-card>

src/main/vue/src/views/performance/PerformanceList.vue

@@ -52,6 +52,7 @@
                         <span v-else-if="row.status == 'ARRANGE_JUDGE'">分配评委中</span>
                         <span v-else-if="row.status == 'SIGN_IN'">签到中</span>
                         <span v-else-if="row.status == 'RATE'">评分中</span>
+                        <span v-else-if="row.status == 'COMPLETE'">已完成</span>
                     </el-link>
                 </template>
             </el-table-column>
@@ -133,12 +134,6 @@ export default {
             url: '/performance/backAll',
             downloading: false,
             currentTime: '',
-            statusOptions: [
-                { label: '审核中', value: 'UNDER_REVIEW' },
-                { label: '分组中', value: 'ARRANGE' },
-                { label: '分配评委中', value: 'ARRANGE_JUDGE' },
-                { label: '待签到', value: 'SIGN_IN' }
-            ],
             display: false
         };
     },

src/main/vue/src/views/performance/PerformanceListShow.vue

@@ -35,6 +35,7 @@
                         <span v-else-if="row.status == 'ARRANGE_JUDGE'">分配评委中</span>
                         <span v-else-if="row.status == 'SIGN_IN'">签到中</span>
                         <span v-else-if="row.status == 'RATE'">评分中</span>
+                        <span v-else-if="row.status == 'COMPLETE'">已完成</span>
                     </el-link>
                     <el-link
                         style="font-size: 13px"

src/main/vue/src/views/performance/PerformanceShow.vue

@@ -182,10 +182,6 @@ export default {
             saving: false,
             formData: {},
             rules: {},
-            statusOptions: [
-                { label: '报名中', value: 'APPLY' },
-                { label: '已结束', value: 'END' }
-            ],
             dateRange: [],
             eventTimeRange: '',
             display: false,

src/main/vue/src/views/performance/ProgrammeList.vue

@@ -274,6 +274,7 @@
                     <span v-if="row.programmeStatus == 'INITIAL'">未提交</span>
                     <span v-if="row.programmeStatus == 'AUDIT_FAILED'">初审未通过</span>
                     <span v-if="row.programmeStatus == 'REVIEW_FAILED'">复审未通过</span>
+                    <span v-if="row.programmeStatus == 'COMPLETE'">已完成</span>
                 </template>
             </el-table-column>
             <el-table-column label="操作" align="left" fixed="right" min-width="260">

src/main/vue/src/views/performance/ProgrammeOrgList.vue

@@ -247,6 +247,7 @@
                     <span v-if="row.programmeStatus == 'INITIAL'">未提交</span>
                     <span v-if="row.programmeStatus == 'AUDIT_FAILED'">初审未通过</span>
                     <span v-if="row.programmeStatus == 'REVIEW_FAILED'">复审未通过</span>
+                    <span v-if="row.programmeStatus == 'COMPLETE'">已完成</span>
                 </template>
             </el-table-column>
             <el-table-column prop="awardId" label="奖项" min-width="80" v-if="showAward">