1

src/components/global/user-right-box.vue

 <template>
 <q-dialog v-model="persistent" maximized full-height position="right" @hide="closeShenheForm">
-    <q-card style="margin-top:61px;width:375px" class="no-border-radius q-pa-lg">
+    
+    <q-card style="margin-top:61px;width:375px;padding-bottom: 70px;" class="no-border-radius q-pa-lg">
+        <q-scroll-area style="height: 100%; max-width: 375px;" :thumb-style="thumbStyle"
+        :bar-style="barStyle">
             <div class="text-weight-bold">
                 <span style="font-size:20px;" class="q-mr-md">用户个人资料</span>
                 <span class="remark-font">12条未读消息</span>
@@ -49,7 +52,7 @@
             <q-separator color="grey-2" class="q-my-md"></q-separator>
             <div class="text-weight-bold" style="font-size:16px;">常用功能</div>
             <q-list>
-            <q-item class="q-my-sm q-pa-xs" clickable v-ripple @click="undefinedGongneng">
+                <q-item class="q-my-sm q-pa-xs" clickable v-ripple @click="goUrlgeren" >
                     <q-item-section avatar>
                         <q-avatar style="background-color: #F3F6F9;" rounded size="40px" text-color="secondary">
                             <inline-svg class="svg-icon svg-icon-secondary" src="icons/svg/General/Notification2.svg"></inline-svg>
@@ -94,6 +97,7 @@
                     </q-item-section>
                 </q-item>
             </q-list>
+        </q-scroll-area>
     </q-card>
     <!--<div class="dialog-out-close" @click="closeShenheForm" style="height:40px !important;border-top-left-radius: 4px !important;border-bottom-left-radius: 4px !important;">
         <q-icon name="iconfont icon-jujue1" size="26px" />
@@ -117,13 +121,33 @@ export default {
             text: 'Field content',
             reason: '',
             saveLoading: false,
-            saveType: 0
+            saveType: 0,
+            thumbStyle: {
+                right: '4px',
+                borderRadius: '5px',
+                backgroundColor: '#027be3',
+                width: '5px',
+                opacity: 0.75
+            },
+
+            barStyle: {
+                right: '2px',
+                borderRadius: '9px',
+                backgroundColor: '#027be3',
+                width: '9px',
+                opacity: 0.2
+            }
         }
     },
     methods: {
         closeShenheForm() {
             this.$emit('close')
         },
+        goUrlgeren(){//个人资料
+            // this.$router.push({
+            //     path: '/user/personalData',
+            // })
+        },
         undefinedGongneng() {
            this.$q.dialog({
                 title: '功能提示',

src/pages/course/baseSet.vue

@@ -127,6 +127,9 @@
         <q-input filled stack-label :dense="false" maxlength="8" v-model="addMsg.DefaultClassNum" label="默认班级人数"
           ref="DefaultClassNum" class="q-pb-lg" @keyup.native="checkInteger(addMsg,'DefaultClassNum')"
           :rules="[val => !!val || '请填写默认班级人数']" />
+          <q-input filled stack-label :dense="false" maxlength="8" v-model="addMsg.ClassNoPrefix" label="班级编码"
+          ref="ClassNoPrefix" class="q-pb-lg" @keyup.native="checkInteger(addMsg,'ClassNoPrefix')"
+          />
 
         <q-card-actions align="right" class="bg-white">
           <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="persistent=false" />
@@ -197,6 +200,12 @@
             field: 'CompleteClassNum',
             align: 'left'
           },
+          {
+            name: 'ClassNoPrefix',
+            label: '班级编码',
+            field: 'ClassNoPrefix',
+            align: 'left'
+          },
           {
             name: 'optioned',
             label: '操作',
@@ -333,6 +342,8 @@
         this.addMsg.CTypeName = '';
         this.addMsg.AddHourFee = '';
         this.addMsg.DefaultClassNum = '';
+        this.addMsg.ClassNoPrefix = '';
+        
       },
       //编辑班级类型
       EditClassType(obj) {
@@ -342,6 +353,7 @@
         this.addMsg.CTypeName = obj.CTypeName;
         this.addMsg.AddHourFee = obj.AddHourFee;
         this.addMsg.DefaultClassNum = obj.DefaultClassNum;
+        this.addMsg.ClassNoPrefix = obj.ClassNoPrefix;
       },
       //删除班级类型费用配置
       deleteClassType(obj) {

src/pages/financial/studentsClassfee.vue

@@ -68,6 +68,19 @@
                         option-label="TeacherName" v-model="msg.TeacherId" ref="TId" :options="TeacherList" label="老师"
                         :dense="false" emit-value map-options />
                 </div>
+                <div class="col-3">
+                    <q-select filled stack-label use-input input-debounce="0" option-value="ClassId" clearable @input="getList"
+                        option-label="ClassName" v-model="msg.ClassId" :options="ClassList" label="班级" :dense="false" emit-value
+                        map-options @filter="filterFn">
+                        <template v-slot:no-option>
+                        <q-item>
+                            <q-item-section class="text-grey">
+                            未找到相关数据
+                            </q-item-section>
+                        </q-item>
+                        </template>
+                    </q-select>
+                </div>
                 <div class="col-3">
                     <q-input @input="handleCurrentChanges(1)" clearable standout="bg-primary text-white" v-model="msg.OrderId" label="订单号"
                         @clear="handleCurrentChanges(1)" maxlength="20" />
@@ -155,7 +168,8 @@
 <script>
     import {
         getSchoolDropdown,
-        getTeacherDropDownList
+        getTeacherDropDownList,
+        getClassDropDownList
     } from '../../api/school/index'
     import {
         getStudentConsumptionHoursDetialPageList,
@@ -185,6 +199,7 @@
                     StudentName:'',
                     OrderId:'',
                     ContractNo:'',
+                    ClassId:0,
                 },
                 datetype: '2',
                 pageCount: 0,
@@ -197,7 +212,9 @@
                 datetypelist: [
                     { Id: '2', Name: '月份' },
                     { Id: '1', Name: '年份' },
-                ]
+                ],
+                ClassList: [],
+                allClassList: [],
             }
         },
         created() {
@@ -226,6 +243,7 @@
             this.getList();//获取提成周期列表
             this.getBranchList()
             this.GetTeacherList();//老师下拉
+            this.setClass()
 
         },
         methods: {
@@ -257,6 +275,32 @@
                     }
                 })
             },
+            setClass(item) {//班级
+                this.isShowClass = true;
+                getClassDropDownList({
+                CourseId: 0,
+                IsAddDefault: 1, //添加默认选项
+                }).then(res => {
+                if (res.Code == 1) {
+                    var jsonData = res.Data;
+                    if (jsonData && jsonData.length > 0) {
+                    this.ClassList = JSON.parse(JSON.stringify(jsonData));
+                    this.allClassList = JSON.parse(JSON.stringify(jsonData));;
+                    }
+                }
+                });
+            },
+             //筛选员工
+            filterFn(val, update) {
+                update(() => {
+                if (val === '') {
+                    this.ClassList = JSON.parse(JSON.stringify(this.allClassList))
+                } else {
+                    const needle = val.toLowerCase()
+                    this.ClassList = this.allClassList.filter(v => v.ClassName.toLowerCase().indexOf(needle) > -1)
+                }
+                })
+            },
 
             getBranchList() {//获取校区
                 getSchoolDropdown({}).then(res => {

src/pages/financial/teacherclassfee.vue

@@ -68,6 +68,20 @@
                         option-label="TeacherName" v-model="msg.TeacherId" ref="TId" :options="TeacherList" label="老师"
                         :dense="false" emit-value map-options />
                 </div>
+                <div class="col-3">
+                    <q-select filled stack-label use-input input-debounce="0" option-value="ClassId" clearable @input="getList"
+                        option-label="ClassName" v-model="msg.ClassId" :options="ClassList" label="班级" :dense="false" emit-value
+                        map-options @filter="filterFn">
+                        <template v-slot:no-option>
+                        <q-item>
+                            <q-item-section class="text-grey">
+                            未找到相关数据
+                            </q-item-section>
+                        </q-item>
+                        </template>
+                    </q-select>
+                </div>
+
                 <div class="col-3">
                     <q-select filled stack-label @input="handleCurrentChanges(1)" option-value="Id" option-label="Name" v-model="datetype" ref="Id"
                         :options="datetypelist" label="日期类型" :dense="false" emit-value map-options />
@@ -128,8 +142,10 @@
     </div>
 </template>
 <script>
+  
     import {
         getSchoolDropdown,
+        getClassDropDownList,
         getTeacherDropDownList
     } from '../../api/school/index'
     import {
@@ -157,6 +173,7 @@
                     SchoolId: '-1',
                     StartMonth: '',
                     EndMonth: '',
+                    ClassId:0,
                 },
                 datetype: '2',
                 pageCount: 0,
@@ -169,7 +186,9 @@
                 datetypelist: [
                     { Id: '2', Name: '月份' },
                     { Id: '1', Name: '年份' },
-                ]
+                ],
+                ClassList: [],
+                allClassList: [],
             }
         },
         created() {
@@ -198,7 +217,7 @@
             this.getList();//获取提成周期列表
             this.getBranchList()
             this.GetTeacherList();//老师下拉
-
+            this.setClass()
         },
         methods: {
             getList() {
@@ -216,6 +235,32 @@
                     }
                 })
             },
+            setClass(item) {//班级
+                this.isShowClass = true;
+                getClassDropDownList({
+                CourseId: 0,
+                IsAddDefault: 1, //添加默认选项
+                }).then(res => {
+                if (res.Code == 1) {
+                    var jsonData = res.Data;
+                    if (jsonData && jsonData.length > 0) {
+                    this.ClassList = JSON.parse(JSON.stringify(jsonData));
+                    this.allClassList = JSON.parse(JSON.stringify(jsonData));;
+                    }
+                }
+                });
+            },
+             //筛选员工
+            filterFn(val, update) {
+                update(() => {
+                if (val === '') {
+                    this.ClassList = JSON.parse(JSON.stringify(this.allClassList))
+                } else {
+                    const needle = val.toLowerCase()
+                    this.ClassList = this.allClassList.filter(v => v.ClassName.toLowerCase().indexOf(needle) > -1)
+                }
+                })
+            },
             //获取教师下拉
             GetTeacherList() {
                 getTeacherDropDownList({}).then(res => {