From d9a89d83c2048a964f16ca179feb2b7f21b9d33a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 29 七月 2024 16:28:47 +0800
Subject: [PATCH] 提交
---
admin/src/views/business/shopTree.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/business/shopTree.vue b/admin/src/views/business/shopTree.vue
index 7bd0426..e3828f5 100644
--- a/admin/src/views/business/shopTree.vue
+++ b/admin/src/views/business/shopTree.vue
@@ -3,8 +3,9 @@
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:shop:create', 'business:shop:sync','business:shop:sort']">
<li><el-button type="primary" @click="$refs.OperaShopImportWindow.open('鍒濆鍖栧鍏�')" icon="el-icon-plus" v-permissions="['business:shop:create']">鍒濆鍖栧鍏�</el-button></li>
- <li><el-button type="primary" @click="$refs.OperaFcodeImportWindow.open('Fcode淇℃伅瀵煎叆')" icon="el-icon-plus" v-permissions="['business:shop:create']">Fcode淇℃伅瀵煎叆</el-button></li>
<li><el-button @click="resetRelations" type="primary" :loading="sorting" icon="el-icon-edit" v-permissions="['business:shop:update']">閲嶇疆涓婁笅绾у叧绯�</el-button></li>
+ <li><el-button type="primary" @click="$refs.OperaFcodeImportWindow.open('Fcode淇℃伅瀵煎叆')" icon="el-icon-plus" v-permissions="['business:shop:create']">Fcode淇℃伅瀵煎叆</el-button></li>
+ <li><el-button type="primary" @click="$refs.OperaCategoryImportWindow.open('鍝佺被鍒濆鍖栧鍏�')" icon="el-icon-plus" v-permissions="['business:shop:create']">鍝佺被鍒濆鍖栧鍏�</el-button></li>
<li><el-button @click="sort('top')" :loading="sorting" icon="el-icon-sort-up" v-permissions="['business:shop:sort']">涓婄Щ</el-button></li>
<li><el-button @click="sort('bottom')" :loading="sorting" icon="el-icon-sort-down" v-permissions="['business:shop:sort']">涓嬬Щ</el-button></li>
</ul>
@@ -24,7 +25,8 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="name" label="缁勭粐鍚嶇О" min-width="300px"></el-table-column>
+ <el-table-column prop="name" label="缁勭粐鍚嶇О" fixed min-width="300px"></el-table-column>
+ <el-table-column prop="code" label="缁勭粐缂栫爜" min-width="120px"></el-table-column>
<el-table-column prop="type" label="涓�绾х被鍨�" min-width="100px">
<template scope="{row}">
<span v-if="row.type == 1">HR</span>
@@ -54,12 +56,12 @@
<template scope="{row}">
<span v-if="row.status == 0" style="color: red">鍋滅敤</span>
<span v-if="row.status == 1" style="color: green">姝ｅ父</span>
- <span v-if="row.status == 2" style="color: grey">宸插垹闄�</span>
+ <span v-if="row.status == -1" style="color: grey">宸插垹闄�</span>
</template>
</el-table-column>
-<!--
+
<el-table-column prop="namePath" label="缁勭粐璺緞" min-width="200px"></el-table-column>
--->
+
<!--
<el-table-column prop="syncDate" label="鏈�鍚庡悓姝ユ椂闂�" min-width="120px"></el-table-column>
-->
@@ -81,6 +83,7 @@
<OperaShopWindow ref="OperaShopWindow" :list="list" @success="handlePageChange"/>
<OperaShopImportWindow ref="OperaShopImportWindow" @success="handlePageChange"/>
<OperaFcodeImportWindow ref="OperaFcodeImportWindow" @success="handlePageChange"/>
+ <OperaCategoryImportWindow ref="OperaCategoryImportWindow" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -90,11 +93,12 @@
import { companySync, sort, resetRelations } from '@/api/business/shop'
import OperaShopImportWindow from '@/components/business/OperaShopImportWindow'
import OperaFcodeImportWindow from '@/components/business/OperaFcodeImportWindow'
+import OperaCategoryImportWindow from '@/components/business/OperaCategoryImportWindow'
import OperaShopWindow from '@/components/business/OperaShopWindow'
export default {
name: 'shopTree',
extends: BaseTable,
- components: { TableLayout, OperaShopImportWindow, OperaShopWindow, OperaFcodeImportWindow },
+ components: { TableLayout, OperaShopImportWindow, OperaShopWindow, OperaFcodeImportWindow,OperaCategoryImportWindow },
data () {
return {
// 鎼滅储
--
Gitblit v1.9.3