修改bug

src/pages/course/classHourReward.vue

@@ -328,7 +328,7 @@
             this.TeacherList = res.Data;
             this.TeacherList.unshift({
               TId: 0,
-              TeacherName: "不限"
+              TeacherName: "全部老师"
             })
             this.AllTeacherList = this.TeacherList
           }
@@ -360,7 +360,6 @@
 
         if (this.tempManager && this.tempManager.length > 0) {
           let all = false
-
           this.tempManager.forEach(x => {
             if (x == 0) {
               all = true

src/pages/financial/CostType.vue

@@ -157,7 +157,7 @@
               <!-- <button type="button" class="normalBtn" @click="outerVisible=true">导入</button>
               <button type="button" class="normalBtn" @click="downMuban()">下载导入模板</button> -->
               <!-- <button class="normalBtn" @click="addShow=true,text=$t('pub.addBtn'),addFun(),resetInfo()" >{{$t('pub.addBtn')}}</button> -->
-              <q-btn color="primary" size="11px" :label="$t('pub.addBtn')"  @click="addShow=true,text=$t('pub.addBtn'),addFun(),resetInfo()"/>
+              <q-btn color="primary" size="11px" label="新增"  @click="addShow=true,text=$t('pub.addBtn'),addFun(),resetInfo()"/>
              <el-tooltip class="item" effect="dark" :content="$t('fnc.qhpaiban')" placement="top-end">
             <i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i>
             <i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
@@ -669,6 +669,7 @@
         if(!x){
           this.addMsg.ParentId = '';
         }
+
         let msg = {
           Name:'',
           Type:0,
@@ -916,7 +917,6 @@
             this.addMsg.Sort = dataList.Sort;
             this.addMsg.Is_Report = dataList.Is_Report;
             this.addMsg.IsSecret = dataList.IsSecret;
-
             // this.addMsg = dataList;
             if(dataList.DepartList.length>0){
               dataList.DepartList.forEach(x=>{
@@ -946,6 +946,8 @@
                 }
               })
             }
+            this.getCostTypeList(2,1)//费用类型
+
           } else {
             this.Error(res.data.message);
           }

src/pages/financial/EasyReport.vue

@@ -890,7 +890,7 @@
         } else {
           endDate = that.year + "-" + column.end
         }
-        if (rowIndex < 6 ) {
+        if (rowIndex < 7 ) {
           // 联运收入
           // if(rowData.ZhaiYao=="联运收入"){
           //   that.goUrl("CombinedRevenueReport",startDate,endDate,BranchId,"联运收入")
@@ -1203,11 +1203,11 @@
               let tichengList = [];
               this.DataList = [];
               data.list.forEach(item => {
-                if (item.ZhaiYao != "销售提成" && item.ZhaiYao != "原始提成") {
+                // if (item.ZhaiYao != "销售提成" && item.ZhaiYao != "原始提成") {
                   this.DataList.push(item)
-                } else {
-                  tichengList.push(item);
-                }
+                // } else {
+                //   tichengList.push(item);
+                // }
               })
               this.UpdateStaus = data.Status;
               this.UpdateStartTime = data.UpdateStartTime;

src/pages/financial/reportform/RecPayQueryTeam.vue

@@ -183,7 +183,7 @@
                         <td style="position: relative;">
                             <div v-if='item.StuList && item.StuList.length>0'>
                                 <span v-if='item.show == true'>
-                                    <p v-for="( son , sIndex ) in item.StuList">{{son.Money}}
+                                    <p v-for="( son , sIndex ) in item.StuList"><span style="cursor: pointer;text-decoration: underline;" @click="gourlteacher2('studentsClassfee',son,item)">{{son.Money}}</span>
                                         <span
                                             style="position: absolute;right: 5px;cursor: pointer;text-decoration: underline;color: #409EFF;"
                                             v-if='(sIndex+1)==item.StuList.length && item.show == true && item.StuList.length>3'
@@ -195,7 +195,7 @@
                                 </span>
                                 <span v-if='item.show == false'>
                                     <p v-for="( son , sIndex ) in item.StuList"> <span
-                                            v-if='sIndex<3'>{{son.Money}}</span>
+                                            v-if='sIndex<3'><span style="cursor: pointer;text-decoration: underline;" @click="gourlteacher2('studentsClassfee',son,item)">{{son.Money}}</span></span>
                                         <span
                                             style="position: absolute;right: 5px;cursor: pointer;text-decoration: underline;color: #409EFF;"
                                             v-if='sIndex==2 && item.show == false'