10/22 17:32

11

src/views/teamDetail/components/baseInfo.vue

@@ -58,22 +58,21 @@
             </el-select>
           </el-form-item> -->
 
-          <el-form-item
-                        label="缴费方式"
+          <el-form-item label="缴费方式"
                         prop="paymentPattern">
-                        <el-select placeholder="缴费方式"
-                                    style="width: 220px"
-                                    clearable
-                                    filterable
-                                    disabled
-                                    v-model.trim="topForm.paymentPattern">
-                                    <el-option :value="0"
-                                                label="按月"></el-option>
-                                    <el-option :value="1"
-                                                label="按季"></el-option>
-                                    <el-option :value="2"
-                                                label="一次性"></el-option>
-                        </el-select>
+            <el-select placeholder="缴费方式"
+                       style="width: 220px"
+                       clearable
+                       filterable
+                       disabled
+                       v-model.trim="topForm.paymentPattern">
+              <el-option :value="0"
+                         label="按月"></el-option>
+              <el-option :value="1"
+                         label="按季"></el-option>
+              <el-option :value="2"
+                         label="一次性"></el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="缴费有效期开始"
                         prop="paymentValidStartDate">
@@ -102,12 +101,12 @@
                    v-permission="'order/musicalListDetailExport'"
                    @click="musicalListDetailExport">分发清单导出</el-button>
       </div>
-      <div class="right">
+      <!-- <div class="right">
         <ul>
           <li v-for="(item,index) in processList"
               :key='index'>{{ item.createTime | dateForMinFormat}} {{ item.realName }} {{item.event}}</li>
         </ul>
-      </div>
+      </div> -->
     </div>
   </div>
 </template>
@@ -172,13 +171,13 @@ export default {
       })
 
       // 根据乐团id获取乐团流程
-      getMusicGroupProcess({
-        musicGroupId: this.teamid
-      }).then(res => {
-        if (res.code == 200) {
-          this.processList = res.data;
-        }
-      })
+      // getMusicGroupProcess({
+      //   musicGroupId: this.teamid
+      // }).then(res => {
+      //   if (res.code == 200) {
+      //     this.processList = res.data;
+      //   }
+      // })
     },
     musicalListExport () { // 报表导出
       let url = '/api-web/order/musicalListExport'

src/views/teamDetail/teamList.vue

@@ -178,7 +178,9 @@
                 <el-button type="text"
                            v-if="(scope.row.status == 'APPLY'|| scope.row.status == 'PAY' || scope.row.status == 'PREPARE')  && permission('/teamLookBase')"
                            @click="lookTeamInfo(scope.row)">乐团信息</el-button>
-
+                <el-button v-if="permission('recharge/findAll')"
+                           type="text"
+                           @click="lookSteam(scope.row)">乐团流程</el-button>
                 <!-- 进行中 查看 -->
                 <el-button type="text"
                            v-if="scope.row.status == 'PROGRESS' && permission('/teamDetails')"
@@ -242,6 +244,18 @@
                     :page-sizes="rules.page_size"
                     @pagination="getList" />
       </div>
+      <el-dialog :visible.sync="showSteam"
+                 width="500px"
+                 title="乐团流程">
+
+        <teamSteam :activeId='activeId' />
+        <div slot="footer"
+             class="dialog-footer">
+          <el-button type="primary"
+                     @click="showSteam=false">确 定</el-button>
+        </div>
+      </el-dialog>
+
     </div>
   </div>
 </template>
@@ -252,6 +266,7 @@ import { getCooperation, cancelMusicGroup, startTeam, getEmployeeOrgan, pauseMus
 import { musicGroupStatus } from '@/utils/searchArray'
 import { isObject } from 'util'
 import { permission } from '@/utils/directivePage'
+import teamSteam from './teamListComponent/teamSteam'
 export default {
   name: "teamList",
   data () {
@@ -276,10 +291,13 @@ export default {
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
       passed: [], // 传递的参数
+      showSteam: false,
+      activeId: null
     }
   },
   components: {
-    pagination
+    pagination,
+    teamSteam
   },
   mounted () {
     this.init();
@@ -597,6 +615,11 @@ export default {
         })
       }).catch(() => {
       })
+    },
+    lookSteam (row) {
+      this.activeId = row.id
+      this.showSteam = true
+      console.log(row)
     }
   }
 

src/views/teamDetail/teamListComponent/teamSteam.vue

@@ -0,0 +1,53 @@
+<template>
+  <div class="process">
+    <el-timeline>
+      <el-timeline-item v-for="(activity, index) in processList"
+                        :key="index">
+        <el-card>
+          <div>{{activity.realName}}</div>
+          <div>{{activity.createTime}}</div>
+          <div>{{activity.event}}</div>
+        </el-card>
+      </el-timeline-item>
+    </el-timeline>
+  </div>
+</template>
+<script>
+import { getMusicGroupProcess } from '@/api/buildTeam'
+import dayjs from 'dayjs'
+export default {
+  props: ['activeId'],
+  data () {
+    return {
+      processList: []
+    }
+  },
+  mounted () {
+    this.getProcess()
+    console.log('没来')
+  },
+  methods: {
+    getProcess () {
+      getMusicGroupProcess({
+        musicGroupId: this.activeId
+      }).then(res => {
+        if (res.code == 200) {
+          this.processList = res.data;
+        }
+      })
+    }
+  },
+  // watch: {
+  //   activeId (val) {
+  //     this.getProcess()
+  //   }
+  // }
+}
+</script>
+<style lang="scss" scoped>
+.process {
+  padding: 10px;
+  max-height: 600px;
+  overflow-y: auto;
+}
+</style>