Merge branch 'develop6.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop6.0-tmd

TEAMModelOS/ClientApp/src/view/jyzx/classMemoir.vue

@@ -15,7 +15,7 @@
                         <Table :columns="classCol" :data="calssListinfo" height="680">
                             <template slot-scope="{ row, index }" slot="action">
                                 <Button size="small" @click="checkevaluate(row,true)" style="margin-right:2%">{{ $t('jyzx.common.seeEvaluate') }}</Button>
-                                <Button size="small" @click="delClass(row)" v-if="calssListinfo[0].score !==1 || calssListinfo[0].score !=2">{{ $t('jyzx.common.delete') }}</Button>
+                                <Button size="small" @click="delClass(row)" v-if="calssListinfo[0].score !==1 && calssListinfo[0].score !==2" class="delete-btns">{{ $t('jyzx.common.delete') }}</Button>
                             </template>
                         </Table>
                     </div>