no message

src/api/teacher/index.js

@@ -52,7 +52,7 @@ export function GetClassPlanStatisticalPage(data) {
  * 获取我调课申请列表
  * @param {JSON参数} data
  */
-export function GetEducationReceiptPage(data) {
+export function queryEducationReceiptPage(data) {
   return request({
     url: '/EducationReceipt/GetEducationReceiptPage',
     method: 'post',
@@ -82,5 +82,3 @@ export function GetEduReceiptInfo (data) {
     data
   })
 }
-
-

src/components/sale/orderlist.vue

@@ -73,6 +73,9 @@
                 <div v-if="item.HelpEnterName">
                   协助人员：{{item.HelpEnterName}}
                 </div>
+                <div v-if="item.ClassNo">
+                  班号：{{item.ClassNo}}
+                </div>
                 <div v-if="item.OpenTime">
                   开班时间：{{item.OpenTime}}
                 </div>

src/pages/course/monthLessonCost.vue

@@ -56,7 +56,7 @@
                     </tr>
                     <tr>
                         <th width="">老师名称</th>
-                        <th width="">总课时</th>
+                        <th width="">上课课时</th>
                         <th width="">基础课时</th>
                         <th width="">课时费</th>
                         <th width="">学生名称</th>
@@ -70,9 +70,12 @@
                             <span>{{item.Month}}</span>
                         </td>
                         <td>
-                            <p v-for="( son , sIndex ) in item.TeacherList"><span
+                            <p v-for="( son , sIndex ) in item.TeacherList">
+                                <span v-if="son.TeacherName !='-' "
                                     style="cursor: pointer;text-decoration: underline;"
-                                    @click="gourlteacher('teacherclassfee',son,item)">{{son.TeacherName}}</span></p>
+                                    @click="gourlteacher('teacherclassfee',son,item)">{{son.TeacherName}}</span>
+                                <span v-else >{{son.TeacherName}}</span>    
+                            </p>
                         </td>
                         <td>
                             <p v-for="( son , sIndex ) in item.TeacherList">{{son.HoursNum}}</p>
@@ -94,7 +97,9 @@
                         </td>
                         <td>
                             <span v-if='item.show == true'>
-                                <p v-for="( son , sIndex ) in item.StudentList"><span style="cursor: pointer;text-decoration: underline;" @click="gourlteacher2('studentsClassfee',son,item)">{{son.StudentName}}</span>
+                                <p v-for="( son , sIndex ) in item.StudentList">
+                                    <span v-if="son.StudentName!='-'" style="cursor: pointer;text-decoration: underline;" @click="gourlteacher2('studentsClassfee',son,item)">{{son.StudentName}}</span>
+                                    <span v-else >{{son.StudentName}}</span>
                                 </p>
                             </span>
                             <span v-if='item.show == false'>
@@ -199,8 +204,45 @@
                                 x.show = true
                             }
                         });
+                        if(this.dataList.length>0){
+                            this.getAskfor()
+                        }
+
+                    }
+                })
+            },
+            getAskfor(){
+                let  obj = {
+                    Month:'合计',
+                    TeacherList:[{TeacherName:'-',HoursNum:0,BaseHoursNum:0,HoursMoney:0}],
+                    StuNum:'-',
+                    StuSumHours:0,
+                    StuSumMoney:0,
+                    StudentList:[{StudentName:'-',HoursNum:'-',HoursMoney:'-'}],
+                    show:true
                 }
+                this.dataList.forEach((x)=>{
+                    if(x.StuSumHours){obj.StuSumHours = this.accAdd(x.StuSumHours,obj.StuSumHours) };
+                    if(x.StuSumMoney){obj.StuSumMoney = this.accAdd(x.StuSumMoney,obj.StuSumMoney) };
+                    x.TeacherList.forEach(j=>{
+                        obj.TeacherList[0].HoursNum = this.accAdd(obj.TeacherList[0].HoursNum,j.HoursNum);
+                        obj.TeacherList[0].BaseHoursNum = this.accAdd(obj.TeacherList[0].BaseHoursNum,j.BaseHoursNum);
+                        obj.TeacherList[0].HoursMoney = this.accAdd(obj.TeacherList[0].HoursMoney,j.HoursMoney);
                     })
+                    
+                })
+                this.dataList.push(obj)
+            },
+            accAdd(arg1,arg2){//js 加法精确计算
+                var r1,r2,m;
+                try { r1 = arg1.toString().split(".")[1].length;} catch(e) {
+                    r1 = 0;
+                }
+                try { r2 = arg2.toString().split(".")[1].length;} catch(e) {
+                    r2 = 0;
+                }
+                m =Math.pow(10,Math.max(r1,r2));
+                return (arg1*m+arg2*m)/m;
             },
             setClass(item) {//班级
                 this.isShowClass = true;

src/pages/financial/CostType.vue

@@ -865,7 +865,10 @@
         }
         this.DepartmentList=[];
         this.PostList=[];
-        this.EmployeeList=[];
+        // this.EmployeeList=[];
+        this.EmployeeList.forEach(y=>{
+            y.disabled = false;
+          });
         this.CostTypeList = [];
       },
       initTableInfo(){//获取数据
@@ -1004,6 +1007,9 @@
           }
           this.addMsg.list.push(obj)
         }
+        if(this.EmployeeIDList.length==0){
+          return this.$message.error('请选择使用人员')
+        }
         if(this.EmployeeIDList.length > 0){
           this.EmployeeIDList.forEach(x=>{
             let obj = {

src/pages/sale/orderStatistics.vue

@@ -28,6 +28,10 @@
           <q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.ClassName" label="班级名称"
             @clear="resetSearch" maxlength="20" />
         </div>
+        <div class="col-3">
+          <q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.ClassNo" label="班号"
+            @clear="resetSearch" maxlength="20" />
+        </div>
         <div class="col-3">
           <q-select @input="resetSearch" standout="bg-primary text-white" option-value="CourseId"
             option-label="CourseName" v-model="msg.CouseId" :options="CourseList" emit-value map-options label="学习课程" />
@@ -176,6 +180,7 @@
           Q_OrderBy: 2, //写死 =2
           PlatformTax: 0, //平台税金
           EnterID:'',//业务员id
+          ClassNo:'',//班号
         },
         //订单状态
         OrderStateList: [],