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,17 +166,18 @@
           size="small"
           @click.stop="rowView(row)"
           v-if="vaildData(permission.manage_mission_view, false)"
-          >详情</el-button
+        >详情
+        </el-button
         >
-       <!-- <el-button
+        <!-- <el-button
-          type="text"
+           type="text"
-          size="small"
+           size="small"
-          @click.stop="rowZPView(row)"
+           @click.stop="rowZPView(row)"
-          v-if="vaildData(permission.manage_mission_zpview, false)"
+           v-if="vaildData(permission.manage_mission_zpview, false)"
-          >招聘情况</el-button> -->
+           >招聘情况</el-button> -->
       </template>
-      <template slot="wage"slot-scope="{ row }">
+      <template slot="wage" slot-scope="{ row }">
-        <div>{{row.wage}}{{wageUnitCategoryStateEnum[row.wageUnitCategory]}}</div>
+        <div>{{ row.wage }}{{ wageUnitCategoryStateEnum[row.wageUnitCategory] }}</div>
       </template>
     </avue-crud>
     <el-drawer title="详情" :visible.sync="viewDrawer" size="60%">
@@ -193,27 +198,29 @@ import {
   exportList
 } from "@/api/manage/mission";
 import {downloadEcxel} from '@/util/util'
-import { mapGetters } from "vuex";
+import {mapGetters} from "vuex";
 import missionView from "@/views/util/mission-view";
 import zpView from "./zpView";
-import { missionState, wageUnitCategoryState, recruitStatus, dataSourcesEnum, educationState } from "@/common/dic";
+import {missionState, wageUnitCategoryState, recruitStatus, dataSourcesEnum, educationState} from "@/common/dic";
-import { calcDate } from "@/util/date";
+import {calcDate} from "@/util/date";
-import { Message } from "element-ui";
+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);
   },
   3000,
-  { trailing: false }
+  {trailing: false}
 );
 
 export default {
-  components: {missionView, zpView },
+  components: {missionView, zpView},
   name: "manage_mission",
   data() {
     return {
@@ -225,7 +232,7 @@ export default {
       view: {},
       form: {},
       selectionList: [],
-      query: { type: '' },
+      query: {type: ''},
       loading: false,
       page: {
         pageSize: 10,
@@ -240,10 +247,10 @@ export default {
           label: "审核未通过",
           value: 9,
         },
-        { value: 1, label: "招聘中" },
+        {value: 1, label: "招聘中"},
         // { value: 2, label: "任务中" },
-        { value: 3, label: "已完成" },
+        {value: 3, label: "已完成"},
-        { value: 4, label: "已失效" },
+        {value: 4, label: "已失效"},
 
       ],
       option: {
@@ -305,14 +312,14 @@ export default {
             prop: "ageDesc",
             search: false,
             display: false,
-          },{
+          }, {
             label: "学历要求",
             prop: "education",
             type: "select",
             dicData: educationState,
             search: false,
             display: false,
-          },{
+          }, {
             label: "经验要求",
             prop: "experienceDesc",
             search: false,
@@ -464,7 +471,7 @@ export default {
       if (this.query.time) {
         this.query.stime = this.query.time[0];
         this.query.etime = this.query.time[1];
-       // delete this.query.time;
+        // delete this.query.time;
       }
       this.page.currentPage = 1;
       this.onLoad(this.page, this.query);
@@ -552,7 +559,7 @@ export default {
       } else {
         let h = this.$createElement;
         this.$prompt(
-          h("p", { style: "color: #F56C6C" }, "一旦驳回无法进行后续操作"),
+          h("p", {style: "color: #F56C6C"}, "一旦驳回无法进行后续操作"),
           "请核对招聘信息后再进行审核通过",
           {
             distinguishCancelAndClose: true,
@@ -562,8 +569,8 @@ export default {
             center: true,
             inputType: "textarea",
             inputPlaceholder: "备注驳回原因",
-            beforeClose: function(action, instance, done) {
+            beforeClose: function (action, instance, done) {
-              if(action === 'cancel') {
+              if (action === 'cancel') {
                 if (!instance.inputValue) {
                   return this.$message({
                     type: "info",
@@ -571,7 +578,7 @@ export default {
                   });
                 }
                 self.handelFetchAuditing(idList, 9, instance.inputValue, "成功驳回, 操作成功!").then(() => done())
-              } else if(action === 'confirm') {
+              } else if (action === 'confirm') {
                 self.handelFetchAuditing(idList, 1, instance.inputValue).then(() => done())
               } else {
                 done()
@@ -611,7 +618,8 @@ export default {
         this.page.pageSize,
         this.query
       ).then((response) => {
-        const blob = window.URL.createObjectURL(new Blob([response.data], { type: response.headers['content-type']}));
+        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')
         let event = new MouseEvent('click')
@@ -627,10 +635,11 @@ export default {
 </script>
 
 <style>
-  .el-form-item {
+.el-form-item {
-    margin-right: 18px !important;
+  margin-right: 18px !important;
-  }
+}
-.searchBtn{
+
+.searchBtn {
   display: inline-block;
 }
 </style>

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) => ({