11/04 11:46

111

src/utils/searchArray.js

@@ -217,7 +217,6 @@ function getValueForKey(obj){
   for(let k in obj){
     arr.push({label:obj[k],value:k})
   }
-  console.log(arr)
   return arr
 }
 

src/views/resetTeaming/components/resetPayList.vue

@@ -142,13 +142,10 @@
                          @click="lookDetail(scope.row)"
                          v-permission="'/strudentPayInfo'">查看</el-button>
               <el-button type="text"
-                         v-if="scope.row.paymentStatus == 0"
+                         v-if="scope.row.status == 'REJECT'"
                          v-permission="'musicGroupPaymentCalender/updateStartTime'"
                          @click="resetPay(scope.row)">修改</el-button>
-              <el-button type="text"
-                         v-permission="'musicGroupPaymentCalender/del'"
-                         v-if="scope.row.paymentStatus == 0"
-                         @click="detelePay(scope.row)">删除</el-button>
+
               <el-button type="text" v-if="!isNewGropu" @click="onCreateQRCode(scope.row)">续费二维码</el-button>
             </div>
           </template>
@@ -464,7 +461,7 @@ export default {
         const res = await getMusicGroupStu({
           musicGroupId: this.$route.query.id,
         });
-        console.log(res);
+
       } catch (error) {}
       this.getList();
     },
@@ -641,6 +638,15 @@ export default {
     onReSet() {
       this.searchForm = { payUserType: null };
     },
+        async payedSubmited(data) {
+      try {
+        await this.getList();
+        this.chioseStudentVisible = true;
+        if (data) {
+          this.musicGroupPaymentCalenderId = data.musicGroupPaymentCalenderId;
+        }
+      } catch (error) {}
+    },
   },
   watch: {
     chioseStudentVisible() {

src/views/resetTeaming/modals/user-pay-form.vue

@@ -104,13 +104,14 @@ const paymentTypeFormat = {
 }
 
 export default {
-  props: ['type', 'musicGroupId', 'baseInfo', 'paymentType'],
+  props: ['type', 'musicGroupId', 'baseInfo', 'paymentType','rowDetail'],
   components: {
     userBaseinfo,
     paymentCycle,
     extraClass,
     classrooms,
     otherform
+   
   },
   data() {
     return {
@@ -118,6 +119,7 @@ export default {
       form: {
         payUserType: this.type === 'user' ? 'STUDENT' : 'SCHOOL',
         leixing: '1',
+        musicGroupOrganizationCourseSettingId:null
       },
       other: {},
       cycles: [{}],
@@ -129,6 +131,20 @@ export default {
       charges: [],
     }
   },
+  mounted(){
+    this.init()
+  },
+  activated(){
+    this.init()
+  },
+  methods:{
+      init(){
+        if(this.rowDetail){
+          this.form.musicGroupOrganizationCourseSettingId = this.rowDetail.musicGroupOrganizationCourseSettingId
+          console.log(this.form.musicGroupOrganizationCourseSettingId)
+        }
+      },
+  },
   computed: {
     isCommon() {
       return this.form.leixing === '1'

src/views/teamBuild/components/teamBaseInfo.vue

@@ -204,7 +204,7 @@
                        :key="item.value"></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="课酬结算标准"
+        <el-form-item label="课酬结算标准"
                       :rules="[{ required: true, message: '请选择课酬结算标准' }]"
                       prop="salary">
           <el-select v-model.trim="topFrom.salary"
@@ -218,7 +218,7 @@
             <el-option label="课堂课酬"
             value="CLASSROOM_SALARY"></el-option>
           </el-select>
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item label="机构类型"
                       prop="ownershipType">
           <el-select v-model.trim="topFrom.ownershipType"