licailing vor 4 Jahren
Ursprung
Commit
d2f52d8adc

+ 4 - 3
src/main/h5/src/views/Home.vue

@@ -51,25 +51,26 @@
           </div>
           <div
             class="text2"
-            v-if="info.process == 1 && info.programmeStatus == 'SUBMIT'"
+            v-else-if="info.process == 1 && info.programmeStatus == 'SUBMIT'"
           >
             初审通过
           </div>
           <div
             class="text2"
-            v-if="info.process == 2 && info.programmeStatus == 'SUBMIT'"
+            v-else-if="info.process == 2 && info.programmeStatus == 'SUBMIT'"
           >
             复审中
           </div>
           <div
             class="text2"
-            v-if="info.process == 3 && info.programmeStatus == 'SUBMIT'"
+            v-else-if="info.process == 3 && info.programmeStatus == 'SUBMIT'"
           >
             复审通过
           </div>
           <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>
         <div class="base-info-item" v-if="info.showAward">
           <div class="text1">奖项</div>

+ 3 - 3
src/main/vue/src/views/performance/ProgScoreAdminList.vue

@@ -155,14 +155,14 @@
             </el-table-column>
             <el-table-column prop="myScore" label="专家平均分">
                 <template slot-scope="{ row }">
-                    <span v-if="row.myScore">{{ row.myScore }}</span>
+                    <span v-if="row.myScore">{{ Math.round(row.myScore) }}</span>
                     <span v-else>暂无</span>
                 </template>
             </el-table-column>
             <el-table-column prop="score" label="成绩">
                 <template slot-scope="{ row }">
                     <span v-if="!row.second">
-                        <span v-if="row.score">{{ row.score }}</span>
+                        <span v-if="row.score">{{ Math.round(row.score) }}</span>
                         <span v-else>暂无</span>
                     </span>
                     <el-input-number
@@ -242,7 +242,7 @@
                 <el-card shadow="never" style="width: 100%; margin: 10px auto">
                     <el-form :form="programme">
                         <el-form-item label="分数">
-                            <span v-if="!programme.second">{{ programme.score }}</span>
+                            <span v-if="!programme.second">{{ Math.round(programme.score) }}</span>
                             <el-input-number
                                 v-else
                                 v-model="programme.score"

+ 2 - 1
src/main/vue/src/views/performance/ProgrammeGOList.vue

@@ -171,7 +171,8 @@ export default {
                 { label: '未提交', value: 'INITIAL' },
                 { label: '已提交', value: 'SUBMIT' },
                 { label: '初选未通过', value: 'AUDIT_FAILED' },
-                { label: '审核未通过', value: 'REVIEW_FAILED' }
+                { label: '审核未通过', value: 'REVIEW_FAILED' },
+                { label: '已评奖', value: 'COMPLETE' }
             ],
             showMore: false,
             programme: {},

+ 2 - 1
src/main/vue/src/views/performance/ProgrammeList.vue

@@ -468,7 +468,8 @@ export default {
                 { label: '未提交', value: 'INITIAL' },
                 { label: '已提交', value: 'SUBMIT' },
                 { label: '初选未通过', value: 'AUDIT_FAILED' },
-                { label: '审核未通过', value: 'REVIEW_FAILED' }
+                { label: '审核未通过', value: 'REVIEW_FAILED' },
+                { label: '已评奖', value: 'COMPLETE' }
             ],
             showMore: false,
             programme: {},

+ 2 - 1
src/main/vue/src/views/performance/ProgrammeOrgList.vue

@@ -387,7 +387,8 @@ export default {
                 { label: '未提交', value: 'INITIAL' },
                 { label: '已提交', value: 'SUBMIT' },
                 { label: '初选未通过', value: 'AUDIT_FAILED' },
-                { label: '审核未通过', value: 'REVIEW_FAILED' }
+                { label: '审核未通过', value: 'REVIEW_FAILED' },
+                { label: '已评奖', value: 'COMPLETE' }
             ],
             loading: false,
             programme: {},