Commit fadf224c by 无尘

fix: 修改加载

parent c16363eb
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2020-08-27 09:14:54 * @Date: 2020-08-27 09:14:54
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-10-12 16:15:52 * @LastEditTime: 2020-11-30 11:19:07
--> -->
<!-- <!--
部门成员 部门成员
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<div class="flex flex-align-center flex-pack-center font-12 color-909399 cursor-pointer hover-303133 use-help-tip" @click="toShowTip">使用帮助</div> <div class="flex flex-align-center flex-pack-center font-12 color-909399 cursor-pointer hover-303133 use-help-tip" @click="toShowTip">使用帮助</div>
</div> </div>
</div> </div>
<div class="m-t-20"> <div class="m-t-20" v-loading="loading">
<div class="depart-condition-wrap flex flex-space-between "> <div class="depart-condition-wrap flex flex-space-between ">
<div> <div>
<el-input placeholder="搜索姓名/手机号码" maxlength="50" v-model="searchInput" class="w-274" @keyup.native="value => toInput(value, searchInput)" clearable @clear="clearInput"></el-input> <el-input placeholder="搜索姓名/手机号码" maxlength="50" v-model="searchInput" class="w-274" @keyup.native="value => toInput(value, searchInput)" clearable @clear="clearInput"></el-input>
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</div> </div>
<div class="m-t-20"> <div class="m-t-20">
<el-table class="select-table" ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }"> <el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }">
<!-- <el-table-column type="selection" width="55"> </el-table-column> @selection-change="handleSelectionChange" --> <!-- <el-table-column type="selection" width="55"> </el-table-column> @selection-change="handleSelectionChange" -->
<el-table-column label="姓名" show-overflow-tooltip> <el-table-column label="姓名" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.staffName || '--' }}</template> <template slot-scope="scope">{{ scope.row.staffName || '--' }}</template>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2020-08-27 09:14:54 * @Date: 2020-08-27 09:14:54
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-09-09 15:47:35 * @LastEditTime: 2020-11-30 11:22:13
--> -->
<!-- <!--
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
--> -->
<template> <template>
<el-dialog title="绑定详情" :visible.sync="dialogVisible" width="995px" :before-close="handleClose"> <el-dialog title="绑定详情" :visible.sync="dialogVisible" width="995px" :before-close="handleClose">
<div v-loading="loading" >
<div class="overstore-tip"> <div class="overstore-tip">
<div class="flex flex-space-between"> <div class="flex flex-space-between">
<div></div> <div></div>
...@@ -58,6 +59,7 @@ ...@@ -58,6 +59,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
</div>
<add-relate v-if="addShow" :depart-obj="relateRow" @refreshData="refreshData"></add-relate> <add-relate v-if="addShow" :depart-obj="relateRow" @refreshData="refreshData"></add-relate>
</el-dialog> </el-dialog>
</template> </template>
...@@ -88,7 +90,8 @@ export default { ...@@ -88,7 +90,8 @@ export default {
pageSize: 20, pageSize: 20,
total: 0, total: 0,
tableData: [], tableData: [],
addShow: false addShow: false,
loading: false
}; };
}, },
mounted() { mounted() {
...@@ -206,15 +209,17 @@ export default { ...@@ -206,15 +209,17 @@ export default {
*/ */
getTableList() { getTableList() {
const that = this; const that = this;
that.loading = true;
let para = { let para = {
staffId: that.relateRow.staffId staffId: that.relateRow.staffId
}; };
getStaffRelation(para) getStaffRelation(para)
.then(res => { .then(res => {
that.loading = false;
that.tableData = res.result || []; that.tableData = res.result || [];
}) })
.catch(function(error) { .catch(function(error) {
that.loading = false;
}); });
} }
}, },
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-03-20 14:36:37 * @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-09-09 16:04:18 * @LastEditTime: 2020-11-30 11:28:20
--> -->
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<div class="apps-content-right"> <div class="apps-content-right">
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="绑定变更日志" name="first"> <el-tab-pane label="绑定变更日志" name="first">
<div v-loading="loadingBind">
<div class="flex flex-space-between"> <div class="flex flex-space-between">
<div class=""> <div class="">
<el-input placeholder="请输入导购手机号或代码" prefix-icon="el-icon-search" v-model="searchInput" class="w-293" @keyup.native="value => toInput(value, searchInput)" clearable @clear="clearInput"> </el-input> <el-input placeholder="请输入导购手机号或代码" prefix-icon="el-icon-search" v-model="searchInput" class="w-293" @keyup.native="value => toInput(value, searchInput)" clearable @clear="clearInput"> </el-input>
...@@ -86,8 +87,10 @@ ...@@ -86,8 +87,10 @@
<dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"> </dm-pagination> <dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"> </dm-pagination>
</div> </div>
</div> </div>
</div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="通讯录刷新日志" name="second"> <el-tab-pane label="通讯录刷新日志" name="second">
<div v-loading="loading">
<div class="flex flex-space-between"> <div class="flex flex-space-between">
<common-alert-tip :width="'284px'" :tip-content="'仅保存近一年的日志'"></common-alert-tip> <common-alert-tip :width="'284px'" :tip-content="'仅保存近一年的日志'"></common-alert-tip>
</div> </div>
...@@ -131,6 +134,7 @@ ...@@ -131,6 +134,7 @@
<dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"> </dm-pagination> <dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"> </dm-pagination>
</div> </div>
</div> </div>
</div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
...@@ -187,7 +191,9 @@ export default { ...@@ -187,7 +191,9 @@ export default {
// 解绑日志 // 解绑日志
optType: '', optType: '',
enterpriseId: '', enterpriseId: '',
brandOptions: [] brandOptions: [],
loading: false,
loadingBind: false
}; };
}, },
mounted() { mounted() {
...@@ -320,6 +326,7 @@ export default { ...@@ -320,6 +326,7 @@ export default {
*/ */
getBindList() { getBindList() {
const that = this; const that = this;
that.loading = true;
let para = { let para = {
search: that.searchInput || '', // 搜索字段 search: that.searchInput || '', // 搜索字段
enterpriseId: that.enterpriseId, enterpriseId: that.enterpriseId,
...@@ -330,11 +337,12 @@ export default { ...@@ -330,11 +337,12 @@ export default {
}; };
getBindLog(para) getBindLog(para)
.then(res => { .then(res => {
that.loadingBind = false;
that.tableBindData = res.result.result || []; that.tableBindData = res.result.result || [];
that.total = res.result.totalCount; that.total = res.result.totalCount;
}) })
.catch(function(error) { .catch(function(error) {
that.loadingBind = false;
}); });
}, },
/** /**
...@@ -343,6 +351,7 @@ export default { ...@@ -343,6 +351,7 @@ export default {
*/ */
getTableList() { getTableList() {
const that = this; const that = this;
that.loading = true;
let para = { let para = {
enterpriseId: that.enterpriseId, enterpriseId: that.enterpriseId,
wxEnterpriseId: that.wxEnterpriseId, wxEnterpriseId: that.wxEnterpriseId,
...@@ -351,11 +360,12 @@ export default { ...@@ -351,11 +360,12 @@ export default {
}; };
getRefreshLog(para) getRefreshLog(para)
.then(res => { .then(res => {
that.loading = false;
that.tableData = res.result.result || []; that.tableData = res.result.result || [];
that.total = res.result.totalCount; that.total = res.result.totalCount;
}) })
.catch(function(error) { .catch(function(error) {
that.loading = false;
}); });
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment