Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/api/common/common.js

@@ -104,22 +104,7 @@ export function getFileExt(filename) {
  */
 
 export function EduDownLoad(cmd, msg, fileName) {
-  return request({
-    url: cmd,
-    method: 'post',
-    data: msg,
-    headers:{
-        responseType: 'arraybuffer'
-    }
-  }).then(res => {
-    let blob = new Blob([res.data], {
-      type: "application/vnd.ms-excel;charset=utf-8"
-    })
-    let url = URL.createObjectURL(blob);
-    let link = document.createElement('a');
-    link.href = url;
-    link.setAttribute("download", fileName);
-    document.body.appendChild(link);
-    link.click();
-  })
+    
 }
+
+ 
\ No newline at end of file

src/pages/course/rewardDetailed.vue

 <template>
   <div class="rewardDetailed page-body">
-    <div  class="page-search row items-center">
+    <div class="page-search row items-center">
       <div class="col row wrap q-mr-lg q-col-gutter-md">
         <div class="col-3">
           <q-select @input="getList" standout="bg-primary text-white" option-value="TId" option-label="TeacherName"
-                    v-model="msg.TeacherId" :options="TeacherList" emit-value map-options label="关联老师" />
+            v-model="msg.TeacherId" :options="TeacherList" emit-value map-options label="关联老师" />
         </div>
         <div class="col-3">
           <q-select @input="getList" standout="bg-primary text-white" option-value="Id" option-label="Name"
-                    v-model="msg.Type" :options="TypeList" emit-value map-options label="上课类型" />
+            v-model="msg.Type" :options="TypeList" emit-value map-options label="上课类型" />
         </div>
       </div>
     </div>
     <div class="page-content">
       <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
-               separator="vertical" :data="data.List" :columns="columns" row-key="name">
+        separator="vertical" :data="data.List" :columns="columns" row-key="name">
         <template v-slot:top="props">
           <div class="col-2 q-table__title">教师课时费明细</div>
           <q-space />
           <div class="page-option">
-            <q-btn color="accent" size="sm" label="导出" />
+            <q-btn color="accent" size="sm" label="导出" @click="Export" />
           </div>
         </template>
         <template v-slot:body-cell-Type="props">
           <q-td :props="props">
-            <span >{{props.row.Type==1?'带班':'代课'}}</span>
+            <span>{{props.row.Type==1?'带班':'代课'}}</span>
           </q-td>
         </template>
         <template v-slot:bottom>
 
         </template>
       </q-table>
-      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table" style="margin-top: 30px"
-               separator="vertical" :data="data.Statistics" :columns="columnsZ" row-key="name">
+      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
+        style="margin-top: 30px" separator="vertical" :data="data.Statistics" :columns="columnsZ" row-key="name">
         <template v-slot:top="props">
           <div class="col-2 q-table__title">教师课时费汇总</div>
           <q-space />
@@ -40,7 +40,7 @@
         </template>
         <template v-slot:body-cell-Type="props">
           <q-td :props="props">
-            <span >{{props.row.Type==1?'带班':'代课'}}</span>
+            <span>{{props.row.Type==1?'带班':'代课'}}</span>
           </q-td>
         </template>
         <template v-slot:bottom>
@@ -54,21 +54,21 @@
 
 <script>
   import {
-    getTeachingBonusDetailList,//明细详情
+    getTeachingBonusDetailList, //明细详情
   } from '../../api/course/class'
   import {
     getTeacherDropDownList,
   } from '../../api/school/index';
   export default {
     name: "rewardDetailed",
-    data(){
-      return{
+    data() {
+      return {
         columns: [{
-          name: 'Date',
-          label: '日期',
-          field: 'Date',
-          align: 'left'
-        },
+            name: 'Date',
+            label: '日期',
+            field: 'Date',
+            align: 'left'
+          },
           {
             name: 'TeacherName',
             field: 'TeacherName',
@@ -115,8 +115,7 @@
           },
 
         ],
-        columnsZ:[
-          {
+        columnsZ: [{
             name: 'TeacherName',
             label: '教师姓名',
             field: 'TeacherName',
@@ -153,29 +152,39 @@
         data: [],
         loading: true,
         msg: {
-          rowsPerPage:999,
-          BonusId:0,
-          TeacherId:0,
-          Type:0
+          rowsPerPage: 999,
+          BonusId: 0,
+          TeacherId: 0,
+          Type: 0
         },
         TeacherList: [], //关联教师下拉数据
-        TypeList:[
-          {Id:0,Name:'不限'},
-          {Id:1,Name:'带班'},
-          {Id:2,Name:'代课'},
+        TypeList: [{
+            Id: 0,
+            Name: '不限'
+          },
+          {
+            Id: 1,
+            Name: '带班'
+          },
+          {
+            Id: 2,
+            Name: '代课'
+          },
         ]
       }
     },
     created() {
-      if(this.$route.query){
-        this.msg.BonusId =this.$route.query.Id;
-        this.msg.TeacherId =Number(this.$route.query.TeacherId);
+      if (this.$route.query) {
+        this.msg.BonusId = this.$route.query.Id;
+        this.msg.TeacherId = Number(this.$route.query.TeacherId);
       }
       this.getList();
       this.GetTeacherList()
-
     },
-    methods:{
+    methods: {
+      Export() {
+        this.GetEduDownLoad("/TeachingRewards/GetTeachingBonusDetailToExcel", this.msg, "课时奖励.xls");
+      },
       //获取教师下拉
       GetTeacherList() {
         getTeacherDropDownList({}).then(res => {
@@ -185,11 +194,10 @@
               TId: 0,
               TeacherName: "不限"
             })
-
           }
         })
       },
-      getList(){
+      getList() {
         this.loading = true;
         getTeachingBonusDetailList(this.msg).then(res => {
           this.loading = false
@@ -198,11 +206,12 @@
           this.loading = false
         })
       },
-      goreturn(){
+      goreturn() {
         this.$router.go(-1)
       },
     }
   }
+
 </script>
 
 <style scoped>

src/utils/index.js

@@ -476,45 +476,3 @@ export function getLocalStorage(){
       return null;
     }
 }
-export function apipost(cmd, msg, successCall, faildCall, isOnline){
-    var timestamp = (new Date()).valueOf();
-    var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
-
-    var token = "";
-    var key = "";
-
-    if (this.getLocalStorage() != null) {
-      token = this.getLocalStorage().Token;
-      key = this.getLocalStorage().SecretKey;
-    }
-
-    var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
-
-    var postData = {
-        "msg": msg,
-        "cmd": cmd,
-        "timestamp": timestamp,
-        "token": token,
-        "sign": md5Str,
-        "languageId": tempLanguage
-    }
-    // return reuest({
-    //     method:'post',
-
-    // })
-    this.$http.post(apiurl, postData, {
-        headers: {
-          'Content-Type': 'application/json',
-          'Referer-Viitto': this.$route.path
-        }
-      })
-      .then(res => {
-        if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
-          
-        } else if (res.resultCode == 10005) {
-          
-        } else {
-          successCall(res);
-        }
-      }, faildCall)
-}
\ No newline at end of file