wuyajie/daoyou_manage_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化供应商、商品和积分记录管理界面及逻辑

Browse Source
This commit is contained in:
钊钊 2024-12-19 09:22:38 +08:00
parent e1a6a1528e
commit a04d21bd8f
4 changed files with 194 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/manage/vendor/types.ts vendored
View File

@ -33,7 +33,6 @@ export interface VendorVO {
* 备注
*/
remark: string;
}
export interface VendorForm extends BaseEntity {
@ -55,17 +54,15 @@ export interface VendorForm extends BaseEntity {
/**
* 排序
*/
sort?: number;
sortNum?: number;
/**
* 备注
*/
remark?: string;
}
export interface VendorQuery extends PageQuery {
/**
* 商品类别id
*/
@ -79,13 +76,10 @@ export interface VendorQuery extends PageQuery {
/**
* 排序
*/
sort?: number;
sortNum?: number;
/**
* 日期范围参数
*/
params?: any;
}

85
src/views/manage/product/index.vue
View File

@ -1,60 +1,44 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter"
:leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]" id="search_div">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="商品类别id" prop="categoryId">
<el-input v-model="queryParams.categoryId" placeholder="请输入商品类别id" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="商品名称" prop="productName">
<el-input v-model="queryParams.productName" placeholder="请输入商品名称" clearable @keyup.enter="handleQuery" />
<el-input class="inputWidth" v-model="queryParams.productName" placeholder="请输入商品名称" clearable
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="商品说明" prop="productShows">
<el-input v-model="queryParams.productShows" placeholder="请输入商品说明" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="供应商id" prop="vendorId">
<el-input v-model="queryParams.vendorId" placeholder="请输入供应商id" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="排序" prop="sortOrder">
<el-input v-model="queryParams.sortOrder" placeholder="请输入排序" clearable @keyup.enter="handleQuery" />
<el-form-item label="商品类别" prop="productShows">
<el-select v-model="queryParams.status" placeholder="请选择类别" clearable class="inputWidth">
<el-option label="封禁" value="0"></el-option>
<el-option label="正常" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['manage:product:add']">新增</el-button>
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
v-hasPermi="['manage:product:edit']">修改</el-button>
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
v-hasPermi="['manage:product:remove']">删除</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['manage:product:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['manage:product:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['manage:product:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['manage:product:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="productList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :height="autoTableHeight" :data="productList"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="id" v-if="true" />
<el-table-column label="商品类别id" align="center" prop="categoryId" />
<el-table-column label="商品名称" align="center" prop="productName" />
<el-table-column label="商品图片" align="center" prop="productImageUrl" width="100">
<template #default="scope">
<image-preview :src="scope.row.productImageUrl" :width="50" :height="50"/>
<image-preview :src="scope.row.productImageUrl" :width="50" :height="50" />
</template>
</el-table-column>
<el-table-column label="商品说明" align="center" prop="productShows" />
@ -71,17 +55,19 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['manage:product:edit']"></el-button>
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['manage:product:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['manage:product:remove']"></el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['manage:product:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<pagination v-show="total > 0" id="table_page" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改商品信息对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="productFormRef" :model="form" :rules="rules" label-width="80px">
@ -92,7 +78,7 @@
<el-input v-model="form.productName" placeholder="请输入商品名称" />
</el-form-item>
<el-form-item label="商品图片" prop="productImage">
<image-upload v-model="form.productImage"/>
<image-upload v-model="form.productImage" />
</el-form-item>
<el-form-item label="商品说明" prop="productShows">
<el-input v-model="form.productShows" placeholder="请输入商品说明" />
@ -122,7 +108,7 @@ import { listProduct, getProduct, delProduct, addProduct, updateProduct } from '
import { ProductVO, ProductQuery, ProductForm } from '@/api/manage/product/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const autoTableHeight = ref(750);
const productList = ref<ProductVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
@ -291,5 +277,22 @@ const handleExport = () => {
onMounted(() => {
getList();
nextTick(() => {
autoTableHeight.value = proxy?.autoTableHeight();
});
window.onresize = () => {
autoTableHeight.value = proxy?.autoTableHeight();
};
});
</script>
<style lang="scss" scoped>
.el-card :deep(.el-card__body) {
padding-bottom: 0px !important;
}
#table_page {
height: 50px !important;
margin-top: 10px !important;
padding-bottom: 10px !important;
}
</style>

77
src/views/manage/userScore/index.vue
View File

@ -1,24 +1,36 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter"
:leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]" id="search_div">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="用户ID" prop="userId">
<el-input v-model="queryParams.userId" placeholder="请输入用户ID" clearable @keyup.enter="handleQuery" />
<el-input v-model="queryParams.userId" class="inputWidth" placeholder="请输入用户ID" clearable
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="业务id" prop="sourceId">
<el-input v-model="queryParams.sourceId" placeholder="请输入业务id" clearable @keyup.enter="handleQuery" />
<el-input v-model="queryParams.sourceId" class="inputWidth" placeholder="请输入业务id" clearable
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) " prop="source">
<el-input v-model="queryParams.source" placeholder="请输入来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) " clearable @keyup.enter="handleQuery" />
<el-input v-model="queryParams.source" class="inputWidth"
placeholder="请输入来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) " clearable
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="积分" prop="score">
<el-input v-model="queryParams.score" placeholder="请输入积分" clearable @keyup.enter="handleQuery" />
<el-input v-model="queryParams.score" class="inputWidth" placeholder="请输入积分" clearable
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
<!-- <el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['manage:userScore:add']">新增</el-button>
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
v-hasPermi="['manage:userScore:edit']">修改</el-button>
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
v-hasPermi="['manage:userScore:remove']">删除</el-button> -->
</el-form-item>
</el-form>
</el-card>
@ -26,44 +38,30 @@
</transition>
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['manage:userScore:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['manage:userScore:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['manage:userScore:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['manage:userScore:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="userScoreList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :height="autoTableHeight" :data="userScoreList"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="id" v-if="true" />
<el-table-column label="用户ID" align="center" prop="userId" />
<el-table-column label="业务id" align="center" prop="sourceId" />
<el-table-column label="来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) " align="center" prop="source" />
<el-table-column label="积分" align="center" prop="score" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['manage:userScore:edit']"></el-button>
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['manage:userScore:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['manage:userScore:remove']"></el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['manage:userScore:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination v-show="total > 0" id="table_page" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改积分记录对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@ -96,7 +94,7 @@ import { listUserScore, getUserScore, delUserScore, addUserScore, updateUserScor
import { UserScoreVO, UserScoreQuery, UserScoreForm } from '@/api/manage/userScore/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const autoTableHeight = ref(750);
const userScoreList = ref<UserScoreVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
@ -246,5 +244,22 @@ const handleExport = () => {
onMounted(() => {
getList();
nextTick(() => {
autoTableHeight.value = proxy?.autoTableHeight();
});
window.onresize = () => {
autoTableHeight.value = proxy?.autoTableHeight();
};
});
</script>
<style lang="scss" scoped>
.el-card :deep(.el-card__body) {
padding-bottom: 0px !important;
}
#table_page {
height: 50px !important;
margin-top: 10px !important;
padding-bottom: 10px !important;
}
</style>

121
src/views/manage/vendor/index.vue vendored
View File

@ -1,88 +1,71 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter"
:leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]" id="search_div">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="商品类别id" prop="categoryId">
<el-input v-model="queryParams.categoryId" placeholder="请输入商品类别id" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="商品名称" prop="vendorName">
<el-input v-model="queryParams.vendorName" placeholder="请输入商品名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input v-model="queryParams.sort" placeholder="请输入排序" clearable @keyup.enter="handleQuery" />
<el-form-item label="供应商名称" prop="vendorName" label-width="90px">
<el-input class="inputWidth" v-model="queryParams.vendorName" placeholder="请输入商品名称" clearable
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['manage:vendor:add']">新增</el-button>
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
v-hasPermi="['manage:vendor:edit']">修改</el-button>
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
v-hasPermi="['manage:vendor:remove']">删除</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['manage:vendor:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['manage:vendor:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['manage:vendor:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['manage:vendor:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="vendorList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :height="autoTableHeight" :data="vendorList"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="id" v-if="true" />
<el-table-column label="商品类别id" align="center" prop="categoryId" />
<el-table-column label="商品名称" align="center" prop="vendorName" />
<el-table-column label="排序" align="center" prop="sort" />
<el-table-column label="更新者" align="center" prop="updateBy" />
<el-table-column label="更新时间" align="center" prop="updateTime" width="180">
<el-table-column label="供应商名称" align="center" prop="vendorName" />
<el-table-column label="排序" align="center" prop="sortNum" />
<el-table-column label="操作人" align="center" prop="updateByName" />
<el-table-column label="操作时间" align="center" prop="updateTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['manage:vendor:edit']"></el-button>
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['manage:vendor:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['manage:vendor:remove']"></el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['manage:vendor:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<pagination v-show="total > 0" id="table_page" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改供应商对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="vendorFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="商品类别id" prop="categoryId">
<el-form ref="vendorFormRef" :model="form" :rules="rules" label-width="100px">
<!-- <el-form-item label="商品类别id" prop="categoryId">
<el-input v-model="form.categoryId" placeholder="请输入商品类别id" />
</el-form-item> -->
<el-form-item label="供应商名称" prop="vendorName">
<el-input v-model="form.vendorName" placeholder="请输入供应商名称" />
</el-form-item>
<el-form-item label="商品名称" prop="vendorName">
<el-input v-model="form.vendorName" placeholder="请输入商品名称" />
<el-form-item label="排序" prop="sortNum">
<el-input-number v-model="form.sortNum" :min="1" :max="10000" />
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input v-model="form.sort" placeholder="请输入排序" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<!-- <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form-item> -->
</el-form>
<template #footer>
<div class="dialog-footer">
@ -99,7 +82,7 @@ import { listVendor, getVendor, delVendor, addVendor, updateVendor } from '@/api
import { VendorVO, VendorQuery, VendorForm } from '@/api/manage/vendor/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const autoTableHeight = ref(750);
const vendorList = ref<VendorVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
@ -121,7 +104,7 @@ const initFormData: VendorForm = {
id: undefined,
categoryId: undefined,
vendorName: undefined,
sort: undefined,
sortNum: 0,
remark: undefined
}
const data = reactive<PageData<VendorForm, VendorQuery>>({
@ -131,26 +114,17 @@ const data = reactive<PageData<VendorForm, VendorQuery>>({
pageSize: 10,
categoryId: undefined,
vendorName: undefined,
sort: undefined,
sortNum: undefined,
params: {
}
},
rules: {
id: [
{ required: true, message: "ID不能为空", trigger: "blur" }
],
categoryId: [
{ required: true, message: "商品类别id不能为空", trigger: "blur" }
],
vendorName: [
{ required: true, message: "商品名称不能为空", trigger: "blur" }
],
sort: [
{ required: true, message: "排序不能为空", trigger: "blur" }
sortNum: [
{ required: false, message: "排序不能为空", trigger: "blur" }
],
remark: [
{ required: true, message: "备注不能为空", trigger: "blur" }
]
}
});
@ -159,7 +133,7 @@ const { queryParams, form, rules } = toRefs(data);
/** 查询供应商列表 */
const getList = async () => {
loading.value = true;
const res = await listVendor(queryParams.value);
const res = await listVendor(queryParams.value).finally(() => loading.value = false);
vendorList.value = res.rows;
total.value = res.total;
loading.value = false;
@ -248,5 +222,22 @@ const handleExport = () => {
onMounted(() => {
getList();
nextTick(() => {
autoTableHeight.value = proxy?.autoTableHeight();
});
window.onresize = () => {
autoTableHeight.value = proxy?.autoTableHeight();
};
});
</script>
<style lang="scss" scoped>
.el-card :deep(.el-card__body) {
padding-bottom: 0px !important;
}
#table_page {
height: 50px !important;
margin-top: 10px !important;
padding-bottom: 10px !important;
}
</style>