瀏覽代碼

1216 15:54

新增select搜索功能 已经vip课程单价修改
mo 5 年之前
父節點
當前提交
a505d5946e
共有 48 個文件被更改,包括 418 次插入147 次删除
  1. 3 2
      src/views/buildVip/index.vue
  2. 1 0
      src/views/businessManager/orderManager/backMoney.vue
  3. 3 0
      src/views/businessManager/orderManager/expend.vue
  4. 8 1
      src/views/businessManager/orderManager/income.vue
  5. 4 0
      src/views/businessManager/orderManager/incomebuy.vue
  6. 2 0
      src/views/businessManager/shopManager/shopCategory.vue
  7. 7 2
      src/views/businessManager/shopManager/shopOperation.vue
  8. 20 10
      src/views/categroyManager/insideSetting/branchActive.vue
  9. 10 4
      src/views/categroyManager/insideSetting/branchActiveOperation.vue
  10. 3 1
      src/views/categroyManager/insideSetting/branchManager.vue
  11. 51 26
      src/views/categroyManager/insideSetting/chargeProfitManager.vue
  12. 13 2
      src/views/categroyManager/insideSetting/staffManager.vue
  13. 5 1
      src/views/categroyManager/specialSetup/branchSetting.vue
  14. 2 0
      src/views/categroyManager/specialSetup/charges.vue
  15. 6 2
      src/views/categroyManager/specialSetup/chargesList.vue
  16. 3 1
      src/views/categroyManager/specialSetup/jobTemplateSetting.vue
  17. 2 0
      src/views/categroyManager/specialSetup/typesManager.vue
  18. 10 2
      src/views/categroyManager/vipActiveList.vue
  19. 3 1
      src/views/categroyManager/vipChargeSeting.vue
  20. 9 2
      src/views/categroyManager/vipNewActive.vue
  21. 3 0
      src/views/resetTeaming/components/resetSound.vue
  22. 3 1
      src/views/studentManager/components/studentOrder.vue
  23. 2 0
      src/views/studentManager/components/studentPayList.vue
  24. 4 0
      src/views/studentManager/components/studentRecord.vue
  25. 4 0
      src/views/studentManager/components/teamAndcourse.vue
  26. 3 0
      src/views/studentManager/studentList.vue
  27. 4 0
      src/views/teacherManager/teacherDetail/components/settlement.vue
  28. 4 0
      src/views/teacherManager/teacherDetail/components/teacherRecord.vue
  29. 12 2
      src/views/teacherManager/teacherList.vue
  30. 13 1
      src/views/teacherManager/teacherOperation/components/teacherOperation.vue
  31. 9 1
      src/views/teamBuild/components/teamBaseInfo.vue
  32. 4 2
      src/views/teamBuild/components/teamResetSound.vue
  33. 10 7
      src/views/teamBuild/components/teamSoundMoney.vue
  34. 8 5
      src/views/teamBuild/signupList.vue
  35. 6 0
      src/views/teamBuild/teamSeting/components/coursePlan.vue
  36. 7 1
      src/views/teamBuild/teamSeting/components/improvementClass.vue
  37. 2 0
      src/views/teamBuild/teamSeting/components/salarySet.vue
  38. 2 0
      src/views/teamBuild/teamSeting/components/setTeacher.vue
  39. 7 2
      src/views/teamDetail/components/courseList.vue
  40. 10 2
      src/views/teamDetail/components/resetClass.vue
  41. 11 0
      src/views/teamDetail/components/studentList.vue
  42. 2 1
      src/views/teamDetail/components/studentSignin.vue
  43. 9 6
      src/views/teamDetail/teamList.vue
  44. 3 1
      src/views/vipClass/vipDetail/components/teacherRecord.vue
  45. 90 50
      src/views/vipClass/vipDetail/components/vipBaseInfo.vue
  46. 8 4
      src/views/vipClass/vipDetail/index.vue
  47. 3 0
      src/views/vipClass/vipList.vue
  48. 10 4
      src/views/vipClass/vipReset.vue

+ 3 - 2
src/views/buildVip/index.vue

@@ -351,9 +351,9 @@
       </div>
     </el-dialog>
     <div class="btnWrap">
-      <div class="closeBtn">
+      <!-- <div class="closeBtn">
         取消
-      </div>
+      </div> -->
       <div class="okBtn"
            @click="submitInfo">
         {{id?'修改':'确定'}}
@@ -984,6 +984,7 @@ export default {
 
     },
     setSection (val) {
+      console.log(val)
       this.leftForm.section = '';
       this.rightForm.offlineCourse = '';
       this.rightForm.onlineCourse = '';

+ 1 - 0
src/views/businessManager/orderManager/backMoney.vue

@@ -12,6 +12,7 @@
           <el-select class='multiple'
                      v-model="searchForm.organId"
                      clearable
+                     filterable
                      placeholder="请选择分部">
             <el-option v-for="(item,index) in organList"
                        :key="index"

+ 3 - 0
src/views/businessManager/orderManager/expend.vue

@@ -11,6 +11,7 @@
         <el-form-item prop='organId'>
           <el-select class='multiple'
                      v-model="searchForm.organId"
+                     filterable
                      clearable
                      placeholder="请选择分部">
             <el-option v-for="(item,index) in organList"
@@ -75,6 +76,8 @@
             <template slot-scope="scope">
               <!-- <el-input type="text" v-model="scope.row.channel" placeholder="支付渠道"></el-input> -->
               <el-select v-if="scope.row.status == 'ING'"
+                         filterable
+                         clearable
                          v-model="scope.row.detail.transType"
                          placeholder="请选择"
                          style="width: 100% !important;">

+ 8 - 1
src/views/businessManager/orderManager/income.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="m-container">
-    <h2><div class="squrt"></div>订单管理</h2>
+    <h2>
+      <div class="squrt"></div>订单管理
+    </h2>
     <div class="m-core">
       <!-- 搜索类型 -->
       <el-form :inline="true"
@@ -9,6 +11,7 @@
         <el-form-item prop='organId'>
           <el-select class='multiple'
                      v-model="searchForm.organId"
+                     filterable
                      clearable
                      placeholder="请选择分部">
             <el-option v-for="(item,index) in organList"
@@ -30,6 +33,8 @@
         </el-form-item>
         <el-form-item>
           <el-select v-model="searchForm.paymentType"
+                     clearable
+                     filterable
                      placeholder="交易类型">
             <el-option v-for="(item, index) in orderStatus"
                        :key="index"
@@ -39,6 +44,8 @@
         </el-form-item>
         <el-form-item>
           <el-select v-model="searchForm.paymentStatus"
+                     clearable
+                     filterable
                      placeholder="交易状态">
             <el-option v-for="(item, index) in dealStatus"
                        :key="index"

+ 4 - 0
src/views/businessManager/orderManager/incomebuy.vue

@@ -10,6 +10,8 @@
                v-model="searchForm">
         <el-form-item>
           <el-select v-model="searchForm.paymentType"
+                     clearable
+                     filterable
                      placeholder="交易类型">
             <el-option v-for="(item, index) in orderStatus"
                        :key="index"
@@ -19,6 +21,8 @@
         </el-form-item>
         <el-form-item>
           <el-select v-model="searchForm.paymentStatus"
+                     clearable
+                     filterable
                      placeholder="交易状态">
             <el-option v-for="(item, index) in dealStatus"
                        :key="index"

+ 2 - 0
src/views/businessManager/shopManager/shopCategory.vue

@@ -59,6 +59,8 @@
                       prop="subjectIds"
                       :label-width="formLabelWidth">
           <el-select v-model="form.subjectIds"
+                     clearable
+                     filterable
                      multiple>
             <el-option-group v-for="group in subjectList"
                              :key="group.label"

+ 7 - 2
src/views/businessManager/shopManager/shopOperation.vue

@@ -21,7 +21,10 @@
         </el-form-item>
         <el-form-item label="商品类型"
                       prop="type">
-          <el-select v-model="form.type">
+          <el-select v-model="form.type"
+                     clearable
+                     filterable>
+
             <el-option label="乐器"
                        value="INSTRUMENT"></el-option>
             <el-option label="辅件"
@@ -36,7 +39,9 @@
         </el-form-item>
         <el-form-item label="商品分类"
                       prop="goodsCategoryId">
-          <el-select v-model="form.goodsCategoryId">
+          <el-select v-model="form.goodsCategoryId"
+                     clearable
+                     filterable>
             <el-option v-for="item in categoryList"
                        :key="item.value"
                        :label="item.label"

+ 20 - 10
src/views/categroyManager/insideSetting/branchActive.vue

@@ -19,14 +19,21 @@
                     placeholder="分部活动名"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-select v-model="searchForm.rewardMode" clearable placeholder="分部活动类型">
-            <el-option label="累计奖励" value="PER"></el-option>
-            <el-option label="阶梯奖励" value="STAIR"></el-option>
+          <el-select v-model="searchForm.rewardMode"
+                     clearable
+                     filterable
+                     placeholder="分部活动类型">
+            <el-option label="累计奖励"
+                       value="PER"></el-option>
+            <el-option label="阶梯奖励"
+                       value="STAIR"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model="searchForm.teacherId" 
-                     clearable placeholder="适用老师">
+          <el-select v-model="searchForm.teacherId"
+                     clearable
+                     filterable
+                     placeholder="适用老师">
             <el-option v-for="item in teacherList"
                        :key="item.value"
                        :label="item.label"
@@ -34,7 +41,10 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model="searchForm.vipGroupCategoryId" clearable placeholder="课程类型">
+          <el-select v-model="searchForm.vipGroupCategoryId"
+                     filterable
+                     clearable
+                     placeholder="课程类型">
             <el-option v-for="item in vipGroupCategoryList"
                        :key="item.value"
                        :label="item.label"
@@ -134,9 +144,9 @@ export default {
     this.__init()
   },
   methods: {
-    async __init() {
-      let vipGroupCategoryList = await vipGroupCategory({ page:1, rows: 9999 })
-      if(vipGroupCategoryList.code == 200) {
+    async __init () {
+      let vipGroupCategoryList = await vipGroupCategory({ page: 1, rows: 9999 })
+      if (vipGroupCategoryList.code == 200) {
         vipGroupCategoryList.data.forEach(item => {
           this.vipGroupCategoryList.push({
             label: item.name,
@@ -146,7 +156,7 @@ export default {
       }
 
       let teacherList = await getTeacher()
-      if(teacherList.code == 200) {
+      if (teacherList.code == 200) {
         teacherList.data.forEach(item => {
           this.teacherList.push({
             label: item.realName,

+ 10 - 4
src/views/categroyManager/insideSetting/branchActiveOperation.vue

@@ -64,6 +64,8 @@
                       style="width: 500px">
           <el-select style="width: 100% !important;"
                      v-model="result.vipGroupCategoryIdList"
+                     filterable
+                     clearable
                      multiple
                      placeholder="请选择">
             <el-option v-for="item in vipGroupCategoryList"
@@ -77,6 +79,8 @@
                       label="所属分部"
                       style="width: 500px">
           <el-select style="width: 100% !important;"
+                     filterable
+                     clearable
                      @change="onBranchChange"
                      v-model="result.organId"
                      placeholder="请选择">
@@ -92,6 +96,8 @@
                       style="width: 500px">
           <el-select style="width: 100% !important;"
                      v-model="result.teacherId"
+                     filterable
+                     clearable
                      multiple
                      placeholder="请选择">
             <el-option v-for="item in teacherList"
@@ -156,8 +162,8 @@ export default {
   methods: {
     async __init () {
       this.$refs.form.resetFields()
-      let vipGroupCategoryList = await vipGroupCategory({ page:1, rows: 9999 })
-      if(vipGroupCategoryList.code == 200) {
+      let vipGroupCategoryList = await vipGroupCategory({ page: 1, rows: 9999 })
+      if (vipGroupCategoryList.code == 200) {
         vipGroupCategoryList.data.forEach(item => {
           this.vipGroupCategoryList.push({
             label: item.name,
@@ -204,9 +210,9 @@ export default {
         }
       }
     },
-    onBranchChange(value) {
+    onBranchChange (value) {
       findTeacherByOrganId({ organId: value }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           res.data.forEach(item => {
             this.teacherList.push({
               label: item.realName,

+ 3 - 1
src/views/categroyManager/insideSetting/branchManager.vue

@@ -99,7 +99,9 @@
         <el-form-item label="所属分部"
                       prop="organId"
                       :label-width="formLabelWidth">
-          <el-select v-model="form.organId">
+          <el-select v-model="form.organId"
+                     filterable
+                     clearable>
             <el-option v-for="item in userBranchList"
                        :key="item.value"
                        :label="item.label"

+ 51 - 26
src/views/categroyManager/insideSetting/chargeProfitManager.vue

@@ -42,7 +42,7 @@
                            label="详情">
             <template slot-scope="scope">
               <span v-if="scope.row.type == 1">
-                比例:公{{ scope.row.comScale }} &nbsp;&nbsp;&nbsp;  私{{ scope.row.perScale }}
+                比例:公{{ scope.row.comScale }} &nbsp;&nbsp;&nbsp; 私{{ scope.row.perScale }}
               </span>
               <span v-if="scope.row.type == 2">
                 课程:{{ scope.row.courseFee == 'COM' ? '公' : '私' }};
@@ -78,11 +78,14 @@
       <el-form :model="form"
                :rules="rules"
                ref="ruleForm">
-        <el-form-item label="收费方式" required
+        <el-form-item label="收费方式"
+                      required
                       :label-width="formLabelWidth">
-          <el-radio v-model.number="form.type" @change="onRadioChange('ruleForm')"
+          <el-radio v-model.number="form.type"
+                    @change="onRadioChange('ruleForm')"
                     :label="1">比例分润</el-radio>
-          <el-radio v-model.number="form.type" @change="onRadioChange('ruleForm')"
+          <el-radio v-model.number="form.type"
+                    @change="onRadioChange('ruleForm')"
                     :label="2">收费种类</el-radio>
         </el-form-item>
 
@@ -90,19 +93,28 @@
           <el-form-item label="公"
                         prop="comScale"
                         :label-width="formLabelWidth">
-            <el-input type="number" min="0" max="10" v-model="form.comScale"></el-input>
+            <el-input type="number"
+                      min="0"
+                      max="10"
+                      v-model="form.comScale"></el-input>
           </el-form-item>
           <el-form-item label="私"
                         prop="perScale"
                         :label-width="formLabelWidth">
-            <el-input type="number" min="0" max="10" v-model="form.perScale"></el-input>
+            <el-input type="number"
+                      min="0"
+                      max="10"
+                      v-model="form.perScale"></el-input>
           </el-form-item>
         </div>
 
         <div v-show="form.type == 2">
-          <el-form-item label="课程" required
+          <el-form-item label="课程"
+                        required
                         :label-width="formLabelWidth">
             <el-select placeholder="请选择方式"
+                       clearable
+                       filterable
                        v-model="form.courseFee">
               <el-option label="公"
                          value="COM"></el-option>
@@ -110,9 +122,12 @@
                          value="PER"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="乐器" required
+          <el-form-item label="乐器"
+                        required
                         :label-width="formLabelWidth">
             <el-select placeholder="请选择方式"
+                       filterable
+                       clearable
                        v-model="form.instrumentFee">
               <el-option label="公"
                          value="COM"></el-option>
@@ -120,19 +135,25 @@
                          value="PER"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="辅件" required
+          <el-form-item label="辅件"
+                        required
                         :label-width="formLabelWidth">
             <el-select placeholder="请选择方式"
+                       clearable
+                       filterable
                        v-model="form.accessoriesFee">
               <el-option label="公"
                          value="COM"></el-option>
               <el-option label="私"
                          value="PER"></el-option>
             </el-select>
-          </el-form-item> 
-          <el-form-item label="其它" required
+          </el-form-item>
+          <el-form-item label="其它"
+                        required
                         :label-width="formLabelWidth">
             <el-select placeholder="请选择方式"
+                       filterable
+                       clearable
                        v-model="form.otherFee">
               <el-option label="公"
                          value="COM"></el-option>
@@ -141,12 +162,16 @@
             </el-select>
           </el-form-item>
         </div>
-        <el-form-item label="所属分部" prop="organId" :label-width="formLabelWidth">
-          <el-select v-model="form.organId">
+        <el-form-item label="所属分部"
+                      prop="organId"
+                      :label-width="formLabelWidth">
+          <el-select v-model="form.organId"
+                     clearable
+                     filterable>
             <el-option v-for="item in branchList"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"></el-option>
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value"></el-option>
           </el-select>
         </el-form-item>
 
@@ -223,24 +248,24 @@ export default {
   },
   watch: {
     'form.comScale': {
-      handler(newvalue, oldvalue) {
-        if(newvalue) {
+      handler (newvalue, oldvalue) {
+        if (newvalue) {
           this.form.perScale = 10 - newvalue
-          if(newvalue > 10) {
+          if (newvalue > 10) {
             this.form.comScale = 10
-          } else if(newvalue < 0) {
+          } else if (newvalue < 0) {
             this.form.comScale = 0
           }
         }
       }
     },
     'form.perScale': {
-      handler(newvalue, oldvalue) {
-        if(newvalue) {
-          if(newvalue > 10) {
+      handler (newvalue, oldvalue) {
+        if (newvalue) {
+          if (newvalue > 10) {
             this.form.perScale = 10
             this.form.comScale = 0
-          } else if(newvalue < 0) {
+          } else if (newvalue < 0) {
             this.form.perScale = 0
             this.form.comScale = 10
           } else {
@@ -251,7 +276,7 @@ export default {
     }
   },
   methods: {
-    onRadioChange(formName) {
+    onRadioChange (formName) {
       this.$refs[formName].clearValidate()
     },
     onChargeSubmit (formName) {
@@ -331,7 +356,7 @@ export default {
         }
       }
     },
-    chargeDel(row) { // 删除数据
+    chargeDel (row) { // 删除数据
       // paymentConfigDel
       this.$confirm('你确定删除?', '提示', {
         confirmButtonText: '确定',

+ 13 - 2
src/views/categroyManager/insideSetting/staffManager.vue

@@ -21,6 +21,7 @@
         <el-form-item>
           <el-select v-model="searchForm.jobNature"
                      clearable
+                     filterable
                      placeholder="请选择工作类型">
             <el-option label="全职"
                        value="FULL_TIME"></el-option>
@@ -33,6 +34,7 @@
         <el-form-item>
           <el-select v-model="searchForm.organId"
                      clearable
+                     filterable
                      placeholder="请选择分部">
             <el-option v-for="item in branchList"
                        :key="item.value"
@@ -44,6 +46,7 @@
           <!--   multiple -->
           <el-select v-model="searchForm.roleId"
                      clearable
+                     filterable
                      placeholder="请选择角色">
             <el-option v-for="item in roleList"
                        :key="item.value"
@@ -157,7 +160,9 @@
         <el-form-item label="性别"
                       prop="gender"
                       :label-width="formLabelWidth">
-          <el-select v-model="form.gender">
+          <el-select v-model="form.gender"
+                     clearable
+                     filterable>
             <el-option label="男"
                        :value="1"></el-option>
             <el-option label="女"
@@ -174,6 +179,8 @@
                       prop="roleIds"
                       :label-width="formLabelWidth">
           <el-select v-model="form.roleIds"
+                     clearable
+                     filterable
                      multiple>
             <el-option v-for="item in roleList"
                        :key="item.value"
@@ -186,6 +193,8 @@
                       prop="organIdLists"
                       :label-width="formLabelWidth">
           <el-select style="width: calc(100% - 75px) !important;"
+                     filterable
+                     clearable
                      v-model="form.organIdLists"
                      multiple>
             <el-option v-for="item in branchList"
@@ -198,7 +207,9 @@
         <el-form-item label="工作类型"
                       prop="jobNature"
                       :label-width="formLabelWidth">
-          <el-select v-model="form.jobNature">
+          <el-select v-model="form.jobNature"
+                     clearable
+                     filterable>
             <el-option label="全职"
                        value="FULL_TIME"></el-option>
             <el-option label="兼职"

+ 5 - 1
src/views/categroyManager/specialSetup/branchSetting.vue

@@ -65,6 +65,8 @@
           <el-col :span="12">
             <el-form-item prop="province">
               <el-select v-model="form.province"
+                         filterable
+                         clearable
                          @change="onChangeProvince">
                 <el-option v-for="item in provinceList"
                            :key="item.value"
@@ -75,7 +77,9 @@
           </el-col>
           <el-col :span="12">
             <el-form-item prop="city">
-              <el-select v-model="form.city">
+              <el-select v-model="form.city"
+                         filterable
+                         clearable>
                 <el-option v-for="item in cityList"
                            :key="item.value"
                            :label="item.label"

+ 2 - 0
src/views/categroyManager/specialSetup/charges.vue

@@ -46,6 +46,8 @@
                         prop="branchIds"
                         :label-width="formLabelWidth">
             <el-select v-model="form.branchIds"
+                       clearable
+                       filterable
                        multiple>
               <el-option v-for="(item, index) in branchList"
                          :key="index"

+ 6 - 2
src/views/categroyManager/specialSetup/chargesList.vue

@@ -43,7 +43,9 @@
           <el-form-item label="所属分部"
                         prop="organId"
                         :label-width="formLabelWidth">
-            <el-select v-model="form.organId">
+            <el-select v-model="form.organId"
+                       clearable
+                       filterable>
               <el-option v-for="(item, index) in branchList"
                          :key="index"
                          :label="item.label"
@@ -54,7 +56,9 @@
           <el-form-item label="收费类型"
                         prop="chargeTypeId"
                         :label-width="formLabelWidth">
-            <el-select v-model="form.chargeTypeId">
+            <el-select v-model="form.chargeTypeId"
+                       clearable
+                       filterable>
               <el-option v-for="(item, index) in typesList"
                          :key="index"
                          :label="item.label"

+ 3 - 1
src/views/categroyManager/specialSetup/jobTemplateSetting.vue

@@ -69,7 +69,9 @@
                         v-if="form.classGroupType != 'MIX'"
                         prop="subjectId"
                         :label-width="formLabelWidth">
-            <el-select v-model="form.subjectId">
+            <el-select v-model="form.subjectId"
+                       clearable
+                       filterable>
               <el-option-group v-for="group in subjectList"
                                :key="group.label"
                                :label="group.label">

+ 2 - 0
src/views/categroyManager/specialSetup/typesManager.vue

@@ -53,6 +53,8 @@
                       prop="subjectIds"
                       :label-width="formLabelWidth">
           <el-select v-model="form.subjectIds"
+                     filterable
+                     clearable
                      multiple>
             <el-option-group v-for="group in subjectList"
                              :key="group.label"

+ 10 - 2
src/views/categroyManager/vipActiveList.vue

@@ -13,6 +13,7 @@
                v-model="searchForm">
         <el-form-item prop='organId'>
           <el-select class='multiple'
+                     filterable
                      style="width:180px!important"
                      v-model="searchForm.organId"
                      clearable
@@ -149,6 +150,7 @@
           <el-form-item label="适用分部"
                         prop="organ">
             <el-select v-model="resetForm.organ"
+                       filterable
                        multiple
                        clearable>
               <el-option v-for='(item,index) in organList'
@@ -189,6 +191,8 @@
           <el-form-item label="课程形式"
                         prop="stauts">
             <el-select v-model="resetForm.stauts"
+                       filterable
+                       clearable
                        multiple>
               <el-option v-for="(item,index) in courseStatusList"
                          :key='index'
@@ -205,7 +209,9 @@
             <div class="chioseWrap">
               <el-checkbox label="线上课"
                            v-model="online"></el-checkbox>
-              <el-select v-model="onlineSalary">
+              <el-select v-model="onlineSalary"
+                         clearable
+                         filterable>
                 <el-option label="老师默认课酬"
                            value="TEACHER_DEFAULT"></el-option>
                 <el-option label="课程单价比例折扣"
@@ -222,7 +228,9 @@
             <div class="chioseWrap">
               <el-checkbox label="线下课"
                            v-model="unonline"></el-checkbox>
-              <el-select v-model="unonlineSalary">
+              <el-select v-model="unonlineSalary"
+                         filterable
+                         clearable>
                 <el-option label="老师默认课酬"
                            value="TEACHER_DEFAULT"></el-option>
                 <el-option label="课程单价比例折扣"

+ 3 - 1
src/views/categroyManager/vipChargeSeting.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="m-container">
-    <h2><div class="squrt"></div>VIP课程收费设置
+    <h2>
+      <div class="squrt"></div>VIP课程收费设置
     </h2>
     <div class="m-core">
       <el-form :inline="true"
@@ -11,6 +12,7 @@
                      style="width:180px!important"
                      v-model="searchForm.organId"
                      clearable
+                     filterable
                      placeholder="请选择分部">
             <el-option v-for="(item,index) in organList"
                        :key="index"

+ 9 - 2
src/views/categroyManager/vipNewActive.vue

@@ -20,6 +20,7 @@
                       prop="organ">
           <el-select v-model="vipform.organ"
                      multiple
+                     filterable
                      clearable>
             <el-option v-for='(item,index) in organList'
                        :key="index"
@@ -59,6 +60,8 @@
         <el-form-item label="课程形式"
                       prop="stauts">
           <el-select v-model="vipform.stauts"
+                     filterable
+                     clearable
                      multiple>
             <el-option v-for="(item,index) in courseStatusList"
                        :key='index'
@@ -75,7 +78,9 @@
           <div class="chioseWrap">
             <el-checkbox label="线上课"
                          v-model="online"></el-checkbox>
-            <el-select v-model="onlineSalary">
+            <el-select v-model="onlineSalary"
+                       clearable
+                       filterable>
               <el-option label="老师默认课酬"
                          value="TEACHER_DEFAULT"></el-option>
               <el-option label="课程单价比例折扣"
@@ -101,7 +106,9 @@
           <div class="chioseWrap">
             <el-checkbox label="线下课"
                          v-model="unonline"></el-checkbox>
-            <el-select v-model="unonlineSalary">
+            <el-select v-model="unonlineSalary"
+                       clearable
+                       filterable>
               <el-option label="老师默认课酬"
                          value="TEACHER_DEFAULT"></el-option>
               <el-option label="课程单价比例折扣"

+ 3 - 0
src/views/resetTeaming/components/resetSound.vue

@@ -38,6 +38,7 @@
               <el-select v-model="scope.row.zhonglei"
                          multiple
                          clearable
+                         filterable
                          collapse-tags>
                 <el-option v-for="(item,index) in scope.row.goodsList"
                            :key='index'
@@ -75,6 +76,7 @@
               </i>
 
               <el-select v-model="scope.row.fangshi"
+                         filterable
                          clearable>
                 <el-option label="团购"
                            value="GROUP"></el-option>
@@ -122,6 +124,7 @@
                     </el-form-item>
                     <el-form-item label="教辅商品">
                       <el-select v-model="item.goods"
+                                 filterable
                                  multiple
                                  collapse-tags>
                         <el-option v-for='(item,index) in scope.row.markChioseList'

+ 3 - 1
src/views/studentManager/components/studentOrder.vue

@@ -50,6 +50,8 @@
       </el-form-item>
       <el-form-item>
         <el-select v-model="searchForm.paymentType"
+                   filterable
+                   clearable
                    placeholder="交易类型">
           <el-option v-for="(item, index) in orderStatus"
                      :key="index"
@@ -182,7 +184,7 @@ export default {
       }).catch(() => {
         this.amountStatus = true
       })
-      
+
     },
     search () {
       this.pageInfo.page = 1;

+ 2 - 0
src/views/studentManager/components/studentPayList.vue

@@ -6,6 +6,8 @@
              v-model="searchForm">
       <el-form-item>
         <el-select v-model="searchForm.attendanceStatus"
+                   filterable
+                   clearable
                    placeholder="考勤状态">
           <el-option v-for="(item, index) in attendanceStatus"
                      :key="index"

+ 4 - 0
src/views/studentManager/components/studentRecord.vue

@@ -6,6 +6,8 @@
              v-model="searchForm">
       <el-form-item>
         <el-select v-model="searchForm.classGroupType"
+                   filterable
+                   clearable
                    placeholder="课程类型">
           <el-option v-for="(item, index) in courseArray"
                      :key="index"
@@ -15,6 +17,8 @@
       </el-form-item>
       <el-form-item>
         <el-select v-model="searchForm.attendanceStatus"
+                   filterable
+                   clearable
                    placeholder="考勤状态">
           <el-option v-for="(item, index) in att"
                      :key="index"

+ 4 - 0
src/views/studentManager/components/teamAndcourse.vue

@@ -65,6 +65,8 @@
              v-model="searchForm">
       <el-form-item>
         <el-select v-model="searchForm.classGroupType"
+                   clearable
+                   filterable
                    placeholder="课程类型">
           <el-option v-for="(item, index) in courseArray"
                      :key="index"
@@ -74,6 +76,8 @@
       </el-form-item>
       <el-form-item>
         <el-select v-model="searchForm.courseStatus"
+                   clearable
+                   filterable
                    placeholder="课程状态">
           <el-option v-for="(item, index) in courseStatus"
                      :key="index"

+ 3 - 0
src/views/studentManager/studentList.vue

@@ -18,6 +18,7 @@
         </el-form-item>
         <el-form-item prop='organId'>
           <el-select class='multiple'
+                     filterable
                      v-model="searchForm.organId"
                      clearable
                      placeholder="请选择分部">
@@ -111,6 +112,7 @@
                       prop="organId">
           <el-select class='multiple'
                      v-model="studentForm.organId"
+                     filterable
                      clearable
                      placeholder="请选择分部">
             <el-option v-for="(item,index) in organList"
@@ -126,6 +128,7 @@
         <el-form-item label="学生性别"
                       prop="sex">
           <el-select class='multiple'
+                     filterable
                      v-model="studentForm.sex"
                      clearable
                      placeholder="请选择分部">

+ 4 - 0
src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -22,6 +22,8 @@
       </el-form-item>
       <el-form-item>
         <el-select v-model="searchForm.courseScheduleType"
+                   filterable
+                   clearable
                    placeholder="课程类型">
           <el-option v-for="(item, index) in courseType"
                      :key="index"
@@ -31,6 +33,8 @@
       </el-form-item>
       <el-form-item>
         <el-select v-model="searchForm.signInStatus"
+                   clearable
+                   filterable
                    placeholder="考勤状态">
           <el-option v-for="(item, index) in attendance"
                      :key="index"

+ 4 - 0
src/views/teacherManager/teacherDetail/components/teacherRecord.vue

@@ -17,6 +17,8 @@
       </el-form-item>
       <el-form-item>
         <el-select v-model="searchForm.courseScheduleType"
+                   clearable
+                   filterable
                    placeholder="课程类型">
           <el-option v-for="(item, index) in courseType"
                      :key="index"
@@ -31,6 +33,8 @@
       </el-form-item>
       <el-form-item>
         <el-select v-model="searchForm.signInStatus"
+                   filterable
+                   clearable
                    placeholder="考勤状态">
           <el-option v-for="(item, index) in attendance"
                      :key="index"

+ 12 - 2
src/views/teacherManager/teacherList.vue

@@ -18,6 +18,8 @@
         </el-form-item>
         <el-form-item>
           <el-select v-model="searchForm.lockFlag"
+                     clearable
+                     filterable
                      placeholder="老师状态">
             <el-option v-for="item in teacherStatus"
                        :key="item.value"
@@ -27,6 +29,8 @@
         </el-form-item>
         <el-form-item>
           <el-select v-model="searchForm.subjectId"
+                     filterable
+                     clearable
                      placeholder="专业技能">
             <el-option-group v-for="group in subjectList"
                              :key="group.label"
@@ -41,6 +45,8 @@
         </el-form-item>
         <el-form-item>
           <el-select v-model="searchForm.organId"
+                     filterable
+                     clearable
                      placeholder="请选择分部">
             <el-option v-for="item in branchList"
                        :key="item.value"
@@ -50,6 +56,8 @@
         </el-form-item>
         <el-form-item>
           <el-select v-model="searchForm.jobNature"
+                     filterable
+                     clearable
                      placeholder="工作类型">
             <el-option v-for="item in jobNature"
                        :key="item.value"
@@ -59,6 +67,8 @@
         </el-form-item>
         <el-form-item>
           <el-select v-model="searchForm.isProbationPeriod"
+                     clearable
+                     filterable
                      placeholder="人事状态">
             <el-option label="试用"
                        value="0"></el-option>
@@ -281,7 +291,7 @@ export default {
     },
     onStaffOperation (type, data) {
       let str = ''
-      if(data.lockFlag != 1) {
+      if (data.lockFlag != 1) {
         str = `是否冻结${data.realName}老师?`
       } else {
         str = `是否解冻${data.realName}老师?`
@@ -303,7 +313,7 @@ export default {
             this.$message.error(res.msg)
           }
         })
-      }).catch(() =>{})
+      }).catch(() => { })
     },
     onReSet () {
       this.searchForm = {

+ 13 - 1
src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -59,7 +59,9 @@
                             prop="jobNature"
                             :label-width="formLabelWidth">
                 <el-select v-model="topForm.jobNature"
-                           placeholder="工作类型">
+                           placeholder="工作类型"
+                           clearable
+                           filterable>
                   <el-option v-for="item in jobNature"
                              :key="item.value"
                              :label="item.label"
@@ -72,6 +74,8 @@
                             prop="organId"
                             :label-width="formLabelWidth">
                 <el-select v-model="topForm.organId"
+                           filterable
+                           clearable
                            placeholder="所属分部">
                   <el-option v-for="item in branchList"
                              :key="item.value"
@@ -86,6 +90,8 @@
               <el-form-item label="流动范围"
                             :label-width="formLabelWidth">
                 <el-select v-model="topForm.flowOrganRange"
+                           filterable
+                           clearable
                            multiple
                            placeholder="流动范围">
                   <el-option v-for="item in branchList"
@@ -100,6 +106,8 @@
                             prop="isProbationPeriod"
                             :label-width="formLabelWidth">
                 <el-select v-model="topForm.isProbationPeriod"
+                           clearable
+                           filterable
                            placeholder="人事状态">
                   <el-option label="正式"
                              :value="1"></el-option>
@@ -155,6 +163,8 @@
                             :label-width="formLabelWidth">
                 <!-- <el-input v-model="topForm.educationBackground"></el-input> -->
                 <el-select v-model="topForm.educationBackground"
+                           clearable
+                           filterable
                            placeholder="最高学历">
                   <el-option label="初中"
                              value="初中"></el-option>
@@ -179,6 +189,8 @@
                             :label-width="formLabelWidth">
                 <el-select multiple
                            v-model="topForm.subjectIds"
+                           clearable
+                           filterable
                            placeholder="专业技能">
                   <el-option-group v-for="group in subjectList"
                                    :key="group.label"

+ 9 - 1
src/views/teamBuild/components/teamBaseInfo.vue

@@ -11,6 +11,7 @@
                       prop="type"
                       :rules="[{ required: true, message: '收费类型不能为空'}]">
           <el-select v-model="topFrom.type"
+                     filterable
                      clearable>
             <el-option v-for="(item,index) in typeList"
                        :key='index'
@@ -22,6 +23,7 @@
                       prop="section"
                       :rules="[{ required: true, message: '所属分部不能为空'},]">
           <el-select v-model="topFrom.section"
+                     filterable
                      @change="changeSection"
                      clearable>
             <el-option v-for="(item,index) in sectionList"
@@ -36,6 +38,7 @@
           <el-select v-model="topFrom.school"
                      :disabled="!topFrom.section"
                      @change="chioseSchool"
+                     filterable
                      clearable>
             <el-option v-for="(item,index) in cooperationList"
                        :key='index'
@@ -47,6 +50,8 @@
                       prop="address"
                       :rules="[{ required: true, message: '教学地点不能为空'},]">
           <el-select v-model="topFrom.address"
+                     filterable
+                     clearable
                      :disabled="!topFrom.section">
             <el-option v-for="(item,index) in addList"
                        :key='index'
@@ -113,6 +118,7 @@
                      clearable
                      multiple
                      collapse-tags
+                     filterable
                      v-model="topFrom.startClass">
             <el-option value="1"
                        label="一年级"></el-option>
@@ -144,7 +150,9 @@
         <el-form-item label="课酬结算标准"
                       :rules="[{ required: true, message: '请选择课酬结算标准'},]"
                       prop="salary">
-          <el-select v-model="topFrom.salary">
+          <el-select v-model="topFrom.salary"
+                     clearable
+                     filterable>
             <el-option label="默认课酬"
                        value="TEACHER_DEFAULT"></el-option>
             <el-option label="3.0课酬"

+ 4 - 2
src/views/teamBuild/components/teamResetSound.vue

@@ -94,6 +94,7 @@
         </div>
         <div class="right">
           <el-select v-model="activeTeam"
+                     filterable
                      style="width:180px"
                      clearable
                      @change="chioseTeam"
@@ -108,6 +109,7 @@
           <el-select v-model="activeChioseSound"
                      style="width:180px"
                      :disabled="!activeTeam"
+                     filterable
                      clearable
                      placeholder="声部选择">
             <el-option v-for='(item,index) in chioseSoundList'
@@ -254,8 +256,8 @@ export default {
 
           }
         }
-      }).catch(() =>{})
-      
+      }).catch(() => { })
+
     },
     addListItem () {
       this.dialogTableVisible = true;

+ 10 - 7
src/views/teamBuild/components/teamSoundMoney.vue

@@ -74,6 +74,7 @@
                 <el-select v-model="scope.row.zhonglei"
                            multiple
                            clearable
+                           filterable
                            collapse-tags>
                   <el-option v-for="(item,index) in scope.row.goodsList"
                              :key='index'
@@ -158,6 +159,8 @@
                       </el-form-item>
                       <el-form-item label="教辅商品">
                         <el-select v-model="item.goods"
+                                   clearable
+                                   filterable
                                    multiple
                                    collapse-tags>
                           <el-option v-for='(item,index) in scope.row.markChioseList'
@@ -337,8 +340,8 @@ export default {
 
           }
         }
-      }).catch(() => {})
-      
+      }).catch(() => { })
+
     },
     // 勾选选中框处理数据,存储勾选过的checkbox值
     checkinlist (obj) {
@@ -524,8 +527,8 @@ export default {
               this.$router.push({ path: '/business/teamDetail' })
             }
           })
-        }).catch(() => {})
-        
+        }).catch(() => { })
+
       } else {
         // 只提交第二页的数据
         let obj = {};
@@ -596,7 +599,7 @@ export default {
               this.$router.push({ path: '/business/teamDetail' })
             }
           })
-        }).catch(() => {}) 
+        }).catch(() => { })
       }
     },
     // 同意
@@ -612,8 +615,8 @@ export default {
             this.$router.push({ path: '/business/teamDetail' })
           }
         })
-      }).catch(() => {})
-      
+      }).catch(() => { })
+
     },
     // 拒绝
     refuse () {

+ 8 - 5
src/views/teamBuild/signupList.vue

@@ -51,6 +51,7 @@
                :model="searchFrom">
         <el-form-item label="专业">
           <el-select v-model="searchFrom.subject"
+                     filterable
                      clearable>
             <el-option v-for="(item,index) in soundList"
                        :key='index'
@@ -61,6 +62,7 @@
         </el-form-item>
         <el-form-item label="是否允许调剂">
           <el-select v-model="searchFrom.isAllowAdjust"
+                     filterable
                      clearable>
             <el-option label="是"
                        value="1"></el-option>
@@ -192,8 +194,8 @@
                            v-permission="'studentRegistration/batchUpdateSubject'"
                            v-if="scope.row.paymentStatus != 2"
                            @click='resetSubject(scope.row)'>修改专业</el-button>
-                <!-- APPLY -->
-                <el-popover v-if='status == "APPLY" || scope.row.remark'
+                <!-- APPLY  status == "APPLY" || s-->
+                <el-popover v-if='cope.row.remark'
                             placement="top-start"
                             title="备注"
                             width="200"
@@ -203,10 +205,10 @@
                              slot="reference">备注</el-button>
                 </el-popover>
                 <!-- PAY -->
-                <!-- &&scope.row.paymentStatus==1 -->
+                <!-- &&  status == "PAY"-->
                 <el-button type='text'
                            v-permission="'studentRegistration/queryFeeDetail'"
-                           v-if='status == "PAY"'
+                           v-if='scope.row.paymentStatus==2'
                            @click='lookdetail(scope.row)'>查看</el-button>
               </div>
             </template>
@@ -234,6 +236,7 @@
       <el-form :model="maskForm">
         <el-form-item label="选择专业">
           <el-select v-model="maskForm.subject"
+                     filterable
                      clearable>
             <el-option v-for="(item,index) in soundList"
                        :key='index'
@@ -631,7 +634,7 @@ export default {
         musicGroupId: this.$route.query.id,
         page: 1,
         rows: 9999
-      }).then(res => {})
+      }).then(res => { })
     },
     onGoHome () { // 确认开团
       // 判断是否有学生缴费

+ 6 - 0
src/views/teamBuild/teamSeting/components/coursePlan.vue

@@ -20,6 +20,8 @@
           <el-form-item label="合奏班"
                         prop='all'>
             <el-select v-model="leftFrom.all"
+                       filterable
+                       clearable
                        @change="changeMixClass">
               <el-option v-for="(item,index) in maxClassList"
                          :key='index'
@@ -55,6 +57,8 @@
               <!-- <el-checkbox :label="index"
                          v-model="item.isCheck">{{item.name}}</el-checkbox> -->
               <el-select class='weekSelect'
+                         filterable
+                         clearable
                          style="width:100px!important"
                          placeholder="星期几"
                          v-model="item.weekNum">
@@ -173,6 +177,8 @@
 
         <div class="resetWrap">
           <el-select v-model="chioseType"
+                     clearable
+                     filterable
                      @change="changeCheckCard">
             <el-option v-for='(item,index) in courseTypeList'
                        :key="index"

+ 7 - 1
src/views/teamBuild/teamSeting/components/improvementClass.vue

@@ -104,6 +104,8 @@
         <el-form-item label="声部"
                       prop="sound">
           <el-select v-model="maskForm.sound"
+                     filterable
+                     clearable
                      multiple>
             <el-option v-for="(item,index) in soundList"
                        :key='index'
@@ -114,6 +116,7 @@
         <el-form-item label="主教老师"
                       prop="teacher">
           <el-select v-model="maskForm.teacher"
+                     clearable
                      filterable>
             <el-option v-for="(item,index) in teacherList"
                        :key="index"
@@ -129,7 +132,10 @@
         </el-form-item>
         <el-form-item label="星期几"
                       prop="week">
-          <el-select v-model="maskForm.week">
+          <el-select v-model="maskForm.week"
+                     clearable
+                     filterable>
+
             <el-option value="1"
                        label="星期一"></el-option>
             <el-option value="2"

+ 2 - 0
src/views/teamBuild/teamSeting/components/salarySet.vue

@@ -5,6 +5,8 @@
              :model="searchForm">
       <el-form-item label="课酬结算标准">
         <el-select v-model="searchForm.salary"
+                   clearable
+                   filterable
                    @change="changeSalary">
           <el-option label="默认课酬"
                      value="TEACHER_DEFAULT"></el-option>

+ 2 - 0
src/views/teamBuild/teamSeting/components/setTeacher.vue

@@ -44,6 +44,7 @@
             <div>
               <el-select class='tableClass'
                          filterable
+                         clearable
                          @change="chioseAssistant(scope.row)"
                          v-if='teacherList'
                          :disabled="!scope.row.coreTeacher || isSetSalary"
@@ -93,6 +94,7 @@
                          @change="chioseAssistant(scope.row)"
                          multiple
                          filterable
+                         clearable
                          :disabled="!scope.row.coreTeacher ||  isSetSalary"
                          v-model="scope.row.assistant">
                 <el-option v-for='(item,index) in teacherList'

+ 7 - 2
src/views/teamDetail/components/courseList.vue

@@ -7,6 +7,7 @@
       <el-form-item label="课程类型">
         <el-select v-model="searchForm.courseStatus"
                    clearable
+                   filterable
                    placeholder="课程类型">
           <el-option label="基础技能班"
                      value="HIGH"></el-option>
@@ -27,6 +28,7 @@
       <el-form-item label="课程状态">
         <el-select v-model="searchForm.classStatus"
                    clearable
+                   filterable
                    placeholder="课程状态">
           <el-option label="未开始"
                      value="NOT_START"></el-option>
@@ -39,6 +41,7 @@
       <el-form-item label="班级名称">
         <!-- getMusicGroupAllClass -->
         <el-select v-model="searchForm.class"
+                   filterable
                    clearable>
           <el-option v-for='(item,index) in classList'
                      :key="index"
@@ -152,6 +155,7 @@
         <el-form-item label="主教老师"
                       prop="teacher">
           <el-select v-model="maskForm.teacher"
+                     clearable
                      filterable>
             <el-option v-for="(item,index) in teacherList"
                        :key="index"
@@ -162,6 +166,7 @@
         <el-form-item label="助教老师"
                       prop="assistant">
           <el-select v-model="maskForm.assistant"
+                     clearable
                      filterable
                      multiple
                      collapse-tags>
@@ -357,8 +362,8 @@ export default {
             this.courseVisible = false;
           }
         })
-      }).catch(() => {})
-      
+      }).catch(() => { })
+
     },
     handleClose () {
       this.courseVisible = false;

+ 10 - 2
src/views/teamDetail/components/resetClass.vue

@@ -11,6 +11,7 @@
         <el-form-item label="班级类型">
           <el-select v-model="topForm.classType"
                      clearable
+                     filterable
                      @change="changeMixClass">
             <el-option v-for='(item,index) in classTypeList'
                        :key="index"
@@ -165,6 +166,7 @@
                      style="width:180px"
                      @change="searchStudent"
                      clearable
+                     filterable
                      placeholder="声部选择">
             <el-option v-for='(item,index) in soundList'
                        :key='index'
@@ -290,6 +292,7 @@
         <el-form-item label="主教老师"
                       prop='coreTeacher'>
           <el-select v-model="teacherForm.coreTeacher"
+                     clearable
                      filterable>
             <el-option v-for="(item,index) in teacherList"
                        :key="index"
@@ -301,6 +304,7 @@
                       prop="assistant">
           <el-select v-model="teacherForm.assistant"
                      filterable
+                     clearable
                      @change="setAssistant"
                      multiple>
             <el-option v-for="(item,index) in cooperationList"
@@ -311,7 +315,9 @@
         </el-form-item>
         <el-form-item label="课程类型"
                       prop="courseType">
-          <el-select v-model="teacherForm.courseType">
+          <el-select v-model="teacherForm.courseType"
+                     clearable
+                     filterable>
             <el-option v-for="(item,index) in courseTypeList"
                        :key="index"
                        :value="item.value"
@@ -348,7 +354,9 @@
                v-for="(item,index) in weekList"
                :key="index">
             <span>循环周期: </span>
-            <el-select v-model="item.dayOfWeek">
+            <el-select v-model="item.dayOfWeek"
+                       clearable
+                       filterable>
               <el-option v-for="(item,index) in weekDateList"
                          :key='index'
                          :label="item.label"

+ 11 - 0
src/views/teamDetail/components/studentList.vue

@@ -37,6 +37,7 @@
       <el-form-item>
         <el-select v-model="searchForm.studentStatus"
                    clearable
+                   filterable
                    placeholder="学员状态">
           <el-option label="在读"
                      value="NORMAL"></el-option>
@@ -49,6 +50,7 @@
       <el-form-item>
         <el-select v-model="searchForm.major"
                    clearable
+                   filterable
                    placeholder="所选专业">
           <el-option v-for='(item,index) in soundList'
                      :key='index'
@@ -59,6 +61,7 @@
       <el-form-item>
         <el-select v-model="searchForm.isPay"
                    clearable
+                   filterable
                    placeholder="是否缴费">
           <el-option label="完成缴费"
                      value="PAID_COMPLETED"></el-option>
@@ -244,6 +247,7 @@
         <el-form-item label="年级"
                       prop="startClass">
           <el-select placeholder="起始年级"
+                     filterable
                      clearable
                      v-model="maskForm.startClass">
             <el-option value="一年级"
@@ -280,6 +284,8 @@
         <el-form-item label="学员声部"
                       prop="sound">
           <el-select v-model="maskForm.sound"
+                     clearable
+                     filterable
                      @change="onSoundChange">
             <el-option v-for='(item,index) in soundList'
                        :key='index'
@@ -311,6 +317,7 @@
         <br>
         <el-form-item label="单技班">
           <el-select v-model="maskForm.signClass"
+                     filterable
                      clearable>
             <el-option v-for="(item,index) in signList"
                        :key="index"
@@ -321,6 +328,7 @@
         </el-form-item>
         <el-form-item label="合奏班">
           <el-select v-model="maskForm.mixClass"
+                     filterable
                      clearable>
             <el-option v-for="(item,index) in mixList"
                        :key="index"
@@ -330,6 +338,7 @@
         </el-form-item>
         <el-form-item label="基础技能班">
           <el-select v-model="maskForm.highClass"
+                     filterable
                      clearable>
             <el-option v-for="(item,index) in highList"
                        :key="index"
@@ -339,6 +348,7 @@
         </el-form-item>
         <el-form-item label="临时班">
           <el-select v-model="maskForm.snapClass"
+                     filterable
                      clearable
                      multiple>
             <el-option v-for="(item,index) in snapList"
@@ -361,6 +371,7 @@
                   style="width: auto;">
             <el-form-item>
               <el-select placeholder="选择乐器"
+                         filterable
                          clearable
                          v-model="maskForm.musicGoodsIdList">
                 <el-option v-for="(item, index) in INSTRUMENTLIST"

+ 2 - 1
src/views/teamDetail/components/studentSignin.vue

@@ -28,7 +28,8 @@
           <el-input v-model="searchForm.studentName"></el-input>
         </el-form-item>
         <el-form-item label='签到'>
-          <el-select v-model="searchForm.sign">
+          <el-select v-model="searchForm.sign"
+                     clearable>
             <el-option label="正常"
                        value="NORMAL"></el-option>
             <el-option label="旷课"

+ 9 - 6
src/views/teamDetail/teamList.vue

@@ -25,6 +25,7 @@
         <el-form-item prop='orgin'>
           <el-select class='multiple'
                      v-model="topForm.orgin"
+                     filterable
                      clearable
                      placeholder="请选择分部">
             <el-option v-for="(item,index) in organList"
@@ -36,6 +37,7 @@
         <el-form-item prop='status'>
           <el-select class='multiple'
                      v-model="topForm.status"
+                     filterable
                      clearable
                      placeholder="请选择乐团状态">
             <el-option v-for="(item,index) in nowStatus"
@@ -47,6 +49,7 @@
         <!-- 收费类型 -->
         <el-form-item prop='payType'>
           <el-select v-model="topForm.payType"
+                     filterable
                      placeholder="请选择收费类型"
                      clearable>
             <el-option v-for="(item,index) in typeList"
@@ -411,8 +414,8 @@ export default {
               this.$message.error(res.msg)
             }
           })
-        }).catch(() => {})
-        
+        }).catch(() => { })
+
       } else if (type == 'pause') {
         this.$confirm('是否确定暂停乐团?', '提示', {
           confirmButtonText: '确定',
@@ -427,7 +430,7 @@ export default {
               this.$message.error(res.msg)
             }
           })
-        }).catch(() => {})
+        }).catch(() => { })
       }
     },
     gotoSearch () {
@@ -455,7 +458,7 @@ export default {
         }
         case 'APPLY': {
           // 报名中
-          this.$router.push({ path: `/business/signupList`, query: { status: row.status, id: row.id,  name: row.name, search, rules } })
+          this.$router.push({ path: `/business/signupList`, query: { status: row.status, id: row.id, name: row.name, search, rules } })
           break;
         }
         case 'PAY': {
@@ -540,8 +543,8 @@ export default {
             this.getList();
           }
         })
-      }).catch(()=>{})
-      
+      }).catch(() => { })
+
     }
   }
 

+ 3 - 1
src/views/vipClass/vipDetail/components/teacherRecord.vue

@@ -188,7 +188,9 @@
         <el-form-item label="教学点"
                       prop="cooperation"
                       v-if='activeRow&&activeRow.teachMode == "OFFLINE"'>
-          <el-select v-model="maskForm.cooperation">
+          <el-select v-model="maskForm.cooperation"
+                     clearable
+                     filterable>
             <el-option v-for='(item,index) in cooperationList'
                        :key="index"
                        :value="item.id"

+ 90 - 50
src/views/vipClass/vipDetail/components/vipBaseInfo.vue

@@ -60,11 +60,13 @@
         </el-form-item>
         <el-form-item label="课程单价(线上)">
           <el-input v-model="rightForm.onlineClass"
-                    disabled></el-input>
+                    type="number"
+                    :disabled='!isreset'></el-input>
         </el-form-item>
         <el-form-item label="课程单价(线下)">
           <el-input v-model="rightForm.offlineClass"
-                    disabled></el-input>
+                    type="number"
+                    :disabled='!isreset'></el-input>
         </el-form-item>
         <el-form-item label="课程总价">
           <el-input v-model="rightForm.allPrice"
@@ -75,13 +77,21 @@
                     disabled></el-input>
         </el-form-item>
       </el-form>
-
+      <el-button v-if="!isreset"
+                 v-permission="'vipGroupManage/updateVipBaseInfo'"
+                 class="resetBtn"
+                 type="primary"
+                 @click="resetPrice">修改</el-button>
+      <el-button class="resetBtn"
+                 v-permission="'vipGroupManage/updateVipBaseInfo'"
+                 v-if="isreset"
+                 type="primary"
+                 @click="submitBtn">确定</el-button>
     </div>
-
   </div>
 </template>
 <script>
-import { getVipGroupDetail, findVipGroupStudents, leaveSchool } from '@/api/vipSeting'
+import { getVipGroupDetail, findVipGroupStudents, leaveSchool, updateVipBaseInfo } from '@/api/vipSeting'
 export default {
   data () {
     return {
@@ -105,60 +115,64 @@ export default {
         allPrice: '',
         progress: ''
       },
-      tableList: []
+      tableList: [],
+      isreset: false
     }
   }, mounted () {
     let id = this.$route.query.id;
     this.id = id;
     // 根据id 获取vip详情
-    getVipGroupDetail({ vipGroupId: id }).then(res => {
-      if (res.code == 200) {
-        /**
-         *  teacherCount: '',
-        subject: '', // 科目名称
-        active: '', // 活动名称
-        status: '', //课程形式
-        classNum: "", // 每班人数
-        classTime: '', // 每课时长
-        address: '', // 教学点名称
-        onlineClass: '', //线上课数
-        offlineClass: '', //线下课数
-        startTime: '', // 报名开始时间
-         * 
-         */
-        this.topForm.teacherCount = res.data.userName;
-        this.topForm.subject = res.data.subjectName  //科目名称
-        this.topForm.active = res.data.vipGroupActivityName;
-        this.topForm.status = res.data.categoryName
-        this.topForm.classNum = res.data.studentNum;
-        // totalClassTimes; 总课时数
-        this.topForm.classTime = res.data.singleClassMinutes;
-        //  教学点
-        this.topForm.address = res.data.teacherSchoolName
-        this.topForm.onlineClass = res.data.onlineClassesNum;
-        this.topForm.offlineClass = res.data.offlineClassesNum;
-        // endTime
-        this.topForm.startTime = res.data.registrationStartTime;
-        this.topForm.endTime = res.data.paymentExpireDate;
-        this.rightForm.allClass = res.data.totalClassTimes;
-        this.rightForm.onlineClass = res.data.onlineClassesUnitPrice;
-        this.rightForm.offlineClass = res.data.offlineClassesUnitPrice;
-        this.rightForm.allPrice = res.data.totalPrice;
-        this.rightForm.progress = res.data.currentClassTimes + '/' + res.data.totalClassTimes;
-        this.$emit('getName', res.data.name);
-        /**
-         * allClass: '',
-        onlineClass: '',
-        offlineClass: '',
-        allPrice: '',
-        progress: ''
-         */
-      }
-    });
+    this.getVipGroupDetail(id);
     // 根据id 获取vip学员
     this.getStudents();
   },
   methods: {
+    getVipGroupDetail (id) {
+      getVipGroupDetail({ vipGroupId: id }).then(res => {
+        if (res.code == 200) {
+          /**
+           *  teacherCount: '',
+          subject: '', // 科目名称
+          active: '', // 活动名称
+          status: '', //课程形式
+          classNum: "", // 每班人数
+          classTime: '', // 每课时长
+          address: '', // 教学点名称
+          onlineClass: '', //线上课数
+          offlineClass: '', //线下课数
+          startTime: '', // 报名开始时间
+           * 
+           */
+          this.topForm.teacherCount = res.data.userName;
+          this.topForm.subject = res.data.subjectName  //科目名称
+          this.topForm.active = res.data.vipGroupActivityName;
+          this.topForm.status = res.data.categoryName
+          this.topForm.classNum = res.data.studentNum;
+          // totalClassTimes; 总课时数
+          this.topForm.classTime = res.data.singleClassMinutes;
+          //  教学点
+          this.topForm.address = res.data.teacherSchoolName
+          this.topForm.onlineClass = res.data.onlineClassesNum;
+          this.topForm.offlineClass = res.data.offlineClassesNum;
+          // endTime
+          this.topForm.startTime = res.data.registrationStartTime;
+          this.topForm.endTime = res.data.paymentExpireDate;
+          this.rightForm.allClass = res.data.totalClassTimes;
+          this.rightForm.onlineClass = res.data.onlineClassesUnitPrice;
+          this.rightForm.offlineClass = res.data.offlineClassesUnitPrice;
+          this.rightForm.allPrice = res.data.totalPrice;
+          this.rightForm.progress = res.data.currentClassTimes + '/' + res.data.totalClassTimes;
+          this.$emit('getName', res.data.name);
+          /**
+           * allClass: '',
+          onlineClass: '',
+          offlineClass: '',
+          allPrice: '',
+          progress: ''
+           */
+        }
+      });
+    },
     getStudents () {
       findVipGroupStudents({ vipGroupId: this.id }).then(res => {
         if (res.code == 200) {
@@ -178,6 +192,25 @@ export default {
         }
       })
 
+    },
+    resetPrice () {
+      this.isreset = true;
+    },
+    submitBtn () {
+      // 提交 
+      /**
+       * this.rightForm.onlineClass = res.data.onlineClassesUnitPrice;
+        this.rightForm.offlineClass = res.data.offlineClassesUnitPrice;
+       */
+      let onlineClassesUnitPrice = this.rightForm.onlineClass;
+      let offlineClassesUnitPrice = this.rightForm.offlineClass
+      updateVipBaseInfo({ id: this.id, onlineClassesUnitPrice, offlineClassesUnitPrice }).then(res => {
+        if (res.code == 200) {
+          this.$message.success('修改成功')
+          this.isreset = false;
+          this.getVipGroupDetail(this.id);
+        }
+      })
     }
   },
 }
@@ -209,5 +242,12 @@ export default {
       margin-bottom: 20px;
     }
   }
+  .right {
+    clear: both;
+    .resetBtn {
+      margin-top: 30px;
+      float: right;
+    }
+  }
 }
 </style>

+ 8 - 4
src/views/vipClass/vipDetail/index.vue

@@ -10,20 +10,24 @@
       <el-tabs v-model="activeName"
                type="card"
                @tab-click="handleClick">
-        <el-tab-pane label="基本信息" v-if="permissionList.vipBase"
+        <el-tab-pane label="基本信息"
+                     v-if="permissionList.vipBase"
                      name="1">
           <vipBase v-if="activeName == 1"
                    @getName='getName' />
         </el-tab-pane>
-        <el-tab-pane label="教学记录" v-if="permissionList.teacherRecord"
+        <el-tab-pane label="教学记录"
+                     v-if="permissionList.teacherRecord"
                      name="2">
           <teacherRecord v-if="activeName == 2" />
         </el-tab-pane>
-        <el-tab-pane label="VIP课程财务" v-if="permissionList.fnanceInfo"
+        <el-tab-pane label="VIP课程财务"
+                     v-if="permissionList.fnanceInfo"
                      name="3">
           <fnanceInfo v-if="activeName == 3" />
         </el-tab-pane>
-        <el-tab-pane label="VIP学生列表" v-if="permissionList.vipStudentList"
+        <el-tab-pane label="VIP学生列表"
+                     v-if="permissionList.vipStudentList"
                      name="4">
           <vipStudentList v-if="activeName == 4" />
         </el-tab-pane>

+ 3 - 0
src/views/vipClass/vipList.vue

@@ -20,6 +20,7 @@
         <el-form-item prop='orgin'>
           <el-select class='multiple'
                      v-model="searchForm.orgin"
+                     filterable
                      clearable
                      placeholder="请选择分部">
             <el-option v-for="(item,index) in organList"
@@ -32,6 +33,7 @@
         <el-form-item prop='status'>
           <el-select class='multiple'
                      v-model="searchForm.status"
+                     filterable
                      clearable
                      placeholder="请选课程状态">
             <el-option v-for="(item,index) in statusList"
@@ -55,6 +57,7 @@
         <el-form-item>
           <el-select v-model="searchForm.activityId"
                      clearable
+                     filterable
                      placeholder="活动方案">
             <el-option v-for="(item,index) in activeList"
                        :key='index'

+ 10 - 4
src/views/vipClass/vipReset.vue

@@ -146,7 +146,9 @@
         </el-form-item> -->
         <el-form-item label="教学地点"
                       v-if='maskForm.teachMode == "OFFLINE"'>
-          <el-select v-model="maskForm.address">
+          <el-select v-model="maskForm.address"
+                     filterable
+                     clearable>
             <el-option v-for="(item,index) in schoolList"
                        :key="index"
                        :value="item.id"
@@ -292,7 +294,9 @@
                v-for="(item,index) in weekList"
                :key="index">
             <span>循环周期: </span>
-            <el-select v-model="item.dayOfWeek">
+            <el-select v-model="item.dayOfWeek"
+                       filterable
+                       clearable>
               <el-option v-for="(item,index) in weekDateList"
                          :key='index'
                          :label="item.label"
@@ -332,7 +336,9 @@
                :visible.sync="addrVisible">
       <el-form :model="addrForm">
         <el-form-item label="教学点">
-          <el-select v-model="addrForm.address">
+          <el-select v-model="addrForm.address"
+                     clearable
+                     filterable>
             <el-option v-for="(item,index) in schoolList"
                        :key="index"
                        :value="item.id"
@@ -382,7 +388,7 @@ export default {
       },
       rules: {
         // 分页规则
-        limit: 10, // 限制显示条数
+        limit: 50, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
         page_size: [50, 100] // 选择限制显示条数