wolyshaw %!s(int64=4) %!d(string=hai) anos
pai
achega
b8dfa5da57

+ 1 - 1
src/views/resetTeaming/components/resetPayList.vue

@@ -112,7 +112,7 @@
                          v-if="scope.row.status != 'REJECT' && scope.row.status != 'AUDITING'&&teamStatus && scope.row.paymentType != 'MUSIC_APPLY' && scope.row.paymentType != 'ADD_STUDENT'"
                          v-permission="'musicGroupPaymentCalenderDetail/batchAdd'">添加学员</el-button> -->
               <el-button type="text"
-                         v-if="teamStatus"
+                         v-if="teamStatus && scope.row.auditStatus === 'REJECT'"
                          v-permission="'musicGroupPaymentCalender/update'"
                          @click="resetPay(scope.row)">修改</el-button>
 

+ 1 - 1
src/views/resetTeaming/components/resetPayListSchool.vue

@@ -112,7 +112,7 @@
                          v-if="scope.row.status != 'REJECT' && scope.row.status != 'AUDITING'&&teamStatus && scope.row.paymentType != 'MUSIC_APPLY' && scope.row.paymentType != 'ADD_STUDENT'"
                          v-permission="'musicGroupPaymentCalenderDetail/batchAdd'">添加学员</el-button> -->
               <el-button type="text"
-                         v-if="scope.row.status == 'REJECT'&&teamStatus"
+                         v-if="teamStatus && scope.row.auditStatus === 'REJECT'"
                          v-permission="'musicGroupPaymentCalender/update'"
                          @click="resetPay(scope.row)">修改</el-button>
 

+ 1 - 2
src/views/resetTeaming/modals/user-pay-form.vue

@@ -308,7 +308,6 @@ export default {
           this.eclass = (res.data.musicGroupPaymentCalenderCourseSettings || []).filter(item => {
             return !item.isStudentOptional || this.paymentType !== undefined
           })
-          console.log(res.data.auditDto)
           this.$set(this.form, 'musicGroupOrganizationCourseSettingId', res.data.auditDto?.musicGroupOrganizationCourseSettingsId)
           this.syncAllMoney()
         } catch (error) {}
@@ -527,7 +526,7 @@ export default {
           try {
             data.batchNo = this.rowDetail.batchNo
             // 缴费类型无法修改,按照之前覆盖
-            data.paymentType = this.rowDetail.paymentType
+            data.paymentType = this.viewDetail.musicGroupPaymentCalenders[0]?.paymentType
             const res = await musicGroupPaymentCalenderDetailBatchUpdate(data);
             this.$listeners.close();
             this.$listeners.submited(res.data);