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

src/api/common/common.js

@@ -109,7 +109,7 @@ export function EduDownLoad(cmd, msg, fileName) {
     method: 'post',
     data: msg,
     headers:{
-        'Content-Type': 'application/octet-stream;charset=utf-8'
+        responseType: 'arraybuffer'
     }
   }).then(res => {
     let blob = new Blob([res.data], {

src/pages/user/backbill.vue

@@ -13,8 +13,8 @@
     <div class="page-search row items-center">
       <div class="col row wrap q-col-gutter-md">
         <div class="col-3">
-          <q-input @change="resetSearch" clearable standout="bg-primary text-white"
-            v-model="msg.ClassName" label="学员名称/班级名称/老师名称" />
+          <q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.ClassName"
+            label="学员名称/班级名称/老师名称" />
         </div>
         <div class="col-3">
           <q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.AuditStatus" :options="ShowOpts"
@@ -32,6 +32,12 @@
       </div>
     </div>
     <div class="page-content">
+      <q-tabs style="margin-bottom:20px;" v-model="tabCheck" narrow-indicator dense align="left" class="text-primary">
+        <q-tab :ripple="false" name="1" label="我发起的" />
+        <q-tab :ripple="false" name="2" label="待我审批" />
+        <q-tab :ripple="false" name="3" label="已审批" />
+        <q-tab :ripple="false" name="4" label="抄送给我的" />
+      </q-tabs>
       <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
         separator="none" :data="data" :columns="columns" row-key="name">
         <template v-slot:body-cell-Status="props">
@@ -176,7 +182,9 @@
           AuditStatus: "0", //审核状态
           QStartTime: "", //开始时间
           QEndTime: "", //结束时间
+          
         },
+        tabCheck: "1",
         pageCount: 0,
         isShowBillForm: false, //是否显示单据表单
         billObj: {}, //单据信息

src/utils/request.js

@@ -50,7 +50,7 @@ service.interceptors.response.use(
     const res = response.data;
     console.log(" response", response)
     // TODO 确定后台的CODE码
-    if (response.status === 200 && response.headers["content-type"] === "application/octet-stream") {
+    if (response.status === 200 && response.config.headers["responseType"] === "arraybuffer") {
       // 文件类型特殊处理
       return response;
     } else if (res.Code != 1) {