1212 17:56

11

src/views/categroyManager/insideSetting/staffManager.vue

@@ -19,6 +19,40 @@
                     placeholder="姓名或手机号"></el-input>
         </el-form-item>
         <el-form-item>
+          <el-select v-model="searchForm.jobNature"
+                     clearable
+                     placeholder="请选择工作类型">
+            <el-option label="全职"
+                       value="FULL_TIME"></el-option>
+            <el-option label="兼职"
+                       value="PART_TIME"></el-option>
+            <el-option label="临时"
+                       value="TEMPORARY"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="searchForm.organId"
+                     clearable
+                     placeholder="请选择分部">
+            <el-option v-for="item in branchList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <!--   multiple -->
+          <el-select v-model="searchForm.roleId"
+                     clearable
+                     placeholder="请选择角色">
+            <el-option v-for="item in roleList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value"></el-option>
+          </el-select>
+          <!-- collapse-tags -->
+        </el-form-item>
+        <el-form-item>
           <el-button @click="search"
                      type="danger">搜索</el-button>
         </el-form-item>
@@ -247,7 +281,10 @@ export default {
         entryDate: [{ required: true, message: '请选择入职时间', trigger: 'blur' }],
       },
       searchForm: {
-        search: null
+        search: null,
+        jobNature: null,
+        organId: null,
+        roleId: null
       }
     }
   },

src/views/teamBuild/signupList.vue

@@ -28,6 +28,7 @@
                @click="onCreateQRCode">报名链接</div>
           <div class='newBand'
                @click="onCreateQRCode2">缴费详情</div>
+          <p style="margin-bottom:15px;">报名缴费截止时间:{{ applyExpireDate | formatTimer }} 0点</p>
         </div>
       </div>
       <!--  stepImgs: {
@@ -371,7 +372,7 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import { getintoClass, getStudentList, findSound, musicGroupOpenPay, openPayment, musicGroupFound, extensionPayment, resetPlanNum, cancelMusicGroup } from '@/api/buildTeam'
+import { getintoClass, getStudentList, findSound, musicGroupOpenPay, openPayment, musicGroupFound, extensionPayment, resetPlanNum, cancelMusicGroup, getTeamBaseInfo } from '@/api/buildTeam'
 import { resetStudentSubject, getStudentFeeDetail } from '@/api/studentManager'
 import { vaildStudentUrl, vaildTeacherUrl } from '@/utils/validate'
 import QRCode from 'qrcodejs2'
@@ -445,7 +446,8 @@ export default {
         expireDate: [{ required: true, message: '请选择延长时间', trigger: 'change' }]
       },
       Fsearch: null,
-      Frules: null
+      Frules: null,
+      applyExpireDate: ''
     }
   },
   created () {
@@ -464,7 +466,11 @@ export default {
 
   },
   mounted () {
-
+    getTeamBaseInfo({ musicGroupId: this.id }).then(res => {
+      if (res.code == 200) {
+        this.applyExpireDate = res.data.musicGroup.applyExpireDate;
+      }
+    })
     // 根据乐团id获取学团情况
     getintoClass({ musicGroupId: this.id }).then(res => {
       if (res.code == 200) {

src/views/teamDetail/components/courseList.vue

@@ -36,6 +36,16 @@
                      value="OVER"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="班级名称">
+        <!-- getMusicGroupAllClass -->
+        <el-select v-model="searchForm.class"
+                   clearable>
+          <el-option v-for='(item,index) in classList'
+                     :key="index"
+                     :value="item.id"
+                     :label="item.name"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="选择日期">
         <el-date-picker v-model="searchForm.timer"
                         style="width:420px;"
@@ -204,7 +214,7 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import { getCourseList, findMusicGroupClassTeacher, resetCourse, getTeacher } from '@/api/buildTeam'
+import { getCourseList, findMusicGroupClassTeacher, resetCourse, getTeacher, getMusicGroupAllClass } from '@/api/buildTeam'
 export default {
   props: {
     teamid: {
@@ -218,7 +228,8 @@ export default {
       searchForm: {
         courseStatus: '', // 课程类型
         classStatus: '', // 课程状态
-        timer: [] // 时间
+        timer: [], // 时间
+        class: ''
       },
       tableList: [],
       searchLsit: [],
@@ -243,7 +254,8 @@ export default {
         startTime: [{ required: true, message: '请选择上课开始时间', trigger: 'blur' },],
         endTime: [{ required: true, message: '请选择上课结束时间', trigger: 'blur' },],
       },
-      teacherList: []
+      teacherList: [],
+      classList: []
     }
   },
   components: {
@@ -262,6 +274,13 @@ export default {
         this.teacherList = res.data;
       }
     })
+
+    // 获取班级列表
+    getMusicGroupAllClass({ musicGroupId: this.teamid }).then(res => {
+      if (res.code == 200) {
+        this.classList = res.data;
+      }
+    })
   },
   methods: {
     /**
@@ -284,7 +303,8 @@ export default {
         musicGroupId: this.teamid,
         startTime: this.searchForm.timer[0] || null,
         endTime: this.searchForm.timer[1] || null,
-        page: this.rules.page, rows: this.rules.limit
+        page: this.rules.page, rows: this.rules.limit,
+        classGroupId: this.searchForm.class || null
 
       }
       getCourseList(obj).then(res => {

src/views/teamDetail/components/salaryList.vue

@@ -266,8 +266,8 @@ export default {
                 subsidy: '',
                 radio: ''
               },
-                this.dialogTableVisible = false;
-              this.innerVisible = false;
+                // this.dialogTableVisible = false;
+                this.innerVisible = false;
             }
           })
         } else {

src/views/teamDetail/components/studentList.vue

@@ -730,7 +730,7 @@ export default {
         snapClass: [], --> */
 
           let maskForm = this.maskForm
-          if (!maskForm.signClass && !maskForm.mixClassId) {
+          if (!maskForm.signClass && !maskForm.mixClass) {
             this.$message.error('必须加入一个单机班或合奏班')
             return;
           }

src/views/vipClass/vipReset.vue

@@ -162,8 +162,10 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="课程调整"
+    <el-dialog title="vip加课"
+               width="1000px"
                :visible.sync="addCourseVisible">
+
       <el-button type="text"
                  @click="addOneChiose">添加</el-button>
       <el-table :data='addTable'>
@@ -173,6 +175,7 @@
           <template slot-scope="scope">
             <div>
               <el-date-picker v-model="scope.row.classDate"
+                              style="width:200px!important"
                               type="date"
                               placeholder="选择日期">
               </el-date-picker>
@@ -185,6 +188,7 @@
           <template slot-scope="scope">
             <div>
               <el-time-select v-model="scope.row.startClassTimeStr"
+                              style="width:150px!important"
                               :picker-options="{
                                 start: '04:30',
                                 step: '00:05',

vue.config.js

@@ -18,10 +18,10 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // // 
 // let target = 'http://testadm.dayaedu.com/' //勇哥迁库
 // 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:18000' //勇哥
 // let target = 'http://47.99.212.176:8000' // 测试服
-let target = 'http://192.168.3.48:8080' // 乔
+// let target = 'http://192.168.3.48:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**