Merge branch '04/19-newPermission' into test

src/views/teamBuild/signupList.vue

@@ -305,18 +305,18 @@
             fixed="right"
             width="240"
             align="center"
-
+             v-if="
+              status == 'PAY' ||
+              status == 'APPLY' ||
+              status == 'PROGRESS' ||
+              status == 'PREPARE'
+            "
           >
           <!--  v-show="
               status == 'PAY' || status == 'PROGRESS' || status == 'PREPARE' || status=='APPLY'
             " -->
             <template slot-scope="scope">
-              <div   v-show="
-              status == 'PAY' ||
-              status == 'APPLY' ||
-              status == 'PROGRESS' ||
-              status == 'PREPARE'
-            ">
+              <div  >
                 <auth :auths="'studentRegistration/batchUpdateSubject'">
                   <el-button
                     type="text"