瀏覽代碼

Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

liuhj 1 周之前
父節點
當前提交
647f15b75b
共有 1 個文件被更改,包括 5 次插入3 次删除
  1. 5 3
      src/components/MCR/MarketCustomerResourcesHome.vue

+ 5 - 3
src/components/MCR/MarketCustomerResourcesHome.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="mcrh" v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading">
-        <el-dialog width="960px" title="日志查询" :visible.sync="mcrhVisible"  :close-on-click-modal="false">
+        <el-dialog width="960px" title="日志查询" :visible.sync="mcrhVisible" :close-on-click-modal="false">
             <el-form ref="form" :model="form" label-width="40px">
                 <div class="mcrh-dialog">
                     <el-form-item label="类型">
@@ -538,6 +538,7 @@ export default {
             this.$axios.post('/api/MarketCustomerResources/QueryUnlockDropList', {}, {
                 headers: {
                     'Authorization': that.token,
+                    'Accept-Encoding': 'gzip'
                 },
             }).then(resp => {
                 if (resp.data.code == 200) {
@@ -572,17 +573,18 @@ export default {
                         console.log(that.pageloadData.pageIndex, parseInt(that.pageloadData.pageIndex), 'that.pageloadData.pageIndex')
                         that.currentPage = parseInt(that.pageloadData.pageIndex);
                     }
+                    this.loading = false;
                     that.territoryChange();
-                    that.loading = false;
                 } else if (resp.data.code == 400) {
                     that.PageList = [];
                     that.total = 0;
-                    that.loading = false;
                     that.$message.error('暂无数据!');
                 }
             }).catch(err => {
                 this.$message.error('网络异常!');
+            }).finally(() => {
                 this.loading = false;
+                console.log('finally');
             })
         },
         //保存权限