From 8b00bff78ba86989df613fcc7b09e7f64e135a52 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 29 二月 2024 11:43:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/internalCompany.vue | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/business/internalCompany.vue b/admin/src/views/business/internalCompany.vue
index e486966..bd93eb6 100644
--- a/admin/src/views/business/internalCompany.vue
+++ b/admin/src/views/business/internalCompany.vue
@@ -16,9 +16,9 @@
<!-- </el-form>-->
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:company:create', 'business:company:delete']">
-<!-- <li><el-button type="primary" v-permissions="['business:company:create']" @click="synchronous()">鍚屾</el-button></li>-->
+ <ul class="toolbar" v-permissions="['business:company:create', 'business:company:sync']">
<li><el-button type="primary" v-permissions="['business:company:create']" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓浼佷笟')">鏂板缓</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:company:sync']" :loading="loading" @click="synchronous()">鍚屾</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -26,6 +26,7 @@
stripe
:tree-props="{children: 'childList'}"
row-key="id"
+ :expand-row-keys="[list && list.length > 0 ? list[0].id.toString() : '']"
@selection-change="handleSelectionChange"
>
<!-- <el-table-column type="selection" width="55"></el-table-column>-->
@@ -52,8 +53,9 @@
<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
-// import { companySync } from '@/api/business/company'
+import { companySync } from '@/api/business/company'
import OperaInternalCompanyWindow from '@/components/business/OperaInternalCompanyWindow'
+import { memberSync } from '@/api/business/member'
export default {
name: 'internalCompany',
extends: BaseTable,
@@ -61,6 +63,7 @@
data () {
return {
// 鎼滅储
+ loading:false,
searchForm: {
type: 1
},
@@ -92,13 +95,26 @@
.finally(() => {
this.isWorking.search = false
})
- }
+ },
// 鍚屾淇℃伅
- // async synchronous () {
- // const message = await companySync({})
- // this.$message.success(message)
- // this.search()
- // }
+ async synchronous () {
+ this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�')
+ .then(() => {
+ this.loading = true
+ companySync({})
+ .then(res => {
+ this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
+ this.search()
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.loading = false
+ })
+ })
+ .catch(() => {})
+ }
}
}
</script>
--
Gitblit v1.9.3