From fd3453d1d6cd98be518edf793d9db50c06c726b1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 05 一月 2024 08:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/internalCompany.vue | 105 +++++++++++++++++++++++++++++-----------------------
1 files changed, 58 insertions(+), 47 deletions(-)
diff --git a/admin/src/views/business/internalCompany.vue b/admin/src/views/business/internalCompany.vue
index 2cba996..e486966 100644
--- a/admin/src/views/business/internalCompany.vue
+++ b/admin/src/views/business/internalCompany.vue
@@ -1,75 +1,71 @@
<template>
- <TableLayout :permissions="['business:company:query']">
+ <TableLayout>
+<!-- :permissions="['business:company:query']"-->
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="缁勭粐鍚嶇О" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎵�灞炰笂绾х粍缁�" prop="parentName">
- <el-input v-model="searchForm.parentName" placeholder="璇疯緭鍏ユ墍灞炰笂绾х粍缁�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
+<!-- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>-->
+<!-- <el-form-item label="缁勭粐鍚嶇О" prop="name">-->
+<!-- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鎵�灞炰笂绾х粍缁�" prop="parentName">-->
+<!-- <el-input v-model="searchForm.parentName" placeholder="璇疯緭鍏ユ墍灞炰笂绾х粍缁�" @keypress.enter.native="search"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <section>-->
+<!-- <el-button type="primary" @click="search">鎼滅储</el-button>-->
+<!-- <el-button @click="reset">閲嶇疆</el-button>-->
+<!-- </section>-->
+<!-- </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>
+<!-- <li><el-button type="primary" v-permissions="['business:company:create']" @click="synchronous()">鍚屾</el-button></li>-->
+ <li><el-button type="primary" v-permissions="['business:company:create']" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓浼佷笟')">鏂板缓</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
- :data="tableData.list"
+ :data="list"
stripe
+ :tree-props="{children: 'childList'}"
+ row-key="id"
@selection-change="handleSelectionChange"
>
- <el-table-column type="selection" width="55"></el-table-column>
+<!-- <el-table-column type="selection" width="55"></el-table-column>-->
<el-table-column prop="name" label="缁勭粐鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="parentName" label="涓婄骇缁勭粐" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="鏈�鍚庢洿鏂版椂闂�" min-width="100px"></el-table-column>
-<!-- <el-table-column-->
-<!-- v-if="containPermissions(['business:company:update', 'business:company:delete'])"-->
-<!-- label="鎿嶄綔"-->
-<!-- min-width="80"-->
-<!-- fixed="right"-->
-<!-- >-->
-<!-- <template slot-scope="{row}">-->
-<!-- <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('缂栬緫浼佷笟淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:company:update']">缂栬緫</el-button>-->
-<!-- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:company:delete']">鍒犻櫎</el-button>-->
-<!-- </template>-->
-<!-- </el-table-column>-->
+ <el-table-column
+ label="鎿嶄綔"
+ width="230"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('缂栬緫浼佷笟淇℃伅', row)" icon="el-icon-edit" v-permissions="['business:company:update']">缂栬緫</el-button>
+ <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓瀛愮骇', { disable: true, parentId: row.id })" icon="el-icon-plus">鏂板缓瀛愮骇</el-button>
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:company:delete']">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
</template>
<!-- 鏂板缓/淇敼 -->
-<!-- <OperaInternalCompanyWindow ref="OperaInternalCompanyWindow" @success="handlePageChange"/>-->
+ <OperaInternalCompanyWindow ref="OperaInternalCompanyWindow" :list="list" @success="handlePageChange"/>
</TableLayout>
</template>
<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
-import Pagination from '@/components/common/Pagination'
-import { companySync } from '@/api/business/company'
-// import OperaInternalCompanyWindow from '@/components/business/OperaInternalCompanyWindow'
+// import { companySync } from '@/api/business/company'
+import OperaInternalCompanyWindow from '@/components/business/OperaInternalCompanyWindow'
export default {
name: 'internalCompany',
extends: BaseTable,
- components: { TableLayout, Pagination },
+ components: { TableLayout, OperaInternalCompanyWindow },
data () {
return {
// 鎼滅储
searchForm: {
- name: '',
- parentName: '',
type: 1
- }
+ },
+ list: [],
+ total: 0
}
},
created () {
@@ -82,12 +78,27 @@
this.search()
},
methods: {
- // 鍚屾淇℃伅
- async synchronous () {
- const message = await companySync({})
- this.$message.success(message)
- this.search()
+ // 椤电爜鍙樻洿澶勭悊
+ handlePageChange (pageIndex) {
+ this.__checkApi()
+ this.isWorking.search = true
+ this.api.fetchList(this.searchForm.type)
+ .then(data => {
+ this.list = data
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.isWorking.search = false
+ })
}
+ // 鍚屾淇℃伅
+ // async synchronous () {
+ // const message = await companySync({})
+ // this.$message.success(message)
+ // this.search()
+ // }
}
}
</script>
--
Gitblit v1.9.3