From bed3eee53f72f47f49b493772a4525e6c6b3e7be Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 31 七月 2024 09:05:37 +0800
Subject: [PATCH] 修复bug
---
admin/src/views/business/internalMember.vue | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index e776e64..aeed504 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -39,15 +39,16 @@
<template v-slot:menu>
<div style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">浼佷笟缁勭粐鏋舵瀯</div>
<div style="width: 100%; height: calc(100vh - 170px); overflow-y: scroll;">
- <Tree :list="companyTree" :defaultProps="{name: 'name', status: 'status', children: 'childList', id: 'id',erpId:'erpId'}" @callback="callback" />
+ <Tree :list="companyTree" :defaultProps="{name: 'name', status: 'fsStatus', children: 'childList', id: 'id'}" @callback="callback" />
</div>
</template>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:member:delete','business:member:sync']">
+ <ul class="toolbar" v-permissions="['business:member:delete','business:member:sync','business:member:syncdata']">
<!-- <li><el-button type="primary">闂ㄧ鎺堟潈</el-button></li>-->
- <li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading" @click="synchronous()">鍚屾</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">鍒犻櫎</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:member:syncdata']" :loading="loading" @click="syncUserData()">绔嬪嵆涓嬪彂寰呭悓姝ュ憳宸�</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading" @click="synchronous()">鍚屾</el-button></li>
+ <!-- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">鍒犻櫎</el-button></li>-->
</ul>
<el-table
v-loading="isWorking.search"
@@ -108,7 +109,7 @@
</template>
</el-table-column>
<el-table-column
- v-if="containPermissions(['business:member:update', 'business:member:delete'])"
+ v-if="containPermissions(['business:member:update', 'business:member:delete','business:empower:create'])"
label="鎿嶄綔"
min-width="120"
fixed="right"
@@ -137,7 +138,7 @@
import cardOpeningRecord from '@/components/business/cardOpeningRecord'
import Tree from '@/components/common/Tree'
import { fetchList } from '@/api/business/company'
-import { memberSync, roleAuth } from '@/api/business/member'
+import { memberSync, roleAuth, syncUserData } from '@/api/business/member'
export default {
name: 'internalMember',
extends: BaseTable,
@@ -191,15 +192,17 @@
getfindCompanyTreePage () {
fetchList(1)
.then(res => {
- res[0].fsStatus = 1
- this.companyTree = res
- // this.searchForm.erpOrgId = res[0].erpId
- this.search()
+ if (res && res.length > 0) {
+ res[0].fsStatus = 1
+ this.companyTree = res
+ // this.searchForm.erpOrgId = res[0].erpId
+ this.search()
+ }
})
},
// 鍚屾淇℃伅
async synchronous () {
- this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�')
+ this.$dialog.actionConfirm('璇ユ搷浣滈檷瑙﹀彂鍏ㄥ憳淇℃伅鏇存柊鍜岄噸鏂颁笅鍙戯紒璇疯皑鎱庢搷浣�', '鎮ㄧ‘璁ゅ叏閲忓悓姝ュ唴閮ㄤ汉鍛樹俊鎭悧锛�')
.then(() => {
this.loading = true
memberSync({})
@@ -216,6 +219,24 @@
})
.catch(() => {})
},
+ async syncUserData () {
+ this.$dialog.actionConfirm('璇ユ搷浣滃皢瑙﹀彂涓嬪彂鐨勪汉鍛樹俊鎭洿鏂板拰閲嶆柊涓嬪彂锛佽璋ㄦ厧鎿嶄綔', '鎮ㄧ‘璁ょ珛鍗充笅鍙戝叏閮ㄥ緟鍚屾浜哄憳淇℃伅鍚楋紵')
+ .then(() => {
+ this.loading = true
+ syncUserData({})
+ .then(res => {
+ this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
+ this.search()
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.loading = false
+ })
+ })
+ .catch(() => {})
+ },
callback (row) {
this.searchForm.erpOrgId = row.erpId
this.searchForm.companyId = row.id
--
Gitblit v1.9.3