Browse Source

1128 11:07

111
mo 5 years ago
parent
commit
5541922a4c
31 changed files with 64 additions and 28 deletions
  1. 0 0
      dist/index.html
  2. 1 1
      dist/static/css/chunk-7f4cbce0.a5359e64.css
  3. 0 0
      dist/static/js/app.f7a7c3b1.js
  4. 0 0
      dist/static/js/app.f913732e.js
  5. 0 0
      dist/static/js/chunk-09890dd8.14678695.js
  6. 0 0
      dist/static/js/chunk-0d829c04.187705c7.js
  7. 0 0
      dist/static/js/chunk-14f62aae.f5ef9b93.js
  8. 0 0
      dist/static/js/chunk-1c9ae0ee.9a678215.js
  9. 0 0
      dist/static/js/chunk-203a4adc.01dcce35.js
  10. 0 0
      dist/static/js/chunk-28d97328.3d04f801.js
  11. 0 0
      dist/static/js/chunk-35d7984f.c75fab70.js
  12. 0 0
      dist/static/js/chunk-3d843c38.142a9c18.js
  13. 0 0
      dist/static/js/chunk-419ce36c.e04157ff.js
  14. 0 0
      dist/static/js/chunk-47e9338e.e1c488e8.js
  15. 0 0
      dist/static/js/chunk-5d19d6c0.c7ad7051.js
  16. 0 0
      dist/static/js/chunk-5e5d6dc0.43095e21.js
  17. 0 0
      dist/static/js/chunk-5ec46df2.7261b571.js
  18. 0 0
      dist/static/js/chunk-61ffa9e4.c6670e76.js
  19. 0 0
      dist/static/js/chunk-64c33787.deb97cac.js
  20. 0 0
      dist/static/js/chunk-6562cc02.1ce68b13.js
  21. 0 0
      dist/static/js/chunk-68259a14.76d5bccd.js
  22. 0 0
      dist/static/js/chunk-7e64b570.2992baaf.js
  23. 0 0
      dist/static/js/chunk-7f4cbce0.8a41b666.js
  24. 0 0
      dist/static/js/chunk-90bc8dd8.4d78d4a5.js
  25. 0 0
      dist/static/js/chunk-9e0b01d4.0f2be37f.js
  26. 0 0
      dist/static/js/chunk-a4bfd726.3911e216.js
  27. 0 0
      dist/static/js/chunk-bc672cf4.cf786ab6.js
  28. 0 0
      dist/static/js/chunk-dc69ca8a.d9691a7b.js
  29. 0 0
      dist/static/js/chunk-ddec259c.1e587cc4.js
  30. 15 9
      src/views/buildVip/index.vue
  31. 48 18
      src/views/teamBuild/components/teamBaseInfo.vue

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 1 - 1
dist/static/css/chunk-09890dd8.230065a5.css → dist/static/css/chunk-7f4cbce0.a5359e64.css

@@ -1 +1 @@
-.m-core[data-v-54a598aa]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-54a598aa]{width:180px}.m-core h4[data-v-54a598aa]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-54a598aa],.m-core .right[data-v-54a598aa],.m-core .vipLeft[data-v-54a598aa]{width:400px}.planList[data-v-54a598aa]{padding:0 25px}.planList .planTop[data-v-54a598aa]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-54a598aa]{font-size:14px}.planList .planCore .row[data-v-54a598aa]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-54a598aa]{width:87px}.okBtn[data-v-54a598aa]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}
+.m-core[data-v-31ce9a19]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-31ce9a19]{width:180px}.m-core h4[data-v-31ce9a19]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-31ce9a19],.m-core .right[data-v-31ce9a19],.m-core .vipLeft[data-v-31ce9a19]{width:400px}.planList[data-v-31ce9a19]{padding:0 25px}.planList .planTop[data-v-31ce9a19]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-31ce9a19]{font-size:14px}.planList .planCore .row[data-v-31ce9a19]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-31ce9a19]{width:87px}.okBtn[data-v-31ce9a19]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.f7a7c3b1.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.f913732e.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-09890dd8.14678695.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-0d829c04.187705c7.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-14f62aae.f5ef9b93.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-1c9ae0ee.9a678215.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-203a4adc.01dcce35.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-28d97328.3d04f801.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-35d7984f.c75fab70.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-3d843c38.142a9c18.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-419ce36c.e04157ff.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-47e9338e.e1c488e8.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-5d19d6c0.c7ad7051.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-5e5d6dc0.43095e21.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-5ec46df2.7261b571.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-61ffa9e4.c6670e76.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-64c33787.deb97cac.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-6562cc02.1ce68b13.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-68259a14.76d5bccd.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-7e64b570.2992baaf.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-7f4cbce0.8a41b666.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-90bc8dd8.4d78d4a5.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-9e0b01d4.0f2be37f.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-a4bfd726.3911e216.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-bc672cf4.cf786ab6.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-dc69ca8a.d9691a7b.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-ddec259c.1e587cc4.js


+ 15 - 9
src/views/buildVip/index.vue

@@ -34,7 +34,7 @@
                        filterable
                        clearable
                        :disabled="!leftForm.subject"
-                       @change="setSection">
+                       @change="setSection($event)">
               <el-option v-for="(item,index) in teacherList"
                          :key="index"
                          :label="item.username"
@@ -45,6 +45,7 @@
                         prop="courseType">
             <el-select v-model="leftForm.courseType"
                        clearable
+                       :disabled="!leftForm.teacher"
                        @change="changeType">
               <el-option v-for="(item,index) in courseTypeList"
                          :key="index"
@@ -512,13 +513,6 @@ export default {
     })
     // 获取所有老师的接口  根据声部id获取老师
     // 获取课程类型的接口
-    vipGroupCategory().then(res => {
-      if (res.code == 200) {
-        this.courseTypeList = res.data;
-      }
-    })
-
-
   },
   methods: {
     changeSubject (val) {
@@ -961,14 +955,26 @@ export default {
 
     },
     setSection (val) {
+      console.log(val);
       this.leftForm.section = '';
       this.rightForm.offlineCourse = '';
       this.rightForm.onlineCourse = '';
-      getTeachSchool({ userId: val }).then(res => {
+      this.leftForm.courseType = ''
+      getTeachSchool({ userId: val.id }).then(res => {
         if (res.code == 200) {
           this.scetionList = res.data;
         }
       })
+      for (let i in this.teacherList) {
+        if (this.teacherList[i].id == val) {
+          // 根据分部id去获取课程形式
+          vipGroupCategory({ organId: this.teacherList[i].organId }).then(res => {
+            if (res.code == 200) {
+              this.courseTypeList = res.data;
+            }
+          })
+        }
+      }
     },
     onCancel () {
       this.$router.push({ path: '/business/vipList', query: { rules: this.rules, searchForm: this.searchForm } })

+ 48 - 18
src/views/teamBuild/components/teamBaseInfo.vue

@@ -34,6 +34,7 @@
                       prop="school"
                       :rules="[{ required: true, message: '合作单位不能为空'},]">
           <el-select v-model="topFrom.school"
+                     :disabled="!topFrom.section"
                      @change="chioseSchool"
                      clearable>
             <el-option v-for="(item,index) in cooperationList"
@@ -45,7 +46,8 @@
         <el-form-item label="教学地点"
                       prop="address"
                       :rules="[{ required: true, message: '教学地点不能为空'},]">
-          <el-select v-model="topFrom.address">
+          <el-select v-model="topFrom.address"
+                     :disabled="!topFrom.section">
             <el-option v-for="(item,index) in addList"
                        :key='index'
                        :label="item.name"
@@ -328,7 +330,8 @@
       </div>
     </div>
     <div class="btnWrap">
-      <div class="nextBtn" v-permission="{child: 'musicGroup/update', parent: '/resetTeaming/teamBaseInfo'}"
+      <div class="nextBtn"
+           v-permission="{child: 'musicGroup/update', parent: '/resetTeaming/teamBaseInfo'}"
            v-if="teamStatus=='resetTeam'"
            @click="resetSubmit">
         修改
@@ -394,7 +397,7 @@
 </template>
 <script>
 import { getSection, getType, getCooperation, getTeacher, getAddress, getPayMaster, getPayStatus, getTeamBaseInfo, resetTeamBaseInfo, getEmployeeOrgan } from '@/api/buildTeam'
-import { queryEmployByOrganId } from '@/api/systemManage'
+import { queryEmployByOrganId, queryByOrganId, getSchool } from '@/api/systemManage'
 import { scrollTo } from '@/utils/scroll-to'
 import axios from 'axios'
 import store from '@/store'
@@ -485,10 +488,10 @@ export default {
     //          2. newTeam  新建乐团
     //          3.teamList 跨团修改
     //          4.teamDraft 乐团草稿
-    let year = new Date().getFullYear();
-    axios.post('/jiari/', qs.stringify({ d: year })).then(res => {
-      // this.holidayList = Object.keys(res.data[year])
-    })
+    // let year = new Date().getFullYear();
+    // axios.post('/jiari/', qs.stringify({ d: year })).then(res => {
+    //   // this.holidayList = Object.keys(res.data[year])
+    // })
     this.teamStatus = this.$route.query.type;
     // 传过来的乐团信息
     this.activeTeam = this.getTeamList;
@@ -542,11 +545,24 @@ export default {
           // 循环缴费月
           this.payList.chioseMonth = res.data.months;
           if (this.topFrom.section) {
+            // 获取员工
             queryEmployByOrganId({ organId: this.topFrom.section, rows: 1000 }).then(res => {
               if (res.code == 200) {
                 this.orgianList = res.data.rows;
               }
             })
+            // 获取合作单位
+            queryByOrganId({ organId: this.topFrom.section }).then(res => {
+              if (res.code == 200) {
+                this.cooperationList = res.data;
+              }
+            })
+            // 获取教学点
+            getSchool({ organId: this.topFrom.section }).then(res => {
+              if (res.code == 200) {
+                this.addList = res.data
+              }
+            })
           }
         }
       })
@@ -572,11 +588,11 @@ export default {
       }
     })
     // 3.获取合作单位选项卡
-    getCooperation({ 'rows': 1000, search: this.organId }).then(res => {
-      if (res.code == 200) {
-        this.cooperationList = res.data.rows;
-      }
-    })
+    // getCooperation({ 'rows': 1000, search: this.organId }).then(res => {
+    //   if (res.code == 200) {
+    //     this.cooperationList = res.data.rows;
+    //   }
+    // })
     // 4.获取老师选项卡
     // getTeacher({ 'rows': 1000, organId: this.organId }).then(res => {
     //   if (res.code == 200) {
@@ -584,11 +600,11 @@ export default {
     //   }
     // })
     // 5.获取教学地点选项卡
-    getAddress({ 'rows': 1000, }).then(res => {
-      if (res.code == 200) {
-        this.addList = res.data.rows;
-      }
-    })
+    // getAddress({ 'rows': 1000, }).then(res => {
+    //   if (res.code == 200) {
+    //     this.addList = res.data.rows;
+    //   }
+    // })
     // 6.默认支付主体
     // getPayMaster({ 'rows': 1000 }).then(res => {
     //   console.log(res);
@@ -608,16 +624,30 @@ export default {
   },
   methods: {
     changeSection (val) {
-      // 修改分部的时候 重置运营主管 重置教务老师 重置乐队指导
+      // 修改分部的时候 重置运营主管 重置教务老师 重置乐队指导 合作单位  教学点
       this.topFrom.teacher = '';
       this.topFrom.boss = '';
       this.topFrom.head = '';
+      this.topFrom.school = '';
+      this.topFrom.address = '';
       // 发请求 根据分部id 查询所有员工
       queryEmployByOrganId({ organId: val, rows: 1000 }).then(res => {
         if (res.code == 200) {
           this.orgianList = res.data.rows;
         }
       })
+      // 合作单位
+      queryByOrganId({ organId: val }).then(res => {
+        if (res.code == 200) {
+          this.cooperationList = res.data;
+        }
+      })
+      // 教学点=>学校
+      getSchool({ organId: val }).then(res => {
+        if (res.code == 200) {
+          this.addList = res.data
+        }
+      })
     },
     chioseSchool (val) {
 

Some files were not shown because too many files changed in this diff