From 4d78c837e336bca9d56e9fc10b268b11b68229f8 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 26 二月 2024 11:33:05 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/business/device.vue | 31 ++++++++-------
admin/src/views/business/internalCompany.vue | 20 ++++++++-
admin/src/api/business/parks.js | 5 ++
admin/src/plugins/messagebox.js | 7 +++
admin/src/views/business/deviceRole_f.vue | 2
admin/src/views/business/internalMember.vue | 26 ++++++++++---
admin/src/views/business/parks.vue | 22 ++++++++++-
7 files changed, 86 insertions(+), 27 deletions(-)
diff --git a/admin/src/api/business/parks.js b/admin/src/api/business/parks.js
index 57f053b..8d5cbe4 100644
--- a/admin/src/api/business/parks.js
+++ b/admin/src/api/business/parks.js
@@ -13,3 +13,8 @@
trim: true
})
}
+
+export function syncParks (data) {
+ return request.post('/business/hksync/syncParks', data)
+}
+
diff --git a/admin/src/plugins/messagebox.js b/admin/src/plugins/messagebox.js
index 5d3d2ec..2a22af4 100644
--- a/admin/src/plugins/messagebox.js
+++ b/admin/src/plugins/messagebox.js
@@ -3,6 +3,13 @@
export default {
...MessageBox,
// 鍒犻櫎浜屾纭
+ actionConfirm (title,message) {
+ return MessageBox.confirm(message, title, {
+ confirmButtonText: '纭',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ })
+ },
deleteConfirm (message) {
return MessageBox.confirm(message, '鍒犻櫎鎻愰啋', {
confirmButtonText: '纭鍒犻櫎',
diff --git a/admin/src/views/business/device.vue b/admin/src/views/business/device.vue
index 38dc143..585e035 100644
--- a/admin/src/views/business/device.vue
+++ b/admin/src/views/business/device.vue
@@ -66,6 +66,7 @@
import Pagination from '@/components/common/Pagination'
import OperaDeviceWindow from '@/components/business/OperaDeviceWindow'
import { syncDevices } from '@/api/business/device'
+import { memberSync } from '@/api/business/member'
export default {
name: 'Device',
extends: BaseTable,
@@ -91,22 +92,22 @@
},
methods: {
synchronousData () {
- this.$confirm('纭鍚屾鍚�?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- syncDevices({})
- .then(res => {
- this.$message({
- type: 'success',
- message: '鍚屾鎴愬姛'
+ this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�')
+ .then(() => {
+ this.isWorking.delete = true
+ syncDevices({})
+ .then(res => {
+ this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
+ this.search()
})
- this.search()
- })
- }).catch(() => {
-
- })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.isWorking.delete = false
+ })
+ })
+ .catch(() => {})
}
}
}
diff --git a/admin/src/views/business/deviceRole_f.vue b/admin/src/views/business/deviceRole_f.vue
index 302cd6d..7b4273f 100644
--- a/admin/src/views/business/deviceRole_f.vue
+++ b/admin/src/views/business/deviceRole_f.vue
@@ -13,7 +13,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar">
- <li><el-button type="primary" @click="synchronousData">鍚屾</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:hksync:privilege']" @click="synchronousData">鍚屾</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
diff --git a/admin/src/views/business/internalCompany.vue b/admin/src/views/business/internalCompany.vue
index 88e7008..f4dc54c 100644
--- a/admin/src/views/business/internalCompany.vue
+++ b/admin/src/views/business/internalCompany.vue
@@ -54,6 +54,7 @@
import TableLayout from '@/layouts/TableLayout'
import { companySync } from '@/api/business/company'
import OperaInternalCompanyWindow from '@/components/business/OperaInternalCompanyWindow'
+import { memberSync } from '@/api/business/member'
export default {
name: 'internalCompany',
extends: BaseTable,
@@ -95,9 +96,22 @@
},
// 鍚屾淇℃伅
async synchronous () {
- const message = await companySync({})
- this.$message.success(message)
- this.search()
+ this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�')
+ .then(() => {
+ this.isWorking.delete = true
+ companySync({})
+ .then(res => {
+ this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
+ this.search()
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.isWorking.delete = false
+ })
+ })
+ .catch(() => {})
}
}
}
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index 7d48090..73143de 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -57,6 +57,7 @@
<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>
@@ -121,8 +122,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,
@@ -166,10 +167,23 @@
},
// 鍚屾淇℃伅
async synchronous () {
- const message = await memberSync({})
- this.$message.success(message)
- this.search()
- } ,
+ this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�')
+ .then(() => {
+ this.isWorking.delete = true
+ memberSync({})
+ .then(res => {
+ this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
+ this.search()
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.isWorking.delete = false
+ })
+ })
+ .catch(() => {})
+ },
callback (row) {
console.log(row)
this.searchForm.erpOrgId = row.erpId
diff --git a/admin/src/views/business/parks.vue b/admin/src/views/business/parks.vue
index f0beb14..04aff12 100644
--- a/admin/src/views/business/parks.vue
+++ b/admin/src/views/business/parks.vue
@@ -23,7 +23,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar">
- <li><el-button type="primary">鍚屾</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:hksync:park']" @click="syncParks()">鍚屾</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -49,7 +49,7 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import { findList } from '@/api/business/parks'
+import {findList, syncParks} from '@/api/business/parks'
export default {
name: 'Parks',
extends: BaseTable,
@@ -75,6 +75,24 @@
this.getfindList()
},
methods: {
+ syncParks(){
+ this.$dialog.actionConfirm("鎿嶄綔纭鎻愰啋","鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�")
+ .then(() => {
+ this.isWorking.delete = true
+ this.api.syncParks({})
+ .then(res => {
+ this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
+ this.__afterDelete()
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.isWorking.delete = false
+ })
+ })
+ .catch(() => {})
+ },
getfindList () {
findList({})
.then(res => {
--
Gitblit v1.9.3