From 9c20f268e0628017d09427989724cdf2a8e9e8e2 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 19 九月 2023 12:47:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
platform/src/views/business/baseData.vue | 134 +++++++++++++++++---------------------------
1 files changed, 52 insertions(+), 82 deletions(-)
diff --git a/platform/src/views/business/baseData.vue b/platform/src/views/business/baseData.vue
index 2ca1594..9d9d3e8 100644
--- a/platform/src/views/business/baseData.vue
+++ b/platform/src/views/business/baseData.vue
@@ -23,46 +23,35 @@
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
-<!--
- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:basedata:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
--->
<el-button @click="reset">閲嶇疆</el-button>
</section>
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:basedata:create', 'business:basedata:delete']">
-<!--
- <li><el-button type="primary" @click="$refs.operaBaseDataWindow.open('鏂板缓鍟嗗搧婧愭暟鎹俊鎭〃')" icon="el-icon-plus" v-permissions="['business:basedata:create']">鏂板缓</el-button></li>
--->
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:basedata:delete']">鎵归噺鍒犻櫎</el-button></li>
+ <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
+ v-permissions="['business:basedata:delete']">鎵归噺鍒犻櫎</el-button></li>
</ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
+ <el-table v-loading="isWorking.search" :data="tableData.list" border stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="id" label="涓婚敭" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="name" label="鍟嗗搧涓诲浘" min-width="80px">
<template slot-scope="{row}">
- <a :href="`${row.url}`" target="_blank">
- <div style="display: flex; align-items: center;">
- <div style="width: 70px; height: 70px; flex-shrink: 0;">
- <el-image v-if="row.imgurl" style="width: 70px; height: 70px" :src="row.imgurl"
- :preview-src-list="[row.imgurl]" fit="cover"></el-image>
- </div>
- </div> </a>
+ <div style="display: flex; align-items: center;">
+ <div style="width: 70px; height: 70px; flex-shrink: 0;">
+ <el-image v-if="row.imgurl" style="width: 70px; height: 70px" :src="row.imgurl"
+ :preview-src-list="[row.imgurl]" fit="cover"></el-image>
+ </div>
+ </div>
</template>
</el-table-column>
<el-table-column prop="name" label="鍟嗗搧鍚嶇О" min-width="150px">
<template slot-scope="{row}">
- <a :href="`${row.url}`" target="_blank">{{row.name}}</a>
+ <a :href="`${row.url}`" target="_blank">{{ row.name }}</a>
</template>
</el-table-column>
-<!-- <el-table-column prop="title" label="鏍囬" min-width="100px"></el-table-column>-->
+ <!-- <el-table-column prop="title" label="鏍囬" min-width="100px"></el-table-column>-->
<el-table-column prop="sku" label="浜笢sku" min-width="100px"></el-table-column>
<el-table-column prop="brand" label="鍝佺墝" min-width="120px"></el-table-column>
<el-table-column prop="category" label="绫诲埆" min-width="100px"></el-table-column>
@@ -71,76 +60,43 @@
<el-table-column prop="haveStock" label="搴撳瓨鎯呭喌" min-width="100px"></el-table-column>
<el-table-column prop="bgImgs" label="澶у浘" min-width="80px">
<template slot-scope="{row}">
- <div style="display: flex; align-items: center;">
+ <el-button type="text" @click="showImage(row.bgImgs)">鏌ョ湅澶у浘</el-button>
+ <!-- <div style="display: flex; align-items: center;">
<div style="width: 70px; height: 70px; flex-shrink: 0;">
<el-image v-if="row.bgImgs" style="width: 70px; height: 70px" :src="row.bgImgs"
- :preview-src-list="row.bgImgs" fit="cover"></el-image>
+ :preview-src-list="row.bgImgs" fit="cover"></el-image>
</div>
- </div>
+ </div> -->
</template>
</el-table-column>
-<!-- <el-table-column prop="attr1" label="灞炴��1" min-width="100px"></el-table-column>
- <el-table-column prop="attr2" label="灞炴��2" min-width="100px"></el-table-column>
- <el-table-column prop="attr3" label="灞炴��3" min-width="100px"></el-table-column>
- <el-table-column prop="attr4" label="灞炴��4" min-width="100px"></el-table-column>
- <el-table-column prop="attr5" label="灞炴��5" min-width="100px"></el-table-column>
- <el-table-column prop="attr6" label="灞炴��6" min-width="100px"></el-table-column>
- <el-table-column prop="attr7" label="灞炴��7" min-width="100px"></el-table-column>
- <el-table-column prop="attr8" label="灞炴��8" min-width="100px"></el-table-column>
- <el-table-column prop="attr9" label="灞炴��9" min-width="100px"></el-table-column>
- <el-table-column prop="attr10" label="灞炴��10" min-width="100px"></el-table-column>
- <el-table-column prop="attr11" label="灞炴��11" min-width="100px"></el-table-column>
- <el-table-column prop="attr12" label="灞炴��12" min-width="100px"></el-table-column>
- <el-table-column prop="attr13" label="灞炴��13" min-width="100px"></el-table-column>
- <el-table-column prop="attr14" label="灞炴��14" min-width="100px"></el-table-column>
- <el-table-column prop="attr15" label="灞炴��15" min-width="100px"></el-table-column>
- <el-table-column prop="attr16" label="灞炴��16" min-width="100px"></el-table-column>
- <el-table-column prop="attr17" label="灞炴��17" min-width="100px"></el-table-column>
- <el-table-column prop="attr18" label="灞炴��18" min-width="100px"></el-table-column>
- <el-table-column prop="attr19" label="灞炴��19" min-width="100px"></el-table-column>
- <el-table-column prop="attr20" label="灞炴��20" min-width="100px"></el-table-column>
- <el-table-column prop="attr21" label="灞炴��21" min-width="100px"></el-table-column>
- <el-table-column prop="attr22" label="灞炴��22" min-width="100px"></el-table-column>
- <el-table-column prop="attr23" label="灞炴��23" min-width="100px"></el-table-column>
- <el-table-column prop="attr24" label="灞炴��24" min-width="100px"></el-table-column>
- <el-table-column prop="attr25" label="灞炴��25" min-width="100px"></el-table-column>
- <el-table-column prop="attr26" label="灞炴��26" min-width="100px"></el-table-column>
- <el-table-column prop="attr27" label="灞炴��27" min-width="100px"></el-table-column>
- <el-table-column prop="attr28" label="灞炴��28" min-width="100px"></el-table-column>
- <el-table-column prop="attr29" label="灞炴��29" min-width="100px"></el-table-column>
- <el-table-column prop="attr30" label="灞炴��30" min-width="100px"></el-table-column>
- <el-table-column prop="attr31" label="灞炴��31" min-width="100px"></el-table-column>
- <el-table-column prop="attr32" label="灞炴��32" min-width="100px"></el-table-column>
- <el-table-column prop="attr33" label="灞炴��33" min-width="100px"></el-table-column>
- <el-table-column prop="attr34" label="灞炴��34" min-width="100px"></el-table-column>
- --><el-table-column prop="status" label="澶勭悊鐘舵��" min-width="100px">
- <template slot-scope="{row}">
- {{row.status==1?"宸插鐞�":"鏈鐞�"}}
- </template>
- </el-table-column>
- <el-table-column
- v-if="containPermissions(['business:basedata:update', 'business:basedata:delete'])"
- label="鎿嶄綔"
- min-width="80"
- fixed="right"
- >
+ <el-table-column prop="status" label="澶勭悊鐘舵��" min-width="100px">
<template slot-scope="{row}">
-<!--
+ {{ row.status == 1 ? "宸插鐞�" : "鏈鐞�" }}
+ </template>
+ </el-table-column>
+ <el-table-column v-if="containPermissions(['business:basedata:update', 'business:basedata:delete'])" label="鎿嶄綔"
+ min-width="80" fixed="right">
+ <template slot-scope="{row}">
+ <!--
<el-button type="text" @click="$refs.operaBaseDataWindow.open('缂栬緫鍟嗗搧婧愭暟鎹俊鎭〃', row)" icon="el-icon-edit" v-permissions="['business:basedata:update']">缂栬緫</el-button>
-->
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:basedata:delete']">鍒犻櫎</el-button>
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
+ v-permissions="['business:basedata:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
- <OperaBaseDataWindow ref="operaBaseDataWindow" @success="handlePageChange"/>
+ <OperaBaseDataWindow ref="operaBaseDataWindow" @success="handlePageChange" />
+ <el-image-viewer
+ v-if="showViewer"
+ :on-close="closeViewer"
+ :initialIndex="0"
+ :url-list="srcList"
+ :z-index="3000"
+ />
</TableLayout>
</template>
@@ -149,12 +105,15 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaBaseDataWindow from '@/components/business/OperaBaseDataWindow'
+import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
export default {
name: 'BaseData',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaBaseDataWindow },
- data () {
+ components: { TableLayout, Pagination, OperaBaseDataWindow, ElImageViewer },
+ data() {
return {
+ showViewer: false,
+ srcList: [],
// 鎼滅储
searchForm: {
name: '',
@@ -169,7 +128,7 @@
]
}
},
- created () {
+ created() {
this.config({
module: '鍟嗗搧婧愭暟鎹俊鎭〃',
api: '/business/baseData',
@@ -177,6 +136,17 @@
'field.main': 'id'
})
this.search()
- }
+ },
+ methods: {
+ showImage(imgs) {
+ this.srcList = []
+ this.srcList = imgs
+ this.showViewer = true
+ },
+ closeViewer() {
+ this.showViewer = false
+ }
+
+ },
}
</script>
--
Gitblit v1.9.3