11 12 11:36

111

dist/static/css/chunk-3112337f.c65a5178.css → dist/static/css/chunk-d1c4aba4.bca66e59.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-90107580]{font-size:14px}.btnList[data-v-90107580]{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:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-90107580]{margin-right:15px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-61175392]{font-size:14px}.btnList[data-v-61175392]{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:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-61175392]{margin-right:15px}

src/api/buildTeam.js

@@ -651,4 +651,13 @@ export function getClassCOurse (data) {
     method: 'get',
     params: data
   })
+}
+
+// 获取员工所有的分部列表
+export function getEmployeeOrgan (data) {
+  return request({
+    url: api + `/organization/queryEmployeeOrgan`,
+    method: 'get',
+    params: data
+  })
 }

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

@@ -46,10 +46,10 @@
               <!-- &&scope.row.teacherDefaultMusicGroupSalaryList[0].mainTeacherSalary &&scope.row.teacherDefaultMusicGroupSalaryList[0].mainTeacherSalary-->
               <el-input style="width: 80px;margin-right:10px"
                         v-if='scope.row.teacherDefaultMusicGroupSalaryList&&scope.row.teacherDefaultMusicGroupSalaryList[0]&&scope.row.teacherRole =="TEACHING"'
-                        v-model="scope.row.teacherDefaultMusicGroupSalaryList[0].assistantTeacherSalary"></el-input>
+                        v-model="scope.row.teacherDefaultMusicGroupSalaryList[0].assistantTeacher30MinSalary"></el-input>
               <el-input style="width: 80px;margin-right:10px"
                         v-if='scope.row.teacherDefaultMusicGroupSalaryList&&scope.row.teacherDefaultMusicGroupSalaryList[0]&&scope.row.teacherRole =="BISHOP"'
-                        v-model="scope.row.teacherDefaultMusicGroupSalaryList[0].mainTeacherSalary"></el-input>
+                        v-model="scope.row.teacherDefaultMusicGroupSalaryList[0].mainTeacher30MinSalary"></el-input>
             </div>
           </template>
         </el-table-column>
@@ -89,18 +89,19 @@
                    v-if="scope.row.teacherRole =='TEACHING'"
                    style="display: table-cell;"
                    :key='index'>
-                <span>梯度{{index+1}}:</span>
+                <!-- 梯度{{index+1}}: -->
+                <span>课酬:</span>
                 <el-input style="width: 80px;margin-right:10px"
-                          v-model="scope.row.teacherDefaultMusicGroupSalaryList[index].assistantTeacherSalary"></el-input>
+                          v-model="scope.row.teacherDefaultMusicGroupSalaryList[index].assistantTeacher90MinSalary"></el-input>
               </div>
 
               <div v-for="(item,index) in scope.row.teacherDefaultMusicGroupSalaryList"
                    v-if="scope.row.teacherRole =='BISHOP'"
                    style="display: table-cell;"
                    :key='index'>
-                <span>梯度{{index+1}}:</span>
+                <span>课酬:</span>
                 <el-input style="width: 80px;margin-right:10px"
-                          v-model="scope.row.teacherDefaultMusicGroupSalaryList[index].mainTeacherSalary"></el-input>
+                          v-model="scope.row.teacherDefaultMusicGroupSalaryList[index].mainTeacher90MinSalary"></el-input>
               </div>
 
               <!-- <el-input v-if='scope.row.teacherDefaultMusicGroupSalaryList&&scope.row.teacherDefaultMusicGroupSalaryList[0]&&scope.row.teacherDefaultMusicGroupSalaryList[0].mainTeacherSalary&&scope.row.teacherRole =="TEACHING"'

src/views/teamDetail/components/teacherList.vue

@@ -1,7 +1,8 @@
 <template>
   <div class='t-container'>
     <!-- 头部展示 -->
-    <div class="headWrap">
+    <div class="headWrap"
+         style="padding:0;">
       <!-- <div class="left">
         <div class="headItem">
           <p>教学主管: <span> 张三，李四</span></p>
@@ -18,7 +19,7 @@
     <el-form :inline="true"
              class="searchForm"
              v-model="searchForm">
-      <el-form-item>
+      <!-- <el-form-item>
         <el-select v-model="searchForm.status"
                    placeholder="合奏班">
           <el-option v-for='(item,index) in mixCourseList'
@@ -26,9 +27,10 @@
                      :value="item.id"
                      :label="item.name"></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
-        <el-input v-model="searchForm.search"></el-input>
+        <el-input placeholder="老师姓名 编号 手机号"
+                  v-model="searchForm.search"></el-input>
       </el-form-item>
       <el-form-item>
         <div class="searchBtn"

src/views/teamDetail/teamList.vue

@@ -17,6 +17,17 @@
           <el-input v-model="topForm.teamName"
                     placeholder="请输入乐团名称"></el-input>
         </el-form-item>
+        <el-form-item prop='status'>
+          <el-select class='multiple'
+                     v-model="topForm.orgin"
+                     clearable
+                     placeholder="请选择分部">
+            <el-option v-for="(item,index) in organList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
         <!-- 多选 -->
         <el-form-item prop='status'>
           <el-select class='multiple'
@@ -172,7 +183,7 @@
 import pagination from '@/components/Pagination/index'
 // import { truncate } from 'fs';
 import { getTeamList, getPayType } from '@/api/teamServer'
-import { getCooperation, cancelMusicGroup, startTeam } from '@/api/buildTeam'
+import { getCooperation, cancelMusicGroup, startTeam, getEmployeeOrgan } from '@/api/buildTeam'
 import { musicGroupStatus } from '@/utils/searchArray'
 export default {
   name: "Main",
@@ -182,8 +193,10 @@ export default {
         teamName: '',
         status: '',
         payType: '',
-        word: ''
+        word: '',
+        orgin: ''
       },
+      organList: [],
       typeList: [], // 收费类型
       nowStatus: musicGroupStatus,
       searchLsit: [], // 存储选择后的数组
@@ -204,6 +217,11 @@ export default {
   mounted () {
     sessionStorage.setItem('resetCode', '1')
     this.getList();
+    getEmployeeOrgan().then(res => {
+      if (res.code == 200) {
+        this.organList = res.data;
+      }
+    })
     // 获取乐团收费类型
     getPayType().then(res => {
       // console.log(res);
@@ -220,7 +238,7 @@ export default {
       getTeamList({
         rows: this.rules.limit,
         page: this.rules.page,
-        organId: this.$store.getters.organ,
+        organId: this.topForm.orgin || null,
         chargeTypeId: this.topForm.payType || null,
         musicGroupName: this.topForm.teamName || null,
         musicGroupStatus: this.topForm.status || null,

vue.config.js

@@ -16,11 +16,11 @@ const name = defaultSettings.title || 'vue Admin Template' // 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.27:8000' // 箭河
+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://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 = {
   /**