flat: 合并

src/router/axios.js

@@ -75,6 +75,9 @@ axios.interceptors.response.use(
       Message({message: message, type: 'error'});
       return Promise.reject(err, res)
     }
+    if (res.data instanceof Blob) {
+      return res
+    }
     return transformReplaceStr(res);
   },
   error => {

src/views/manage/mission/index.vue

@@ -69,10 +69,12 @@
             size="small"
             icon="el-icon-search"
             @click="searchChange1"
-          >搜 索</el-button
+          >搜 索
+          </el-button
           >
           <el-button size="small" icon="el-icon-delete" @click="searchReset1"
-          >清 空</el-button
+          >清 空
+          </el-button
           >
         </div>
       </el-row>
@@ -148,12 +150,14 @@
           size="small"
           @click.stop="handleCheck"
           type="primary"
-          >审核</el-button
+        >审核
+        </el-button
         >
       </template>
       <template slot="menuRight">
         <el-button size="small" :disabled="downloadButton" @click.stop="downRecords" type="primary"
-          >导出</el-button
+        >导出
+        </el-button
         >
       </template>
       <template slot-scope="{ row }" slot="menu">
@@ -162,7 +166,8 @@
           size="small"
           @click.stop="rowView(row)"
           v-if="vaildData(permission.manage_mission_view, false)"
-          >详情</el-button
+        >详情
+        </el-button
         >
         <!-- <el-button
            type="text"
@@ -199,11 +204,13 @@ import zpView from "./zpView";
 import {missionState, wageUnitCategoryState, recruitStatus, dataSourcesEnum, educationState} from "@/common/dic";
 import {calcDate} from "@/util/date";
 import {Message} from "element-ui";
+
 const wageUnitCategoryStateEnum = {}
 wageUnitCategoryState.map((item) => {
   wageUnitCategoryStateEnum[item.value] = item.label
 })
 import lodash from "lodash";
+
 const message = lodash.throttle(
   function (options) {
     Message(options);
@@ -611,6 +618,7 @@ export default {
         this.page.pageSize,
         this.query
       ).then((response) => {
+        console.log('response', response)
         const blob = window.URL.createObjectURL(new Blob([response.data], {type: response.headers['content-type']}));
         let fileName = decodeURI(response.headers['content-disposition'].split(';')[1].split('filename=')[1])
         let a = document.createElement('a')
@@ -630,6 +638,7 @@ export default {
 .el-form-item {
   margin-right: 18px !important;
 }
+
 .searchBtn {
   display: inline-block;
 }

src/views/manage/superviseComplaintInfo/index.vue

@@ -38,8 +38,8 @@ const classIsDeleted = {
   1: '是',
 }
 const classStatus = {
-  0: '未发布',
+  0: '未处理',
-  1: '发布',
+  1: '已处理',
   2: '关闭'
 }
 const classEnumList = Object.keys(classEnum).map((item) => ({