Explorar o código

Merge branch '02/23reviewBUG' into test

mo %!s(int64=3) %!d(string=hai) anos
pai
achega
6fec470e21
Modificáronse 1 ficheiros con 12 adicións e 2 borrados
  1. 12 2
      src/views/resetTeaming/components/resetPayList.vue

+ 12 - 2
src/views/resetTeaming/components/resetPayList.vue

@@ -192,10 +192,10 @@
                   >撤回</el-button
                 >
               </auth>
-              <!--  scope.row.paymentType != 'ADD_STUDENT' && -->
+              <!--  -->
               <auth auths="musicGroupPaymentCalender/delByBatchNo/4305"     v-if="
                     teamStatus &&
-
+                     scope.row.paymentType != 'ADD_STUDENT' &&
                     scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'
                   ">
                 <el-button
@@ -204,6 +204,16 @@
                   @click="removeBatchNo(scope.row)"
                   >删除</el-button
                 ></auth>
+                       <auth auths="musicGroupPaymentCalender/delByBatchNo/4305"     v-if="
+                    teamStatus &&
+                     scope.row.paymentType == 'ADD_STUDENT'&&( scope.row.auditStatus == 'DRAFT' || scope.row.auditStatus == 'REJECT')
+                  ">
+                <el-button
+                  type="text"
+
+                  @click="removeBatchNo(scope.row)"
+                  >删除</el-button
+                ></auth>
 
               <!-- <el-button type="text"
                          v-if="!isNewGropu&&teamStatus&&scope.row.paymentType!='MUSIC_APPLY'"