Merge branch 'master' of http://git.dayaedu.com/molingzhide/dy-admin-manager

src/utils/vueFilter.js

@@ -125,8 +125,8 @@ Vue.filter('formatTimer', (value) => {
 Vue.filter('timer', (value) => {
   if (value) {
     let tempDate = new Date(value)
-    let month = tempDate.getMonth() + 1 >= 10 ? tempDate.getMonth() + 1 : '0' + tempDate.getMonth() + 1
-    let days = tempDate.getDate() >= 10 ? tempDate.getDate() : '0' + tempDate.getDate()
+    let month = tempDate.getHours() >= 10 ? tempDate.getHours() : '0' + tempDate.getHours()
+    let days = tempDate.getMinutes() >= 10 ? tempDate.getMinutes() : '0' + tempDate.getMinutes()
     return month + ':' + days
   } else {
     return value

src/views/journal/studentComplain.vue

@@ -33,7 +33,7 @@
           <h3 class="title">学员投诉
               <el-tag v-if="showMessage.complaints.status == 'PASS'" type="success" effect="plain">已处理</el-tag>
               <el-tag v-if="showMessage.complaints.status == 'REJECT'" type="danger" effect="plain">已拒绝</el-tag>
-             <span class="time">发起投诉时间: 2019年11月9日14:25:31</span></h3>
+             <span class="time">发起投诉时间: {{ showMessage.courseSchedule.createTime }}</span></h3>
         </el-col>
       </el-row>
 
@@ -48,7 +48,7 @@
       </el-row>
 
       <el-row>
-        <el-col :span="4"> 课程时间： </el-col>
+        <el-col :span="4"> 课程时间：</el-col>
         <el-col :span="20"> {{ showMessage.courseSchedule.classDate | formatTimer }} {{ showMessage.courseSchedule.startClassTime | timer }} </el-col>
       </el-row>
 

src/views/journal/vipApply.vue

@@ -14,7 +14,7 @@
     <div class="middle">
       <div class="msgItem" :class="[isCheckMessage == item.id ? 'active' : '']" @click="onClickRead(item)" v-for="(item, index) in dataList" :key="index">
         <!-- <h6 class="type"></h6> -->
-        <h4 class="name">请假处理<span class='time'>{{ item.createOn }}</span>
+        <h4 class="name">VIP申请审核<span class='time'>{{ item.createOn }}</span>
           <div class="dot" v-if="item.readStatus == 0"></div>
         </h4>
         <p class='msg'>{{ item.content }}</p>

src/views/studentManager/components/studentPayList.vue

@@ -56,11 +56,11 @@
           </template>
         </el-table-column>
         <el-table-column align='center'
-                         prop="actualPrice"
+                         prop="expectPrice"
                          label="预计扣费">
         </el-table-column>
         <el-table-column align='center'
-                         prop="expectPrice"
+                         prop="actualPrice"
                          label="实际扣费">
         </el-table-column>
       </el-table>

src/views/teamBuild/components/teamSoundMoney.vue

@@ -256,17 +256,17 @@
     <div class="btnWrap">
       <div class="PrevBtn"
            @click="goback">上一步</div>
-      <div class="submitBtn"
+      <div class="submitBtn" v-permission="{child: 'musicGroup/auditSuccess', parent: '/teamBuild/teamAudit/soundMoney'}"
            v-if="teamStatus == 'teamAudit'"
            @click="approval">审核通过</div>
 
-      <div class="submitBtn"
+      <div class="submitBtn" v-permission="{child: 'musicGroup/auditFailed', parent: '/teamBuild/teamAudit/soundMoney'}"
            v-if="teamStatus == 'teamAudit'"
            @click="refuse">拒绝</div>
-      <div class="submitBtn"
+      <div class="submitBtn" v-permission="{child: 'musicGroup/createGroup', parent: '/teamBuild/soundMoney'}"
            v-if="teamStatus != 'teamAudit'"
            @click="submitInfo(1)">保存</div>
-      <div class="submitBtn"
+      <div class="submitBtn" v-permission="{child: 'musicGroup/createGroup', parent: '/teamBuild/soundMoney'}"
            v-if="teamStatus != 'teamAudit'"
            @click="submitInfo(2)">提交</div>
     </div>

src/views/teamBuild/index.vue

@@ -22,7 +22,7 @@
           <!--    -->
           <div class="step2 sptep"
                :class="activeIndex == 1?'activestep':''">
-            声部费用
+            声部费用1
           </div>
           <img :src="activeIndex == 1?stepImgs.nol:stepImgs.active"
                alt=""
@@ -35,7 +35,7 @@
           <!--  v-if="activeIndex>=1"   -->
           <div class="step2 sptep"
                :class="activeIndex == 2?'activestep':''">
-            声部费用
+            声部费用2
           </div>
           <img :src="activeIndex == 2?stepImgs.nol:stepImgs.active"
                alt=""

src/views/teamDetail/components/teamTeacherRecord.vue

@@ -114,11 +114,11 @@ export default {
   },
   mounted () {
     this.name = localStorage.getItem('teamName');
-    findMusicGroupClassTeacher({ musicGroupId: this.teamId }).then(res => {
-      if (res.code == 200) {
-        this.teacherList = res.data;
-      }
-    })
+    // findMusicGroupClassTeacher({ musicGroupId: this.teamId }).then(res => {
+    //   if (res.code == 200) {
+    //     this.teacherList = res.data;
+    //   }
+    // })
     this.getList()
   },
   methods: {

src/views/teamDetail/index.vue

@@ -65,7 +65,7 @@ import courseList from '@/views/teamDetail/components/courseList'
 import classList from '@/views/teamDetail/components/classList'
 import salaryList from '@/views/teamDetail/components/salaryList'
 import baseinfo from '@/views/teamDetail/components/baseInfo'
-import { getMusicGroup } from '@/api/buildTeam'
+// import { getMusicGroup } from '@/api/buildTeam'
 export default {
   data () {
     return {

src/views/teamDetail/teamList.vue

@@ -5,9 +5,9 @@
     </h2>
     <div class="m-core">
       <div class="btnList">
-        <div class='newBand'
+        <div class='newBand' v-permission="'/teamBuild'"
              @click="createNewTeam">新建乐团</div>
-        <div class='newBand'
+        <div class='newBand' v-permission="'/teamBuild/trimming'"
              @click="resetTeam">乐团调整</div>
       </div>
 
@@ -137,19 +137,50 @@
                            label="操作">
             <template slot-scope="scope">
               <div>
-                <el-button type="text"
+                <el-button type="text" v-permission="'/setImprovement'"
                            v-if="scope.row.status == 'PREPARE'"
                            @click="gotoImprovement(scope.row)">基础技能班</el-button>
                 <el-button type="text"
                            v-if="scope.row.status == 'PREPARE'" v-permission="'/teamDetailedList'"
                            @click="gotodetailList(scope.row)">发放清单</el-button>
-                <el-button type="text"
-                           v-if="scope.row.status == 'PROGRESS' ||  scope.row.status == 'PAUSE'||scope.row.status == 'APPLY'|| scope.row.status == 'PAY'"
+
+                <!-- 报名中&缴费中 查看 -->
+                <el-button type="text" v-permission="'/signupList'"
+                           v-if="scope.row.status == 'APPLY'|| scope.row.status == 'PAY'"
                            @click="lookTeamDetail(scope.row)">查看</el-button>
-                <el-button type="text"
+
+                <!-- 进行中 查看 -->
+                <el-button type="text" v-permission="'/teamDetails'"
+                           v-if="scope.row.status == 'PROGRESS'"
+                           @click="lookTeamDetail(scope.row)">查看</el-button>
+
+                <!-- 暂停中 查看 -->
+                <el-button type="text" v-permission="'musicGroup/pauseMusicGroup/look'"
+                           v-if="scope.row.status == 'PAUSE'"
+                           @click="lookTeamDetail(scope.row)">查看</el-button>
+
+
+                <!-- <el-button type="text"
                            v-if="scope.row.status != 'PROGRESS' && scope.row.status != 'CANCELED'  && scope.row.status != 'PAUSE' && scope.row.status != 'APPLY'&& scope.row.status != 'PAY'"
+                           @click="lookTeamDetail(scope.row)">编辑</el-button> -->
+                <!-- 筹备中 编辑 -->
+                <el-button type="text" v-permission="'teamDetail/teamSeting/update'"
+                           v-if="scope.row.status == 'PREPARE'"
+                           @click="lookTeamDetail(scope.row)">编辑</el-button>
+                <!-- 审核中 编辑 -->
+                <el-button type="text" v-permission="'teamDetail/audit/update'"
+                           v-if="scope.row.status == 'AUDIT'"
+                           @click="lookTeamDetail(scope.row)">编辑</el-button>
+                <!-- 编辑中 编辑 -->
+                <el-button type="text" v-permission="'teamDetail/draft/update'"
+                           v-if="scope.row.status == 'DRAFT'"
+                           @click="lookTeamDetail(scope.row)">编辑</el-button>
+                <!-- 审核失败 编辑 -->
+                <el-button type="text" v-permission="'teamDetail/aduitFailed/update'"
+                           v-if="scope.row.status == 'AUDIT_FAILED'"
                            @click="lookTeamDetail(scope.row)">编辑</el-button>
 
+                
                 <el-button v-if="scope.row.status == 'PREPARE'" v-permission="'musicGroup/action'"
                            @click="startTeam(scope.row)"
                            type="text">确认成团</el-button>