From dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 十月 2025 15:56:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/business/internalMember.vue | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index 223a82d..76d61e7 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -66,6 +66,8 @@
<ul class="toolbar" v-permissions="['business:member:delete', 'business:member:create,business:empower:create']">
<li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading"
@click="synchronous()">鍚屾</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:member:create']" :loading="loading"
+ @click="synchronousDingding()">鍚屾閽夐拤</el-button></li>
<li><el-button type="primary"
@click="add" icon="el-icon-plus"
v-permissions="['business:member:create']">鏂板缓鍛樺伐</el-button></li>
@@ -105,14 +107,14 @@
</el-table-column>
<el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
<el-table-column prop="positionName" label="宀椾綅" min-width="100px"></el-table-column>
- <!-- <el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
+ <!--<el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.isDangyuan ==1" style="color: green">鍏氬憳</span>
<span v-if="row.isDangyuan ==0">闈炲厷鍛�</span>
</template>
</el-table-column>-->
<el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px"></el-table-column>
- <!-- <el-table-column prop="status" label="鐘舵��" min-width="100px">
+ <!--<el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.status == 0" style="color: green">姝ｅ父</span>
<span v-if="row.status == 1" style="color: red">绂佺敤</span>
@@ -183,8 +185,7 @@
v-if="containPermissions(['business:member:update', 'business:member:delete', 'business:empower:create'])"
label="鎿嶄綔" min-width="280">
<template slot-scope="{row}">
- <el-button type="text" icon="el-icon-edit" @click="edit(row)"
- v-permissions="['business:member:update']">缂栬緫</el-button>
+ <el-button type="text" icon="el-icon-edit" @click="edit(row)" v-permissions="['business:member:update']">缂栬緫</el-button>
<el-button type="text" icon="el-icon-plus" @click="empower(row.id)"
v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
<el-button type="text" :loading="heading" style="color: red" icon="el-icon-delete"
@@ -219,7 +220,7 @@
import OperaMemberImportWindow from '@/components/business/OperaMemberImportWindow'
import { fetchList } from '@/api/business/company'
import { allList } from '@/api/business/position'
-import { memberSync, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
+import { memberSync,memberSyncDingding, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
export default {
name: 'internalMember',
extends: BaseTable,
@@ -369,6 +370,25 @@
})
.catch(() => { })
},
+ // 鍚屾淇℃伅
+ async synchronousDingding() {
+ this.$dialog.actionConfirm('璇ユ搷浣滈檷瑙﹀彂鍏ㄥ憳淇℃伅鏇存柊鍜岄噸鏂颁笅鍙戯紒璇疯皑鎱庢搷浣�', '鎮ㄧ‘璁ゅ叏閲忓悓姝ュ唴閮ㄤ汉鍛樹俊鎭悧锛�')
+ .then(() => {
+ this.loading = true
+ memberSyncDingding({})
+ .then(res => {
+ this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
+ this.search()
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.loading = false
+ })
+ })
+ .catch(() => { })
+ },
async updateHead(row, type) {
this.$dialog.actionConfirm('鎮ㄧ‘璁よ繘琛屽綋鍓嶆搷浣滃悧锛�', '閮ㄩ棬涓荤璁剧疆鎿嶄綔鎻愮ず')
.then(() => {
--
Gitblit v1.9.3