From 9ef61aec5e8b218db9d60941ef3ad576a927338b Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 26 四月 2024 11:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/sysPictureBase/SysPictureBase.vue | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/web/src/views/modules/sysPictureBase/SysPictureBase.vue b/web/src/views/modules/sysPictureBase/SysPictureBase.vue
index 5dfca12..69e8daf 100644
--- a/web/src/views/modules/sysPictureBase/SysPictureBase.vue
+++ b/web/src/views/modules/sysPictureBase/SysPictureBase.vue
@@ -1,7 +1,7 @@
<template>
- <el-card shadow="never" class="aui-card--fill">
- <div class="mod-sysPictureBase-sysPictureBase}">
+ <div class="mod-sysPictureBase-sysPictureBase fa-card-a">
<zt-table-wraper query-url="/sysPictureBase/page" delete-url="/sysPictureBase/"
+ :paging='false'
v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
@@ -9,7 +9,7 @@
</el-form-item>
<el-form-item>
- <zt-dict v-model="dataForm.systemMark" dict="product" placeholder="璇烽�夋嫨绯荤粺鏍囪瘑" clearable></zt-dict>
+ <zt-dict v-model="dataForm.productType" dict="product" placeholder="璇烽�夋嫨浜у搧绫诲瀷" clearable></zt-dict>
</el-form-item>
<el-form-item>
<zt-button type="query" @click="table.query()"/>
@@ -17,18 +17,18 @@
<zt-button type="delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
- <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}"
- border @selection-change="table.selectionChangeHandle">
+ <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
+ @selection-change="table.selectionChangeHandle">
<el-table-column type="selection" width="40" align="center"/>
- <el-table-column prop="sortNo" label="鎺掑簭"/>
<el-table-column prop="name" label="鍥剧墖鍚嶇О"/>
+ <zt-table-column-dict prop="isDefault" label="鏄惁榛樿" dict="is_or_not"/>
<el-table-column label="鍥剧墖" align="center">
<template v-slot="{ row }">
<el-image v-if="row.id" :src="url+row.id" style="height: 50px;width: 50px"></el-image>
</template>
</el-table-column>
<el-table-column prop="contentType" label="妫�绱㈠叧閿瓧"/>
- <zt-table-column-dict prop="systemMark" label="绯荤粺鏍囪瘑" dict="product"/>
+ <zt-table-column-dict prop="productType" label="浜у搧绫诲瀷" dict="product"/>
<zt-table-column-handle :table="table"
delete-perm="sysPictureBase::delete"/>
</el-table>
@@ -36,7 +36,6 @@
<add-or-update @refreshDataList="table.query"/>
</zt-table-wraper>
</div>
- </el-card>
</template>
<script>
@@ -49,8 +48,7 @@
url: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getProductImg?token=${Cookies.get('token')}&id=`,
dataForm: {
contentType: '',
- systemMark: '',
- sortNo: ''
+ productType: '',
},
}
},
--
Gitblit v1.9.1