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/internalCompany.vue | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/business/internalCompany.vue b/admin/src/views/business/internalCompany.vue
index 0947c2b..4e8edc9 100644
--- a/admin/src/views/business/internalCompany.vue
+++ b/admin/src/views/business/internalCompany.vue
@@ -18,13 +18,15 @@
<template v-slot:table-wrap>
<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('鏂板缓浼佷笟', null, null)">鏂板缓</el-button></li>
+ @click="$refs.OperaInternalCompanyWindow.open('鏂板缓缁勭粐', null, null)">鏂板缓</el-button></li>
<li><el-button @click="sort('top')" :loading="sorting" icon="el-icon-sort-up"
v-permissions="['business:company:sort']">涓婄Щ</el-button></li>
<li><el-button @click="sort('bottom')" :loading="sorting" icon="el-icon-sort-down"
v-permissions="['business:company:sort']">涓嬬Щ</el-button></li>
<li><el-button type="primary" v-permissions="['business:company:sync']" :loading="loading"
@click="synchronous()">鍚屾</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:company:create']" :loading="loading"
+ @click="synchronousDingding()">鍚屾閽夐拤</el-button></li>
</ul>
<el-table :max-height="tableHeight" v-loading="isWorking.search" :data="list" stripe
:tree-props="{ children: 'childList', hasChildren: 'hasChildren' }" row-key="id"
@@ -38,17 +40,18 @@
</template>
</el-table-column>
<el-table-column prop="companyNamePath" label="缁勭粐璺緞" min-width="100px"></el-table-column>
+ <el-table-column prop="sortnum" align="center" label="鎺掑簭鐮�" min-width="80px"></el-table-column>
<el-table-column prop="editorName" label="鎿嶄綔浜�" width="100px"></el-table-column>
<el-table-column prop="editDate" label="鏈�鍚庢洿鏂版椂闂�" min-width="100px"></el-table-column>
<el-table-column label="鎿嶄綔" width="230" fixed="right">
<template slot-scope="{row}">
<el-button type="text"
- @click="$refs.OperaInternalCompanyWindow.open('缂栬緫浼佷笟淇℃伅', { id: row.parentId, name: row.parentName, type: row.parentType, companyPath: row.parentCompanyPath }, row)"
- icon="el-icon-edit" v-permissions="['business:company:update']">缂栬緫</el-button>
- <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓瀛愮骇', row, null)"
+ @click="$refs.OperaInternalCompanyWindow.open('缂栬緫浼佷笟淇℃伅', { id: row.parentId, name: row.parentName, type: row.parentType, companyPath: row.parentCompanyPath }, row, 'edit')"
+ icon="el-icon-edit" v-permissions="['business:company:update']" v-if="row.type ==0">缂栬緫</el-button>
+ <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓瀛愮骇', row, null, 'add')"
icon="el-icon-plus">鏂板缓瀛愮骇</el-button>
<el-button type="text" @click="deleteById(row)" style="color: red" icon="el-icon-delete"
- v-permissions="['business:company:delete']">鍒犻櫎</el-button>
+ v-permissions="['business:company:delete']" v-if="row.type !== -1">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -61,7 +64,7 @@
<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
-import { companySync, sort } from '@/api/business/company'
+import { companySync,companySyncDingding, sort } from '@/api/business/company'
import OperaInternalCompanyWindow from '@/components/business/OperaInternalCompanyWindow'
export default {
name: 'internalCompany',
@@ -128,6 +131,24 @@
})
.catch(() => { })
},
+ async synchronousDingding() {
+ this.$dialog.actionConfirm('璇ユ搷浣滃皢绯荤粺娓呯┖宸叉湁鍐呴儴缁勭粐淇℃伅锛屾偍纭鍚屾鍏ㄩ儴淇℃伅鍚楋紵', '鎿嶄綔纭鎻愰啋')
+ .then(() => {
+ this.loading = true
+ companySyncDingding({})
+ .then(res => {
+ this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
+ this.search()
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.loading = false
+ })
+ })
+ .catch(() => { })
+ },
// 鎺掑簭
sort(direction) {
if (this.sorting) {
--
Gitblit v1.9.3