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/internalMember.vue | 60 +++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 15 deletions(-)
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index 7d48090..fb45d0e 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -24,6 +24,13 @@
<el-option label="鎷夐粦/鍐荤粨" value="2"></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="" prop="hkStatus">
+ <el-select v-model="searchForm.hkStatus" @keypress.enter.native="search" placeholder="娴峰悍鍚屾鐘舵��">
+ <el-option label="寰呭悓姝�" value="0"></el-option>
+ <el-option label="鍚屾鎴愬姛" value="1"></el-option>
+ <el-option label="鍚屾澶辫触" value="2"></el-option>
+ </el-select>
+ </el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -37,9 +44,9 @@
</template>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:member:delete']">
+ <ul class="toolbar" v-permissions="['business:member:delete','business:member:sync']">
<li><el-button type="primary">闂ㄧ鎺堟潈</el-button></li>
- <li><el-button type="primary" v-permissions="['business:member:sync']" @click="synchronous()">鍚屾</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
@@ -53,22 +60,30 @@
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
<el-table-column label="鎬у埆" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.sex === 1">鐢�</span>
- <span v-if="row.sex === 2">濂�</span>
+ <span v-if="row.sex == 1">鐢�</span>
+ <span v-if="row.sex == 2">濂�</span>
</template>
</el-table-column>
+ <el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
<el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.status === 0">姝ｅ父</span>
- <span v-if="row.status === 1">绂佺敤</span>
- <span v-if="row.status === 2">鎷夐粦/鍐荤粨</span>
+ <span v-if="row.status == 0" style="color: green">姝ｅ父</span>
+ <span v-if="row.status == 1" style="color: red">绂佺敤</span>
+ <span v-if="row.status == 2" style="color: red">鎷夐粦/鍐荤粨</span>
</template>
</el-table-column>
<el-table-column prop="code" label="宸ュ彿" min-width="100px"></el-table-column>
<el-table-column label="鍙嫓璁�" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.canVisit === '0'">鍚�</span>
- <span v-if="row.canVisit === '1'">鏄�</span>
+ <span v-if="row.canVisit != 1">鍚�</span>
+ <span v-if="row.canVisit == 1">鏄�</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="娴峰悍鍚屾鐘舵��" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.hkStatus == 0" style="color: #435EBE">寰呭悓姝�</span>
+ <span v-if="row.hkStatus == 1" style="color: green">鍚屾鎴愬姛</span>
+ <span v-if="row.hkStatus == 2" style="color: red">鍚屾澶辫触</span>
</template>
</el-table-column>
<el-table-column label="闂ㄧ瑙掕壊" min-width="100px">
@@ -121,8 +136,8 @@
import TableLayout1 from '@/layouts/TableLayout1'
import Pagination from '@/components/common/Pagination'
import Tree from '@/components/common/Tree'
-import { fetchList} from '@/api/business/company'
-import {memberSync} from "@/api/business/member";
+import { fetchList } from '@/api/business/company'
+import { memberSync } from '@/api/business/member'
export default {
name: 'internalMember',
extends: BaseTable,
@@ -134,6 +149,7 @@
searchForm: {
name: '',
status: '',
+ hkStatus: '',
canVisit: '',
keyword: '',
type: 2,
@@ -141,6 +157,7 @@
companyId: '',
hasFace: ''
},
+ loading:false,
companyTree: []
}
},
@@ -166,10 +183,23 @@
},
// 鍚屾淇℃伅
async synchronous () {
- const message = await memberSync({})
- this.$message.success(message)
- this.search()
- } ,
+ this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�')
+ .then(() => {
+ this.loading = true
+ memberSync({})
+ .then(res => {
+ this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
+ this.search()
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.loading = false
+ })
+ })
+ .catch(() => {})
+ },
callback (row) {
console.log(row)
this.searchForm.erpOrgId = row.erpId
--
Gitblit v1.9.3