退团不退费 乐团基本信息

src/router/index.js

@@ -325,5 +325,7 @@ export const asyncRoutes = {
   salesList: () => import('@/views/businessManager/orderManager/salesList'),
   // 人力资源
   HumanResources: () => import('@/views/HumanResources'),
+  // 查看乐团基本信息
+  teamLookBase: () => import('@/views/teamDetail/teamInfo')
 }
 export default router

src/utils/searchArray.js

@@ -64,7 +64,8 @@ const orderStatus = [
   { value: "PRACTICE_GROUP_BUY", label: "网管课" },
   { value: 'PRACTICE_GROUP_RENEW', label: '网管课续费' },
   { value: 'REPAIR', label: '乐器维修' },
-  { value: 'OUTORDER', label: '外部收入' }
+  { value: 'OUTORDER', label: '外部收入' },
+  { value: 'GOODS_SELL', label: '商品销售' }
 
 ]
 

src/utils/vueFilter.js

@@ -241,7 +241,8 @@ Vue.filter('orderType', value => {
     PRACTICE_GROUP_BUY: '网管课购买',
     PRACTICE_GROUP_RENEW: '网管课续费',
     REPAIR: '乐器维修',
-    OUTORDER: '外部收入'
+    OUTORDER: '外部收入',
+    GOODS_SELL: '商品销售'
 
   }
   return template[value]

src/views/resetTeaming/components/resetSound.vue

@@ -31,6 +31,7 @@
                         v-model.trim="scope.row.typeVisible"
                         v-if='scope.row.type == 1'>
               <el-button type="text"
+                         v-if="lookType!=='look'"
                          slot='reference'>
                 修改
               </el-button>
@@ -70,6 +71,7 @@
             <div style='white-space:pre'
                  v-if="scope.row.fangshi.length >0">{{scope.row.fangshi | fangshiFilter(scope.row)}}</div>
             <i class='el-icon-edit'
+               v-if="lookType!=='look'"
                @click="setGiveMode(scope.row)">
             </i>
             <!-- <el-popover placement="bottom"
@@ -161,6 +163,7 @@
             </span>
             <i class='el-icon-edit'
                slot='reference'
+               v-if="lookType!=='look'"
                @click="chioseMark(scope.row)">
             </i>
           </div>
@@ -169,11 +172,13 @@
     </el-table>
     <!-- <div class="remove"
              @click="removeListItem">删除</div> -->
-    <div class="floor">
+    <div class="floor"
+         v-if="lookType!=='look'">
       <div class='add'
            @click="addListItem">添加</div>
     </div>
     <div class="btnWrap"
+         v-if="lookType!=='look'"
          style="margin-top:30px">
       <div class="closeBtn"
            @click="getSound">取消</div>
@@ -284,7 +289,8 @@
                         v-model.trim="item.mode.LEASE"></el-input>
             </div>
             <div class="item">
-              <el-input style="width:80%" disabled
+              <el-input style="width:80%"
+                        disabled
                         type="number"></el-input>
             </div>
           </div>
@@ -308,7 +314,8 @@
                         disabled></el-input>
             </div>
             <div class="item">
-              <el-input style="width:80%" disabled
+              <el-input style="width:80%"
+                        disabled
                         type="number"></el-input>
             </div>
           </div>
@@ -339,7 +346,8 @@ export default {
       multipleSelection: [], // 列表选择的集合
       soundList: [],
       soundLists: [], // 存储选中项的声部id 记录变量
-      editSound: null
+      editSound: null,
+      lookType: ''
     }
   },
   mounted () {
@@ -353,7 +361,7 @@ export default {
     init () {
       // 获取声部信息
       this.teamid = this.$route.query.id
-
+      this.lookType = this.$route.query.type
       sessionStorage.setItem('resetCode', '2');
       // 获取所有声部
       getSoundTree({ tenantId: 1 }).then(res => {
@@ -399,7 +407,7 @@ export default {
                     isGROUP = true
                   }
                 }
-                if(sub.coursePurchaseTypeJson) {
+                if (sub.coursePurchaseTypeJson) {
                   let courseJson = JSON.parse(sub.coursePurchaseTypeJson)
                   if (courseJson && courseJson.hasOwnProperty("FREE")) {
                     courseFree = courseJson.FREE;
@@ -550,13 +558,13 @@ export default {
               }
 
               let courseTypes = {}
-              if(fs.mode.courseFree) {
+              if (fs.mode.courseFree) {
                 courseTypes.FREE = fs.mode.courseFree
               }
-              if(fs.mode.courseGroup) {
+              if (fs.mode.courseGroup) {
                 courseTypes.GROUP = fs.mode.courseGroup ? fs.mode.courseGroup : 0
               }
-              if(fs.mode.courseLease) {
+              if (fs.mode.courseLease) {
                 courseTypes.LEASE = fs.mode.courseLease
               }
               coursePurchaseTypeJson = JSON.stringify(courseTypes)
@@ -723,10 +731,10 @@ export default {
         item.mode.GROUP = item.mode.price
       }
     },
-    groupCourseInput(item) {
+    groupCourseInput (item) {
       console.log(item)
       let mode = item.mode
-      if(mode.yuji - mode.courseGroup < 0) {
+      if (mode.yuji - mode.courseGroup < 0) {
         mode.courseGroup = mode.yuji
       }
     },

src/views/teamDetail/components/baseInfo.vue

@@ -59,9 +59,12 @@
           </el-form-item> -->
         </el-form>
         <el-button type="text"
+                   v-if="lookType!=='look'"
                    v-permission="'order/musicalListExport'"
                    @click="musicalListExport">订货清单导出</el-button>
+
         <el-button type="text"
+                   v-if="lookType!=='look'"
                    v-permission="'order/musicalListDetailExport'"
                    @click="musicalListDetailExport">分发清单导出</el-button>
       </div>
@@ -98,7 +101,8 @@ export default {
         salary: ''
       },
       name: '',
-      processList: []
+      processList: [],
+      lookType: ''
     }
   },
   created () {
@@ -110,6 +114,7 @@ export default {
   methods: {
     init () {
       this.teamid = this.$route.query.id;
+      this.lookType = this.$route.query.type
       getMusicGroup({
         musicGroupId: this.teamid
       }).then(res => {

src/views/teamDetail/teamInfo.vue

@@ -0,0 +1,143 @@
+<template>
+  <div class='m-container'>
+    <h2>
+      <el-page-header @back="onCancel"
+                      :content="name"></el-page-header>
+    </h2>
+    <div class="m-core">
+
+      <!-- <p class='msg'
+         :class="status=='PROGRESS'? 'ing' : '' "> <img :src="status=='PROGRESS'?stepImgs.PROGRESS:stepImgs.PAUSE"
+             alt="">
+        {{ status=='PROGRESS'?'进行中':'已结束' }}</p> -->
+      <!-- navMenu -->
+      <el-tabs v-model.trim="activeIndex"
+               type="card"
+               @tab-click="handleClick">
+        <el-tab-pane label="基本信息"
+                     name="1">
+          <baseInfo v-if="activeIndex == '1'"
+                    :teamid='teamid' />
+        </el-tab-pane>
+        <el-tab-pane label="声部信息"
+                     name="2">
+          <soundeDetail v-if="activeIndex == '2'"
+                        :teamid='teamid' />
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+  </div>
+</template>
+<script>
+import baseInfo from '@/views/teamDetail/components/baseInfo'
+import soundeDetail from '@/views/resetTeaming/components/resetSound'
+export default {
+  data () {
+    return {
+      activeIndex: this.$route.query.checkIndex ? this.$route.query.checkIndex : '1',
+      teamid: '',
+      name: '',
+      stepImgs: {
+        PROGRESS: require('@/assets/images/base/ing.png'),
+        PAUSE: require('@/assets/images/base/end.png')
+      },
+      status: '',
+      Fsearch: null,
+      Frules: null
+    }
+  },
+  created () {
+    // this.teamid = '191014135135001';
+    // 191015094822001
+    this.init()
+  },
+  activated () {
+    this.activeIndex = null
+    this.init()
+    this.activeIndex = '1'
+  },
+  methods: {
+    init () {
+      let teamInfo = this.$route.query;
+      this.status = this.$route.query.status;
+      this.teamid = teamInfo.id;
+      this.name = teamInfo.name;
+      // 判断是否带缓存参数
+      if (this.$route.query.search) {
+        this.Fsearch = this.$route.query.search;
+      }
+      if (this.$route.query.rules) {
+        this.Frules = this.$route.query.rules
+      }
+    },
+    handleClick (val) {
+      this.activeIndex = val.name;
+    },
+    onCancel () {
+      this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
+    },
+    getname (name) {
+      this.name = name;
+      localStorage.setItem('teamName', name);
+    },
+    resetTeam () {
+      // id  type 
+      this.$router.push({ path: '/business/teamBuild', query: { type: 'resetTeam', id: this.teamid } })
+    }
+  },
+  components: {
+    baseInfo,
+    soundeDetail
+  }
+}
+</script>
+<style lang="scss" scoped>
+.m-container {
+  .m-core {
+    .msg.ing {
+      color: #14928a;
+    }
+    .msg {
+      text-align: right;
+      color: #777;
+      font-size: 32px;
+      font-weight: bold;
+      position: absolute;
+      right: 40px;
+      top: -33px;
+      img {
+        width: 36px;
+        height: 36px;
+        position: relative;
+        top: 5px;
+        margin-right: 8px;
+      }
+    }
+    .abs {
+      position: absolute;
+      right: 240px;
+      top: -28px;
+    }
+  }
+  .term {
+    height: 32px;
+    line-height: 32px;
+    border-radius: 24px;
+    width: 100px;
+    color: #14928a;
+    border: 1px solid rgba(20, 146, 138, 1);
+    font-size: 14px;
+    text-align: center;
+    margin-right: 12px;
+    &:nth-child(1) {
+      margin-left: 47px;
+    }
+  }
+  .term.active {
+    color: #fff;
+    background-color: #14928a;
+  }
+}
+</style>
+<style lang='scss'>
+</style>

src/views/teamDetail/teamList.vue

@@ -166,14 +166,18 @@
                            v-if="scope.row.status == 'PREPARE' && permission('/teamDetailedList')"
                            @click="gotodetailList(scope.row)">发放清单</el-button>
 
-                <el-button type="text"
+                <!-- <el-button type="text"
                            v-if="scope.row.status == 'PREPARE'"
-                           @click="lookTeamCourse(scope.row)">查看课表</el-button>
+                           @click="lookTeamCourse(scope.row)">查看课表</el-button> -->
 
                 <!-- 报名中&缴费中 查看 -->
                 <el-button type="text"
                            v-if="(scope.row.status == 'APPLY'|| scope.row.status == 'PAY')  && permission('/signupList')"
                            @click="lookTeamDetail(scope.row)">查看</el-button>
+                <!-- 报名中缴费中筹备中查看乐团 -->
+                <el-button type="text"
+                           v-if="(scope.row.status == 'APPLY'|| scope.row.status == 'PAY' || scope.row.status == 'PREPARE')  && permission('/signupList')"
+                           @click="lookTeamInfo(scope.row)">查看乐团</el-button>
 
                 <!-- 进行中 查看 -->
                 <el-button type="text"
@@ -528,6 +532,12 @@ export default {
       let rules = JSON.stringify(this.rules)
       this.$router.push({ path: '/business/teamDetailedList', query: { id: row.id, search, rules } })
     },
+    //  
+    lookTeamInfo (row) {
+      let search = JSON.stringify(this.topForm)
+      let rules = JSON.stringify(this.rules)
+      this.$router.push({ path: '/business/teamLookBase', query: { type: 'look', id: row.id, name: row.name, search, rules } })
+    },
     // setImprovement 设置基础技能班
     gotoImprovement (row) {
       let search = JSON.stringify(this.topForm)