Skip to content

H
haoban-4
Commit fadf224c by 无尘
Options

fix: 修改加载

parent c16363eb
Showing with 175 additions and 160 deletions
src/components/company/new-depart-member.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-08-27 09:14:54
* @LastEditors: 无尘
* @LastEditTime: 2020-10-12 16:15:52
* @LastEditTime: 2020-11-30 11:19:07
-->
<!--
部门成员
......@@ -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>
</div>
<div class="m-t-20">
<div class="m-t-20" v-loading="loading">
<div class="depart-condition-wrap flex flex-space-between ">
<div>
<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 @@
</div>
<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 label="姓名" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.staffName || '--' }}</template>
......
src/components/company/related-table.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-08-27 09:14:54
* @LastEditors: 无尘
* @LastEditTime: 2020-09-09 15:47:35
* @LastEditTime: 2020-11-30 11:22:13
-->
<!--
......@@ -14,49 +14,51 @@
-->
<template>
<el-dialog title="绑定详情" :visible.sync="dialogVisible" width="995px" :before-close="handleClose">
<div class="overstore-tip">
<div class="flex flex-space-between">
<div></div>
<el-button type="primary" @click="toAddRelate">新建绑定</el-button>
<div v-loading="loading" >
<div class="overstore-tip">
<div class="flex flex-space-between">
<div></div>
<el-button type="primary" @click="toAddRelate">新建绑定</el-button>
</div>
</div>
<div class="m-t-20">
<el-table class="select-table" ref="multipleTable" height="500" :data="tableData" tooltip-effect="dark" :style="{ width: '100%' }">
<el-table-column label="导购code" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.clerkCode || '--' }}</template>
</el-table-column>
<el-table-column prop="" label="导购姓名" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.clerkName || '--' }}
</template>
</el-table-column>
<el-table-column prop="" label="导购手机号" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.nationCode || '--' }}-{{ scope.row.clerkPhoneNumber || '--' }}
</template>
</el-table-column>
<el-table-column prop="" label="绑定商户" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.enterpriseName || '--' }}
</template>
</el-table-column>
<el-table-column prop="" label="绑定门店" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.storeName || '--' }}
</template>
</el-table-column>
<el-table-column prop="" label="绑定时间" show-overflow-tooltip>
<template slot-scope="scope">
<div class="color-606266 line-18">{{ scope.row.createTime | timeStampToYmd }}</div>
<div class="color-606266 line-18">{{ scope.row.createTime | timeStampToHms }}</div>
</template>
</el-table-column>
<el-table-column prop="" label="操作" show-overflow-tooltip>
<template slot-scope="scope">
<el-button type="text" @click="toUnbind(scope.row)">解绑</el-button>
</template>
</el-table-column>
</el-table>
</div>
</div>
<div class="m-t-20">
<el-table class="select-table" ref="multipleTable" height="500" :data="tableData" tooltip-effect="dark" :style="{ width: '100%' }">
<el-table-column label="导购code" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.clerkCode || '--' }}</template>
</el-table-column>
<el-table-column prop="" label="导购姓名" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.clerkName || '--' }}
</template>
</el-table-column>
<el-table-column prop="" label="导购手机号" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.nationCode || '--' }}-{{ scope.row.clerkPhoneNumber || '--' }}
</template>
</el-table-column>
<el-table-column prop="" label="绑定商户" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.enterpriseName || '--' }}
</template>
</el-table-column>
<el-table-column prop="" label="绑定门店" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.storeName || '--' }}
</template>
</el-table-column>
<el-table-column prop="" label="绑定时间" show-overflow-tooltip>
<template slot-scope="scope">
<div class="color-606266 line-18">{{ scope.row.createTime | timeStampToYmd }}</div>
<div class="color-606266 line-18">{{ scope.row.createTime | timeStampToHms }}</div>
</template>
</el-table-column>
<el-table-column prop="" label="操作" show-overflow-tooltip>
<template slot-scope="scope">
<el-button type="text" @click="toUnbind(scope.row)">解绑</el-button>
</template>
</el-table-column>
</el-table>
</div>
<add-relate v-if="addShow" :depart-obj="relateRow" @refreshData="refreshData"></add-relate>
</el-dialog>
......@@ -88,7 +90,8 @@ export default {
pageSize: 20,
total: 0,
tableData: [],
addShow: false
addShow: false,
loading: false
};
},
mounted() {
......@@ -206,15 +209,17 @@ export default {
*/
getTableList() {
const that = this;
that.loading = true;
let para = {
staffId: that.relateRow.staffId
};
getStaffRelation(para)
.then(res => {
that.loading = false;
that.tableData = res.result || [];
})
.catch(function(error) {
that.loading = false;
});
}
},
......
src/views/business/sync-log.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘
* @LastEditTime: 2020-09-09 16:04:18
* @LastEditTime: 2020-11-30 11:28:20
-->
<template>
<div class="my-customer-wrap common-set-wrap">
......@@ -15,120 +15,124 @@
<div class="apps-content-right">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="绑定变更日志" name="first">
<div class="flex flex-space-between">
<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-select v-model="optType" placeholder="请选择" @change="changeBindList" class="w-168 m-l-10">
<el-option label="全部状态" value=""></el-option>
<el-option label="绑定" value="0"></el-option>
<el-option label="解绑" value="1"></el-option>
</el-select>
<div v-loading="loadingBind">
<div class="flex flex-space-between">
<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-select v-model="optType" placeholder="请选择" @change="changeBindList" class="w-168 m-l-10">
<el-option label="全部状态" value=""></el-option>
<el-option label="绑定" value="0"></el-option>
<el-option label="解绑" value="1"></el-option>
</el-select>
</div>
<common-alert-tip :width="'284px'" :tip-content="tipContent"></common-alert-tip>
</div>
<common-alert-tip :width="'284px'" :tip-content="tipContent"></common-alert-tip>
</div>
<div class="m-t-20">
<el-table class="select-table" ref="multipleTable" :data="tableBindData" tooltip-effect="dark" :style="{ width: '100%' }">
<el-table-column prop="" label="类型" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.optType == 0 ? '绑定' : '解绑' }}</template>
</el-table-column>
<el-table-column label="导购账号" >
<template slot-scope="scope">
<el-popover
placement="top"
width="242"
trigger="hover">
<div>
<div class="flex flex-space-between line-28">
<span class="font-14 color-606266">姓名</span><span class="font-14 color-303133">{{scope.row.clerkName || '--'}}（{{scope.row.sex == 1 ? '男' : scope.row.sex == 2 ? '女' : '--'}} ）</span>
</div>
<div class="flex flex-space-between line-28">
<span class="font-14 color-606266">手机号</span><span class="font-14 color-303133">{{scope.row.clerkNationCode || '--'}}-{{scope.row.clerkPhoneNumber || '--'}}</span>
<div class="m-t-20">
<el-table class="select-table" ref="multipleTable" :data="tableBindData" tooltip-effect="dark" :style="{ width: '100%' }">
<el-table-column prop="" label="类型" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.optType == 0 ? '绑定' : '解绑' }}</template>
</el-table-column>
<el-table-column label="导购账号" >
<template slot-scope="scope">
<el-popover
placement="top"
width="242"
trigger="hover">
<div>
<div class="flex flex-space-between line-28">
<span class="font-14 color-606266">姓名</span><span class="font-14 color-303133">{{scope.row.clerkName || '--'}}（{{scope.row.sex == 1 ? '男' : scope.row.sex == 2 ? '女' : '--'}} ）</span>
</div>
<div class="flex flex-space-between line-28">
<span class="font-14 color-606266">手机号</span><span class="font-14 color-303133">{{scope.row.clerkNationCode || '--'}}-{{scope.row.clerkPhoneNumber || '--'}}</span>
</div>
<div class="flex flex-space-between line-28">
<span class="font-14 color-606266 min-w-90">所在门店</span><span class="font-14 color-303133">{{scope.row.storeName || '--'}}</span>
</div>
</div>
<div class="flex flex-space-between line-28">
<span class="font-14 color-606266 min-w-90">所在门店</span><span class="font-14 color-303133">{{scope.row.storeName || '--'}}</span>
</div>
</div>
<span class="common-bottom-border" slot="reference">{{scope.row.clerkName || '--' }}（{{scope.row.clerkCode || '--' }}）</span>
</el-popover>
</template>
</el-table-column>
<el-table-column label="企微账号" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.wxUserId || '--' }}</template>
</el-table-column>
<el-table-column label="手机号" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.phoneNumber || '--' }}</template>
</el-table-column>
<el-table-column prop="" label="更新时间" show-overflow-tooltip>
<template slot-scope="scope">
<div class="line-h-18">{{ scope.row.updateTime | timeStampToYmd }} {{ !scope.row.updateTime ? '--' : '' }}</div>
<div class="line-h-18">{{ scope.row.updateTime | timeStampToHms }} {{ !scope.row.updateTime ? '--' : '' }}</div>
</template>
</el-table-column>
<el-table-column label="操作人" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.optStaffName || '--' }}</template>
</el-table-column>
<el-table-column prop="" label="原因" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.channelCode == 1001" type="text">后台管理员绑定</span>
<span v-if="scope.row.channelCode == 1002" type="text">好办客户端绑定</span>
<span v-if="scope.row.channelCode == 1003" type="text">审核绑定</span>
<span v-if="scope.row.channelCode == 1004" type="text">GIC 同步绑定</span>
<span v-if="scope.row.channelCode == 1005" type="text">企业同步绑定</span>
<span v-if="scope.row.channelCode == 2001" type="text">后台管理员解绑</span>
<span v-if="scope.row.channelCode == 2002" type="text">好办客户端解绑</span>
<span v-if="scope.row.channelCode == 2003" type="text">GIC 同步解绑</span>
<span v-if="scope.row.channelCode == 2004" type="text">企业同步解绑</span>
<span v-if="scope.row.channelCode == 2005" type="text">授权范围变更解绑</span>
</template>
</el-table-column>
</el-table>
<div class="block common-wrap__page text-right m-t-24" v-if="tableBindData.length != 0">
<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>
<span class="common-bottom-border" slot="reference">{{scope.row.clerkName || '--' }}（{{scope.row.clerkCode || '--' }}）</span>
</el-popover>
</template>
</el-table-column>
<el-table-column label="企微账号" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.wxUserId || '--' }}</template>
</el-table-column>
<el-table-column label="手机号" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.phoneNumber || '--' }}</template>
</el-table-column>
<el-table-column prop="" label="更新时间" show-overflow-tooltip>
<template slot-scope="scope">
<div class="line-h-18">{{ scope.row.updateTime | timeStampToYmd }} {{ !scope.row.updateTime ? '--' : '' }}</div>
<div class="line-h-18">{{ scope.row.updateTime | timeStampToHms }} {{ !scope.row.updateTime ? '--' : '' }}</div>
</template>
</el-table-column>
<el-table-column label="操作人" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.optStaffName || '--' }}</template>
</el-table-column>
<el-table-column prop="" label="原因" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.channelCode == 1001" type="text">后台管理员绑定</span>
<span v-if="scope.row.channelCode == 1002" type="text">好办客户端绑定</span>
<span v-if="scope.row.channelCode == 1003" type="text">审核绑定</span>
<span v-if="scope.row.channelCode == 1004" type="text">GIC 同步绑定</span>
<span v-if="scope.row.channelCode == 1005" type="text">企业同步绑定</span>
<span v-if="scope.row.channelCode == 2001" type="text">后台管理员解绑</span>
<span v-if="scope.row.channelCode == 2002" type="text">好办客户端解绑</span>
<span v-if="scope.row.channelCode == 2003" type="text">GIC 同步解绑</span>
<span v-if="scope.row.channelCode == 2004" type="text">企业同步解绑</span>
<span v-if="scope.row.channelCode == 2005" type="text">授权范围变更解绑</span>
</template>
</el-table-column>
</el-table>
<div class="block common-wrap__page text-right m-t-24" v-if="tableBindData.length != 0">
<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>
</el-tab-pane>
<el-tab-pane label="通讯录刷新日志" name="second">
<div class="flex flex-space-between">
<common-alert-tip :width="'284px'" :tip-content="'仅保存近一年的日志'"></common-alert-tip>
</div>
<div class="m-t-20">
<el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }">
<el-table-column label="提交人" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.optName || '--' }}</template>
</el-table-column>
<el-table-column prop="" label="同步时间" show-overflow-tooltip>
<template slot-scope="scope">
<div class="line-18">{{ scope.row.createTime | timeStampToYmd }}{{ !scope.row.createTime ? '--': '' }}</div>
<div class="line-18">{{ scope.row.createTime | timeStampToHms }}{{ !scope.row.createTime ? '--': '' }}</div>
</template>
</el-table-column>
<el-table-column prop="" label="完成时间" show-overflow-tooltip>
<template slot-scope="scope">
<div class="line-18">{{ scope.row.updateTime | timeStampToYmd }}{{ !scope.row.updateTime ? '--': '' }}</div>
<div class="line-18">{{ scope.row.updateTime | timeStampToHms }}{{ !scope.row.updateTime ? '--': '' }}</div>
</template>
</el-table-column>
<el-table-column prop="" label="同步内容" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.taskDesc | '--' }}</template>
</el-table-column>
<el-table-column prop="" label="状态" show-overflow-tooltip>
<template slot-scope="scope">
<span :class="['span-dot', scope.row.statusFlag == 4 ? 'bg-33af4a ' : 'bg-f5222d']"></span><span v-if="scope.row.statusFlag == 4" class="font-14 color-606266">{{ scope.row.statusFlag == 4 ? '成功' : '' }}</span>
<span v-if="scope.row.statusFlag == 0" class="font-14 color-606266">初始化</span>
<span v-if="scope.row.statusFlag == 1 || scope.row.statusFlag == 2 || scope.row.statusFlag == 3" class="font-14 color-606266">分组/门店/成员同步中</span>
<el-popover v-if="scope.row.statusFlag == 5 || scope.row.statusFlag == 6" trigger="hover" class="item" :content="scope.row.statusFlag == 5?'完成有错误':'有错误关闭'" placement="top">
<span slot="reference" class="common-bottom-border">失败</span>
</el-popover>
</template>
</el-table-column>
<!-- <el-table-column prop="" label="操作" show-overflow-tooltip>
<template slot-scope="scope">
<el-button v-if="scope.row.statusFlag == 5 || scope.row.statusFlag == 6" type="text" @click="toShowLog(scope.$index, scope.row)">查看失败日志</el-button>
</template>
</el-table-column> -->
</el-table>
<div class="block common-wrap__page text-right m-t-24" v-if="tableData.length != 0">
<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 v-loading="loading">
<div class="flex flex-space-between">
<common-alert-tip :width="'284px'" :tip-content="'仅保存近一年的日志'"></common-alert-tip>
</div>
<div class="m-t-20">
<el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }">
<el-table-column label="提交人" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.optName || '--' }}</template>
</el-table-column>
<el-table-column prop="" label="同步时间" show-overflow-tooltip>
<template slot-scope="scope">
<div class="line-18">{{ scope.row.createTime | timeStampToYmd }}{{ !scope.row.createTime ? '--': '' }}</div>
<div class="line-18">{{ scope.row.createTime | timeStampToHms }}{{ !scope.row.createTime ? '--': '' }}</div>
</template>
</el-table-column>
<el-table-column prop="" label="完成时间" show-overflow-tooltip>
<template slot-scope="scope">
<div class="line-18">{{ scope.row.updateTime | timeStampToYmd }}{{ !scope.row.updateTime ? '--': '' }}</div>
<div class="line-18">{{ scope.row.updateTime | timeStampToHms }}{{ !scope.row.updateTime ? '--': '' }}</div>
</template>
</el-table-column>
<el-table-column prop="" label="同步内容" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.taskDesc | '--' }}</template>
</el-table-column>
<el-table-column prop="" label="状态" show-overflow-tooltip>
<template slot-scope="scope">
<span :class="['span-dot', scope.row.statusFlag == 4 ? 'bg-33af4a ' : 'bg-f5222d']"></span><span v-if="scope.row.statusFlag == 4" class="font-14 color-606266">{{ scope.row.statusFlag == 4 ? '成功' : '' }}</span>
<span v-if="scope.row.statusFlag == 0" class="font-14 color-606266">初始化</span>
<span v-if="scope.row.statusFlag == 1 || scope.row.statusFlag == 2 || scope.row.statusFlag == 3" class="font-14 color-606266">分组/门店/成员同步中</span>
<el-popover v-if="scope.row.statusFlag == 5 || scope.row.statusFlag == 6" trigger="hover" class="item" :content="scope.row.statusFlag == 5?'完成有错误':'有错误关闭'" placement="top">
<span slot="reference" class="common-bottom-border">失败</span>
</el-popover>
</template>
</el-table-column>
<!-- <el-table-column prop="" label="操作" show-overflow-tooltip>
<template slot-scope="scope">
<el-button v-if="scope.row.statusFlag == 5 || scope.row.statusFlag == 6" type="text" @click="toShowLog(scope.$index, scope.row)">查看失败日志</el-button>
</template>
</el-table-column> -->
</el-table>
<div class="block common-wrap__page text-right m-t-24" v-if="tableData.length != 0">
<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>
</el-tab-pane>
......@@ -187,7 +191,9 @@ export default {
// 解绑日志
optType: '',
enterpriseId: '',
brandOptions: []
brandOptions: [],
loading: false,
loadingBind: false
};
},
mounted() {
......@@ -320,6 +326,7 @@ export default {
*/
getBindList() {
const that = this;
that.loading = true;
let para = {
search: that.searchInput || '', // 搜索字段
enterpriseId: that.enterpriseId,
......@@ -330,11 +337,12 @@ export default {
};
getBindLog(para)
.then(res => {
that.loadingBind = false;
that.tableBindData = res.result.result || [];
that.total = res.result.totalCount;
})
.catch(function(error) {
that.loadingBind = false;
});
},
/**
......@@ -343,6 +351,7 @@ export default {
*/
getTableList() {
const that = this;
that.loading = true;
let para = {
enterpriseId: that.enterpriseId,
wxEnterpriseId: that.wxEnterpriseId,
......@@ -351,11 +360,12 @@ export default {
};
getRefreshLog(para)
.then(res => {
that.loading = false;
that.tableData = res.result.result || [];
that.total = res.result.totalCount;
})
.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