wolyshaw пре 4 година
родитељ
комит
6e4c8857fe

+ 3 - 4
src/views/resetTeaming/components/resetPayListSchool.vue

@@ -300,9 +300,8 @@
       width="850px"
     >
       <schoolPayUserList
-        v-if="userListVisible"
-        :id="viewDetail && viewDetail.id"
-        :musicGroupId="viewDetail && viewDetail.musicGroupId"
+        v-if="userListVisible && viewDetail"
+        :detail="viewDetail"
       />
     </el-dialog>
     <el-dialog title="查看"
@@ -610,7 +609,7 @@ export default {
     },
     lookUserList(row) {
       console.log({...row})
-      this.viewDetail = row
+      this.viewDetail = {...row}
       this.userListVisible = true
     },
     lookDetail (row) {

+ 5 - 1
src/views/resetTeaming/modals/pay-items.vue

@@ -106,6 +106,10 @@
               @click="$listeners.resetPay(scope.row)"
               >修改</el-button
             > -->
+            <el-button type="text"
+                        v-if="$listeners.lookUserList"
+                        @click="$listeners.lookUserList(scope.row)"
+                        v-permission="'musicGroupPaymentCalender/queryPage'">学员列表</el-button>
             <el-button
               type="text"
               v-permission="'musicGroupPaymentCalender/makesureSchoolePaid'"
@@ -185,7 +189,7 @@ export default {
       } catch (error) {}
     },
     toDetail(row) {
-      this.$listeners.close();
+      // this.$listeners.close();
       this.$nextTick(() => {
           this.$listeners.lookDetail(row)
       })

+ 12 - 18
src/views/resetTeaming/modals/school-pay-user-list.vue

@@ -28,22 +28,14 @@
       <el-form-item>
         <el-button @click="FetchList" type="danger">搜索</el-button>
         <el-button @click="onReSet" type="primary">重置</el-button>
-        <el-button
+        <!-- <el-button
           type="primary"
           :disabled="!activeChiose.length"
           @click="deleteUser"
           v-permission="'musicGroupPaymentCalenderDetail/batchDel'"
-        >删除学员</el-button>
+        >删除学员</el-button> -->
       </el-form-item>
     </el-form>
-    <!-- <el-row style="margin-bottom: 20px">
-      <el-clo>
-        <el-button
-          type="primary"
-          v-permission="'musicGroupPaymentCalenderDetail/batchDel'"
-        >删除学员</el-button>
-      </el-clo>
-    </el-row> -->
     <el-table
       :data="list"
       @selection-change="handleSelectionChange"
@@ -138,7 +130,7 @@ const initSearchForm = {
 import pagination from "@/components/Pagination/index";
 import { getmusicGroupPaymentCalenderDetail, delMusicGroupPaymentCalenderStudent } from "@/api/buildTeam";
 export default {
-  props: ["id", "musicGroupId"],
+  props: ['detail'],
   components: {
     pagination,
   },
@@ -164,12 +156,14 @@ export default {
     }
   },
   mounted() {
-    store.dispatch('getFindSound', {
-      data: {
-        musicGroupId: this.musicGroupId
-      }
-    })
-    this.FetchList();
+    if (this.detail) {
+      store.dispatch('getFindSound', {
+        data: {
+          musicGroupId: this.detail.musicGroupId
+        }
+      })
+      this.FetchList();
+    }
   },
   methods: {
     handleSelectionChange(val) {
@@ -196,7 +190,7 @@ export default {
     async FetchList() {
       try {
         const res = await getmusicGroupPaymentCalenderDetail({
-          id: this.id,
+          id: this.detail.id,
           page: this.rules.page,
           rows: this.rules.limit,
           ...this.searchForm,