1119 18:53

111

src/views/categroyManager/generalSettings/vipParameterManager.vue

@@ -356,7 +356,7 @@ export default {
         id: scope.row.id
       }).then(res => {
         if (res.code == 200) {
-          scope._self.$refs[scope.$index].doClose();
+          scope._self.$refs[scope.row.id].doClose()
           this.getDefaultClassesCycle();
         }
       })

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

@@ -89,23 +89,27 @@
           <template slot-scope="scope">
             <div v-if='scope.row.teacherDefaultMusicGroupSalaryList'>
               <div v-for="(item,index) in scope.row.teacherDefaultMusicGroupSalaryList"
-                   v-if="scope.row.teacherRole =='TEACHING'"
                    style="display: table-cell;"
                    :key='item.id'>
+                <div v-if="scope.row.teacherRole =='TEACHING'">
+                  <span>课酬:</span>
+                  <el-input style="width: 80px;margin-right:10px"
+                            v-model="scope.row.teacherDefaultMusicGroupSalaryList[index].assistantTeacher90MinSalary"></el-input>
+                </div>
                 <!-- 梯度{{index+1}}: -->
-                <span>课酬:</span>
-                <el-input style="width: 80px;margin-right:10px"
-                          v-model="scope.row.teacherDefaultMusicGroupSalaryList[index].assistantTeacher90MinSalary"></el-input>
+                <div v-if="scope.row.teacherRole =='BISHOP'">
+                  <span>课酬:</span>
+                  <el-input style="width: 80px;margin-right:10px"
+                            v-model="scope.row.teacherDefaultMusicGroupSalaryList[index].mainTeacher90MinSalary"></el-input>
+                </div>
               </div>
 
-              <div v-for="(item,index) in scope.row.teacherDefaultMusicGroupSalaryList"
+              <!-- <div v-for="(item,index) in scope.row.teacherDefaultMusicGroupSalaryList"
                    v-if="scope.row.teacherRole =='BISHOP'"
                    style="display: table-cell;"
-                   :key='item.id'>
-                <span>课酬:</span>
-                <el-input style="width: 80px;margin-right:10px"
-                          v-model="scope.row.teacherDefaultMusicGroupSalaryList[index].mainTeacher90MinSalary"></el-input>
-              </div>
+                   :key='index'>
+
+              </div> -->
 
               <!-- <el-input v-if='scope.row.teacherDefaultMusicGroupSalaryList&&scope.row.teacherDefaultMusicGroupSalaryList[0]&&scope.row.teacherDefaultMusicGroupSalaryList[0].mainTeacherSalary&&scope.row.teacherRole =="TEACHING"'
                         v-model="scope.row.teacherDefaultMusicGroupSalaryList[0].mainTeacherSalary"></el-input>
@@ -151,8 +155,8 @@ export default {
     sessionStorage.setItem('setStep', 4)
     getTeamDetail({ musicGroupId: this.teamid }).then(res => {
       if (res.code == 200) {
-        this.searchForm.salary = res.data.musicGroup.settlementType;
-        if (!res.data.musicGroup.settlementType) {
+        this.searchForm.salary = res.data.settlementType;
+        if (!res.data.settlementType) {
           this.hasDate = true;
         }
         if (this.searchForm.salary == 'TEACHER_DEFAULT') {
@@ -237,6 +241,7 @@ export default {
     },
     changeSalary (val) {
       this.searchForm.salary = val;
+      this.hasDate = false;
       this.getList()
       return
       if (val == 'TEACHER_DEFAULT') {
@@ -266,10 +271,8 @@ export default {
     getList () {
       getTeamDetail({ musicGroupId: this.teamid }).then(res => {
         if (res.code == 200) {
-          this.searchForm.salary = res.data.musicGroup.settlementType;
-          if (!res.data.settlementType) {
-            this.hasDate = true;
-          }
+
+          // this.searchForm.salary = res.data.settlementType;
           if (this.searchForm.salary == 'TEACHER_DEFAULT') {
             findMusicGroupClassTeacherSalary({ musicGroupId: this.teamid, type: 'TEACHER_DEFAULT' }).then(res => {
               if (res.code == 200) {

vue.config.js

@@ -16,10 +16,11 @@ const name = defaultSettings.title || '大雅后台管理系统' // page title
 // const port = process.env.port || process.env.npm_config_port || 9528 // dev port
 // http://47.99.212.176:8000 
 // 
+let target = 'http://192.168.3.8:18000' //勇哥迁库
 // let target = 'http://192.168.3.27: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://47.99.212.176:8000' // 测试服
 // let target = 'http://192.168.3.48:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {