Merge branch 'online' into permission_small

dist/static/css/chunk-33a8e999.725423c0.css → dist/static/css/chunk-3e119562.0a67e255.css

@@ -1 +1 @@
-.m-core[data-v-7d5a279d]{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-7d5a279d]{width:180px}.m-core h4[data-v-7d5a279d]{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-7d5a279d],.m-core .right[data-v-7d5a279d],.m-core .vipLeft[data-v-7d5a279d]{width:400px}.planList[data-v-7d5a279d]{padding:0 25px}.planList .planTop[data-v-7d5a279d]{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-7d5a279d]{font-size:14px}.planList .planCore .row[data-v-7d5a279d]{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-7d5a279d]{width:87px}.okBtn[data-v-7d5a279d]{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-456bb4e3]{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-456bb4e3]{width:180px}.m-core h4[data-v-456bb4e3]{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-456bb4e3],.m-core .right[data-v-456bb4e3],.m-core .vipLeft[data-v-456bb4e3]{width:400px}.planList[data-v-456bb4e3]{padding:0 25px}.planList .planTop[data-v-456bb4e3]{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-456bb4e3]{font-size:14px}.planList .planCore .row[data-v-456bb4e3]{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-456bb4e3]{width:87px}.okBtn[data-v-456bb4e3]{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}

src/views/buildVip/index.vue

@@ -553,7 +553,7 @@ export default {
         this.searchForm = this.$route.query.searchForm;
       }
       // 获取所有科目的接口
-      getSubject().then(res => {
+      getSubject({tenantId:1}).then(res => {
         if (res.code == 200) {
           this.subjectList = res.data;
         }

src/views/categroyManager/globalConfig.vue

@@ -7,26 +7,29 @@
       <!-- navMenu -->
       <el-tabs v-model.trim="activeIndex" type="card" @tab-click="handleClick">
         
-        <el-tab-pane label="声部设置" name="0" v-if="permissionList.musicalManager">
+        <el-tab-pane label="声部设置(对内)" name="0" v-if="permissionList.musicalManager">
             <musicalManager v-if="activeIndex == 0" />
         </el-tab-pane>
-        <el-tab-pane label="乐团收费类型" name="1" v-if="permissionList.typesManager">
-            <typesManager v-if="activeIndex == 1" />
+        <el-tab-pane label="声部设置(对外)" name="1" v-if="permissionList.musicalManagerOut">
+            <musicalManagerOut v-if="activeIndex == 1" />
         </el-tab-pane>
-        <el-tab-pane label="乐团收费标准" name="2" v-if="permissionList.chargesList">
-          <chargesList v-if="activeIndex == 2" />
+        <el-tab-pane label="乐团收费类型" name="2" v-if="permissionList.typesManager">
+            <typesManager v-if="activeIndex == 2" />
         </el-tab-pane>
-        <el-tab-pane label="乐团作业模板" name="3" v-if="permissionList.jobTemplateSetting">
-            <jobTemplateSetting v-if="activeIndex == 3" />
+        <el-tab-pane label="乐团收费标准" name="3" v-if="permissionList.chargesList">
+          <chargesList v-if="activeIndex == 3" />
         </el-tab-pane>
-        <el-tab-pane label="热词标签" name="4" v-if="permissionList.errorManager">
-          <errorManager v-if="activeIndex == 4" />
+        <el-tab-pane label="乐团作业模板" name="4" v-if="permissionList.jobTemplateSetting">
+            <jobTemplateSetting v-if="activeIndex == 4" />
         </el-tab-pane>
-        <el-tab-pane label="参数设置" name="5" v-if="permissionList.overallManager">
-            <overallManager v-if="activeIndex == 5" />
+        <el-tab-pane label="热词标签" name="5" v-if="permissionList.errorManager">
+          <errorManager v-if="activeIndex == 5" />
         </el-tab-pane>
-        <el-tab-pane label="收费分润配置" name="6" v-if="permissionList.overallManagerTwo">
-            <overallManagerTwo v-if="activeIndex == 6" />
+        <el-tab-pane label="参数设置" name="6" v-if="permissionList.overallManager">
+            <overallManager v-if="activeIndex == 6" />
+        </el-tab-pane>
+        <el-tab-pane label="收费分润配置" name="7" v-if="permissionList.overallManagerTwo">
+            <overallManagerTwo v-if="activeIndex == 7" />
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -36,6 +39,7 @@
 import overallManager from './generalSettings/overallManager'
 import overallManagerTwo from './generalSettings/overallManagerTwo'
 import musicalManager from './specialSetup/musicalManager'
+import musicalManagerOut from './specialSetup/musicalManagerOut'
 import typesManager from './specialSetup/typesManager'
 import jobTemplateSetting from './specialSetup/jobTemplateSetting'
 import errorManager from './generalSettings/errorManager'
@@ -46,6 +50,7 @@ export default {
     overallManager,
     overallManagerTwo,
     musicalManager, 
+    musicalManagerOut, 
     typesManager, 
     jobTemplateSetting, 
     errorManager,
@@ -59,6 +64,7 @@ export default {
         overallManager: permission('/globalConfig/overallManager'),
         overallManagerTwo: permission('/globalConfig/overallManagerTwo'),
         musicalManager: permission('/globalConfig/musicalManager'),
+        musicalManagerOut: permission('/globalConfig/musicalManagerOut'),
         typesManager: permission('/globalConfig/typesManager'),
         chargesList: permission('/globalConfig/chargesList'),
         jobTemplateSetting: permission('/globalConfig/jobTemplateSetting'),

src/views/categroyManager/specialSetup/musicalManager.vue

@@ -101,6 +101,7 @@ export default {
       if (!this.oneTypeName) return
       subjectUpset({
         parentSubjectId: 0,
+        tenantId: 1,
         name: this.oneTypeName
       }).then(res => {
         this.messageTips('添加', res)
@@ -114,6 +115,7 @@ export default {
       if (!this.inputValue[index]) return
       subjectUpset({
         parentSubjectId: item.id,
+        tenantId: 1,
         name: this.inputValue[index]
       }).then(res => {
         this.messageTips('添加', res)
@@ -141,6 +143,7 @@ export default {
     getList () {
       subjectListTree({
         delFlag: 0,
+        tenantId: 1,
         rows: 9999
       }).then(res => {
         let result = res.data

src/views/categroyManager/specialSetup/musicalManagerOut.vue

@@ -0,0 +1,256 @@
+<template>
+  <div class='m-container'>
+    <!-- <h2>声部管理</h2> -->
+    <div class="m-core">
+      <!-- <div class='newBand'>添加</div> -->
+      <!-- 列表 -->
+      <el-row class="music-title">
+        <el-col :span="6">
+          一级分类
+          <el-popover placement="right"
+                      width="300"
+                      trigger="click">
+            <el-input v-model.trim="oneTypeName"
+                      size="medium"
+                      style="width: 73%"
+                      autocomplete="off"></el-input>
+            <el-button style="margin: 0;"
+                       @click="onAddMusic"
+                       type="primary"
+                       size="medium">提交</el-button>
+            <el-button slot="reference"
+                       type="primary"
+                       size="mini"
+                       round
+                       icon="el-icon-plus">添加</el-button>
+          </el-popover>
+
+        </el-col>
+        <el-col :span="18">
+          二级分类
+        </el-col>
+      </el-row>
+
+      <el-row v-for="(item, index) in subjectList"
+              :key="item.id">
+        <el-col :span="6">
+          <el-button @click="subjectDelete(item)"
+                     icon="el-icon-delete"
+                     circle></el-button>
+          <span class="one_name">{{ item.name }}</span>
+        </el-col>
+        <el-col :span="18"
+                class="tow_col">
+
+          <el-tag v-for="s in item.subjects"
+                  :key="s.id"
+                  type="info"
+                  effect="dark"
+                  closable
+                  :disable-transitions="false"
+                  @close="subjectDelete(s)"> {{s.name}}</el-tag>
+          <span style="display: inline-block;">
+            <el-input class="input-new-tag"
+                      v-if="item.inputStatus"
+                      v-model.trim="inputValue[index]"
+                      key="tag"
+                      ref="saveTagInput"
+                      size="small">
+            </el-input>
+            <el-button v-else
+                       key="tag"
+                       type="primary"
+                       size="mini"
+                       round
+                       icon="el-icon-plus"
+                       @click="item.inputStatus = true">添加</el-button>
+            <el-button v-if="item.inputStatus"
+                       type="info"
+                       size="mini"
+                       round
+                       icon="el-icon-check"
+                       @click="onSave(item, index)">保存</el-button>
+          </span>
+        </el-col>
+      </el-row>
+
+    </div>
+  </div>
+</template>
+<script>
+import pagination from '@/components/Pagination/index'
+import { subjectListTree, subjectUpset } from '@/api/specialSetting'
+export default {
+  components: { pagination },
+  name: 'musicalManager',
+  data () {
+    return {
+      oneTypeName: null, // 添加一级分类名称
+      subjectList: [],
+      inputValue: []
+    }
+  },
+  mounted () {
+    this.getList()
+  },
+  methods: {
+    onAddMusic () {
+      // 添加一级分类 
+      if (!this.oneTypeName) return
+      subjectUpset({
+        parentSubjectId: 0,
+        tenantId: 2,
+        name: this.oneTypeName
+      }).then(res => {
+        this.messageTips('添加', res)
+        if (res.code == 200) {
+          this.oneTypeName = null
+        }
+      })
+    },
+    onSave (item, index) {
+      // 添加二级分类 
+      if (!this.inputValue[index]) return
+      subjectUpset({
+        parentSubjectId: item.id,
+        tenantId: 2,
+        name: this.inputValue[index]
+      }).then(res => {
+        this.messageTips('添加', res)
+        if (res.code == 200) {
+          this.inputValue[index] = null
+        }
+      })
+    },
+    subjectDelete (item) { // 删除分类
+      subjectUpset({
+        delFlag: 'YES',
+        id: item.id
+      }).then(res => {
+        this.messageTips('删除', res)
+      })
+    },
+    messageTips (title, res) {
+      if (res.code == 200) {
+        this.$message.success(title + '成功')
+        this.getList()
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    getList () {
+      subjectListTree({
+        delFlag: 0,
+        tenantId: 2,
+        rows: 9999
+      }).then(res => {
+        let result = res.data
+        if (res.code == 200) {
+          let tempArray = []
+          result.rows.forEach(item => {
+            item.inputStatus = false
+            tempArray.push(item)
+          })
+          this.subjectList = tempArray
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+/deep/.el-popover {
+  .el-form {
+    display: flex;
+  }
+  .el-form-item__content {
+    margin-left: 0 !important;
+  }
+}
+.music-title {
+  font-size: 14px;
+  color: #444;
+  .el-col {
+    background-color: #edeef0;
+    padding-left: 36px;
+  }
+  /deep/.el-button {
+    float: right;
+    margin-top: 10px;
+    margin-right: 16px;
+  }
+}
+.el-row {
+  margin-bottom: 12px;
+  .el-col {
+    line-height: 48px;
+  }
+  .el-col-18 {
+    width: calc(75% - 20px);
+    margin-left: 20px;
+  }
+  .one_name {
+    padding-left: 10px;
+  }
+  .tow_col {
+    padding-left: 20px;
+    .el-button--primary {
+      background: #fff;
+      border-color: #979797;
+      color: #777;
+      &:hover,
+      &:active,
+      &:focus {
+        background: #fff;
+        border-color: #979797;
+        color: #777;
+      }
+    }
+  }
+  .tow_input {
+    width: 100px;
+    margin-right: 12px;
+  }
+}
+.el-button--primary {
+  background: #14928a;
+  border-color: #14928a;
+  color: #fff;
+  &:hover,
+  &:active,
+  &:focus {
+    background: #14928a;
+    border-color: #14928a;
+    color: #fff;
+  }
+}
+/deep/.el-date-editor.el-input {
+  width: 100% !important;
+}
+.el-select {
+  width: 98% !important;
+}
+.el-tag + .el-tag {
+  margin-left: 10px;
+}
+.button-new-tag {
+  margin-left: 10px;
+  height: 32px;
+  line-height: 30px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+.input-new-tag {
+  width: 90px;
+  // margin-left: 10px;
+  vertical-align: bottom;
+}
+.el-tag--dark.el-tag--info {
+  background-color: #f0f2f5;
+  border-color: #f0f2f5;
+  color: #5a5e66;
+  /deep/.el-tag__close {
+    background-color: #c0c4cc;
+  }
+}
+</style>

src/views/resetTeaming/components/resetSound.vue

@@ -342,7 +342,7 @@ export default {
 
       sessionStorage.setItem('resetCode', '2');
       // 获取所有声部
-      getSoundTree().then(res => {
+      getSoundTree({tenantId:1}).then(res => {
         if (res.code == 200) {
           this.soundList = res.data.rows;
           // // 生成动态的checkList

src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -59,7 +59,13 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="所属分部" prop="organId" :label-width="formLabelWidth">
-                <el-select v-model.trim="topForm.organId" filterable clearable placeholder="所属分部">
+                <el-select
+                  v-model.trim="topForm.organId"
+                  filterable
+                  clearable
+                  placeholder="所属分部"
+                  @change="switchOrgan"
+                >
                   <el-option
                     v-for="item in branchList"
                     :key="item.value"
@@ -109,6 +115,11 @@
                 <el-input disabled v-model.trim="teacherSchools"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="备份名字" :label-width="formLabelWidth">
+                <el-input v-model.trim="topForm.memo"></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
@@ -117,7 +128,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12" class="diSpan">
-              <el-tooltip placement="top" popper-class="mTooltip"> 
+              <el-tooltip placement="top" popper-class="mTooltip">
                 <div slot="content">
                   「是」当前声部的学生都可以选择该老师；
                   <br />「否」只有该老师的VIP课，单技课，基础技能课的学生可以选择该老师；
@@ -185,6 +196,7 @@
             <el-col :span="12">
               <el-form-item label="专业技能" prop="subjectIds" :label-width="formLabelWidth">
                 <el-select
+                  :disabled="!topForm.organId"
                   multiple
                   v-model.trim="topForm.subjectIds"
                   clearable
@@ -200,7 +212,7 @@
                       v-for="item in group.options"
                       :key="item.value"
                       :label="item.label"
-                      :value="item.value.toString()"
+                      :value="item.value"
                     ></el-option>
                   </el-option-group>
                 </el-select>
@@ -336,8 +348,10 @@ export default {
         certificateType: null,
         certificateNum: null,
         isSupportCourseScheduleRewardsRules: true,
-        isSupportExtraPracticeLesson: null
+        isSupportExtraPracticeLesson: null,
+        memo: null
       },
+      tenantId: null,
       imageIcon: require("@/assets/images/base/warning.png"),
       rules: {
         realName: [
@@ -403,65 +417,50 @@ export default {
           });
         }
       });
-      subjectListTree({
-        // 声部
-        delFlag: 0,
-        rows: 9999
-      }).then(res => {
-        let result = res.data;
-        if (res.code == 200) {
-          let tempArray = [];
-          result.rows.forEach((item, index) => {
-            let subject = [];
-            item.subjects.forEach(s => {
-              subject.push({
-                value: s.id,
-                label: s.name
-              });
-            });
-
-            tempArray[index] = {
-              label: item.name,
-              options: subject
-            };
-          });
-          this.subjectList = tempArray;
-        }
-      });
 
       if (this.pageType == "update") {
         teacherGet({ teacherId: this.teacherId }).then(res => {
-          let result = res.data;
-          this.topForm = {
-            realName: result.realName,
-            gender: result.gender,
-            birthdate: result.birthdate,
-            entryDate: result.entryDate,
-            jobNature: result.jobNature,
-            organId: result.teacherOrganId,
-            flowOrganRange: result.flowOrganRangeId
-              ? result.flowOrganRangeId.split(",")
-              : null,
-            introduction: result.introduction,
-            phone: result.phone,
-            avatar: result.avatar,
-            graduateSchool: result.graduateSchool,
-            email: result.email,
-            educationBackground: result.educationBackground,
-            subjectIds: result.subjectId ? result.subjectId.split(",") : null,
-            technicalTitles: result.technicalTitles,
-            certificateType: result.certificateType,
-            certificateNum: result.certificateNum,
-            isProbationPeriod: result.isProbationPeriod,
-            isSupportCourseScheduleRewardsRules:
-              result.isSupportCourseScheduleRewardsRules,
-            isSupportExtraPracticeLesson: result.isSupportExtraPracticeLesson
-          };
-          let sn = [];
-          result.teacherSchools.forEach(item => {
-            sn.push(item.name);
-          });
-          this.teacherSchools = this.joinArray(sn, ","); // 教学点
+          if (res.code == 200) {
+            let result = res.data;
+            this.topForm = {
+              realName: result.realName,
+              gender: result.gender,
+              birthdate: result.birthdate,
+              entryDate: result.entryDate,
+              jobNature: result.jobNature,
+              organId: result.teacherOrganId,
+              flowOrganRange: result.flowOrganRangeId
+                ? result.flowOrganRangeId.split(",")
+                : null,
+              introduction: result.introduction,
+              phone: result.phone,
+              avatar: result.avatar,
+              graduateSchool: result.graduateSchool,
+              email: result.email,
+              educationBackground: result.educationBackground,
+            
+              technicalTitles: result.technicalTitles,
+              certificateType: result.certificateType,
+              certificateNum: result.certificateNum,
+              isProbationPeriod: result.isProbationPeriod,
+              isSupportCourseScheduleRewardsRules:
+                result.isSupportCourseScheduleRewardsRules,
+              isSupportExtraPracticeLesson: result.isSupportExtraPracticeLesson,
+              memo:result.memo
+            };
+            let sn = [];
+            result.teacherSchools.forEach(item => {
+              sn.push(item.name);
+            });
+            if(result.subjectId){
+              let arr = result.subjectId.split(",");
+              this.topForm.subjectIds = arr.map(item=>{
+                return parseInt(item)
+              })
+            }
+            this.teacherSchools = this.joinArray(sn, ","); // 教学点
+            this.switchOrgan()
+          }
         });
       }
     },
@@ -545,7 +544,8 @@ export default {
         technicalTitles: null,
         certificateType: null,
         certificateNum: null,
-        jobType: "ADVISER"
+        jobType: "ADVISER",
+        memo
       };
       this.$refs[formName].resetFields();
     },
@@ -563,6 +563,42 @@ export default {
         // 获取光标所在位置
         this.topForm.avatar = res.data.url;
       }
+    },
+    // 选择分部
+    switchOrgan() {
+      if (this.topForm.organId == 43) {
+        this.tenantId = 2;
+      } else {
+        this.tenantId = 1;
+      }
+      subjectListTree({
+        // 声部
+        delFlag: 0,
+        rows: 9999,
+        tenantId: this.tenantId
+      }).then(res => {
+        let result = res.data;
+        if (res.code == 200) {
+          let tempArray = [];
+          result.rows.forEach((item, index) => {
+            let subject = [];
+            if (item.subjects) {
+              item.subjects.forEach(s => {
+                subject.push({
+                  value: s.id,
+                  label: s.name
+                });
+              });
+            }
+
+            tempArray[index] = {
+              label: item.name,
+              options: subject
+            };
+          });
+          this.subjectList = tempArray;
+        }
+      });
     }
   }
 };

src/views/teamBuild/components/teamResetSound.vue

@@ -223,7 +223,7 @@ export default {
 
       this.payfor = this.$store.getters.payList;
 
-      getSoundTree().then(res => {
+      getSoundTree({tenantId:1}).then(res => {
         if (res.code == 200) {
           this.soundList = res.data.rows;
           // // 生成动态的checkList

src/views/teamBuild/components/teamSoundMoney.vue

@@ -679,7 +679,7 @@ export default {
       if (this.$route.query.rules) {
         this.Frules = this.$route.query.rules
       }
-      getSoundTree().then(res => {
+      getSoundTree({tenantId:1}).then(res => {
         if (res.code == 200) {
           this.soundList = res.data.rows;
           // // 生成动态的checkList