1112 19:42

11

src/layout/components/Navbar.vue

@@ -5,21 +5,24 @@
     <!-- <breadcrumb class="breadcrumb-container" /> -->
     <div class="left-menu">
       <i class='el-icon-location-information topIcon'></i>
-      武汉分部
+      {{ organName }}
     </div>
     <div class="right-menu">
-      <div class="msginfo">
+      <div class="msginfo"
+           @click="gotoRecode">
         <img src="@/assets/images/base/base-bell.png"
              alt="">
-        <div class="active"></div>
+        <!-- <div class="active"></div> -->
       </div>
       <el-dropdown class="avatar-container"
                    trigger="click">
 
         <div class="avatar-wrapper">
-          <img v-if="$store.getters.avatar" :src="$store.getters.avatar"
+          <img v-if="$store.getters.avatar"
+               :src="$store.getters.avatar"
                class="user-avatar" />
-          <img v-else src="@/assets/images/base/placehorder-icon.png" />
+          <img v-else
+               src="@/assets/images/base/placehorder-icon.png" />
           <!-- <i class="el-icon-caret-bottom" /> -->
           <span>{{ username }}</span>
         </div>
@@ -44,7 +47,8 @@ import { mapGetters } from "vuex";
 export default {
   data () {
     return {
-      username: ''
+      username: '',
+      organName: this.$store.getters.organName
     }
   },
   components: {
@@ -68,6 +72,9 @@ export default {
     async logout () {
       await this.$store.dispatch("user/logout");
       this.$router.push(`/login`);
+    },
+    gotoRecode () {
+      this.$router.push('/journal/journal')
     }
   }
 };

src/store/getters.js

@@ -6,6 +6,7 @@ const getters = {
   name: state => state.user.name,
   permission_routes: state => state.permission.routes,
   organ: state => state.user.organ,
+  organName: state => state.user.organName,
   topinfo: state => state.buildTeam.topinfo,
   checkinfo: state => state.buildTeam.checkinfo,
   payList: state => state.buildTeam.payList

src/store/modules/user.js

@@ -6,9 +6,10 @@ const state = {
   token: getToken(),
   name: '',
   avatar: '',
-  organ: ''
+  organ: '',
+  organName: ''
 }
-
+// organName
 const mutations = {
   SET_TOKEN: (state, token) => {
     state.token = token
@@ -21,6 +22,9 @@ const mutations = {
   },
   SET_ORGAN: (state, organ) => {
     state.organ = organ
+  },
+  SET_ORGANNAME: (state, organName) => {
+    state.organName = organName
   }
 }
 
@@ -57,10 +61,12 @@ const actions = {
           const username = data.data.username ? data.data.username : data.data.realName;
           const avatar = data.data.avatar;
           const organ = data.data.organId;
+          const organName = data.data.organName;
           // const { name, avatar } = data
           commit('SET_NAME', username)
           commit('SET_AVATAR', avatar)
           commit('SET_ORGAN', organ)
+          commit('SET_ORGANNAME', organName)
           resolve(data)
         }
       }).catch(error => {

src/views/resetTeaming/index.vue

@@ -56,6 +56,7 @@ export default {
     console.log(this.teamid)
   },
   beforeDestroy () {
+    sessionStorage.setItem('setStep', 0)
     sessionStorage.setItem('resetCode', 1)
   },
   mounted () {

src/views/teamBuild/components/teamResetSound.vue

@@ -429,7 +429,9 @@ export default {
     submitInfo () {
       let obj = {};
       this.payfor.student.chiose == 'loop' ? obj.months = this.payfor.chioseMonth : obj.months = [];
+
       obj.musicGroup = {
+        status: 'DRAFT',
         settlementType: this.topfor.salary,
         applyExpireDate: this.topfor.time + ' 00:00:01',
         chargeTypeId: this.topfor.type,
@@ -487,13 +489,12 @@ export default {
         }
         obj.subjectRegisters.push(item);
       }
-
       // 发请求修改
       createTeam(obj).then(res => {
         if (res.code == 200) {
           // 成功 跳转到筹备中
           let id = res.data;
-          this.$router.push({ path: '/business/teamSeting', query: { id } })
+          this.$router.push({ path: '/business/teamDetail' })
         }
       })
     },

src/views/teamBuild/signupList.vue

@@ -637,6 +637,11 @@ export default {
           this.$message.success('修改成功');
           this.subjectVisible = false;
           this.maskForm.subject = '';
+          getintoClass({ musicGroupId: this.id }).then(res => {
+            if (res.code == 200) {
+              this.leftList = res.data;
+            }
+          })
           this.getList();
         }
       })

src/views/teamBuild/teamSeting/components/coursePlan.vue

@@ -332,6 +332,8 @@ export default {
   },
   created () {
     this.teamid = this.$route.query.id;
+    sessionStorage.setItem('resetCode', 3)
+    sessionStorage.setItem('setStep', 2)
   },
   mounted () {
     // 根据乐团id 查询 此乐团所有的合奏班

src/views/teamBuild/teamSeting/components/setClass.vue

@@ -8,7 +8,7 @@
                          align='center'>
         </el-table-column>
 
-        <el-table-column label="实际人数"
+        <el-table-column label="实际缴费人数"
                          prop="paidStudentNum"
                          align='center'>
         </el-table-column>

src/views/teamBuild/teamSeting/index.vue

@@ -133,6 +133,7 @@ export default {
   },
   beforeDestroy () {
     sessionStorage.setItem('setStep', 0)
+    sessionStorage.setItem('resetCode', 1)
   },
 
   mounted () {

src/views/teamDetail/components/baseInfo.vue

@@ -122,7 +122,7 @@ export default {
         this.topForm.boss = res.data.directorUserName;
         this.topForm.cooperate = res.data.schoolName;
         this.topForm.type = res.data.chargeTypeName;
-        this.topForm.section = res.data.schoolName;
+        this.topForm.section = res.data.organName;
         this.topForm.boss = res.data.educationalTeacherName;
         this.topForm.add = res.data.address
         // 差上课地点

src/views/teamDetail/components/teacherList.vue

@@ -63,12 +63,12 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column align='center'
-                         prop="classGroupName"
+        <!-- <el-table-column align='center'
+                         prop="name"
                          label="合奏班">
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column align='center'
-                         prop="courseScheduleName"
+                         prop="classGroupName"
                          label="执教班级">
         </el-table-column>
         <el-table-column align='center'

src/views/teamDetail/components/teamTeacherRecord.vue

@@ -124,6 +124,7 @@ export default {
       let obj = {
         page: this.rules.page,
         rows: this.rules.limit,
+        musicGroupId: this.teamId,
         teacherName: this.searchForm.teacher || null,
         startTime: this.searchForm.timer[0] || null,
         endTime: this.searchForm.timer[1] || null,

vue.config.js

@@ -17,10 +17,10 @@ const name = defaultSettings.title || 'vue Admin Template' // page title
 // http://47.99.212.176:8000
 // 
 // let target = 'http://192.168.3.27:8000' // 箭河
-// let target = 'http://192.168.3.28:8000' //邹璇
+let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
 // let target = 'http://47.99.212.176:8000' // 测试服
-let target = 'http://192.168.3.48:8000' // 乔
+// let target = 'http://192.168.3.48:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**