refactor(shopExpressTemplate): 优化运费模板及明细功能界面和数据结构
- 规范和补充ShopExpressTemplate及ShopExpressTemplateDetail接口字段注释 - 调整列表列配置,增加字段宽度和排序支持,优化表格显示 - 添加计费方式和状态的标签显示,替换原有文字提示 - 删除批量移动功能相关代码和UI,简化操作流程 - 搜索组件添加清除按钮,支持批量删除操作提升用户体验 - 编辑弹窗宽度调整,表单控件换为数字输入或单选框提升输入准确性 - 编辑弹窗中新增运费模板下拉选择和表单验证,确保数据完整性 - 移除无用变量和注释,清理代码结构,提高维护性 - 优化时间显示为日期格式,界面更友好
This commit is contained in:
@@ -1,11 +1,12 @@
|
||||
<!-- 编辑弹窗 -->
|
||||
<template>
|
||||
<ele-modal
|
||||
:width="800"
|
||||
:width="680"
|
||||
:visible="visible"
|
||||
:maskClosable="false"
|
||||
:maxable="maxable"
|
||||
:title="isUpdate ? '编辑运费模板' : '添加运费模板'"
|
||||
:confirm-loading="loading"
|
||||
:title="isUpdate ? '编辑运费模板明细' : '添加运费模板明细'"
|
||||
:body-style="{ paddingBottom: '28px' }"
|
||||
@update:visible="updateVisible"
|
||||
@ok="save"
|
||||
@@ -19,82 +20,80 @@
|
||||
styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
|
||||
"
|
||||
>
|
||||
<a-form-item label="" name="templateId">
|
||||
<a-input
|
||||
<a-form-item label="所属模板" name="templateId">
|
||||
<a-select
|
||||
allow-clear
|
||||
placeholder="请输入"
|
||||
placeholder="请选择所属运费模板"
|
||||
v-model:value="form.templateId"
|
||||
:options="templateOptions"
|
||||
:field-names="{ label: 'title', value: 'shopExpressTemplateId' }"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item label="0按件" name="type">
|
||||
<a-input
|
||||
allow-clear
|
||||
placeholder="请输入0按件"
|
||||
v-model:value="form.type"
|
||||
/>
|
||||
<a-form-item label="计费方式" name="type">
|
||||
<a-radio-group v-model:value="form.type">
|
||||
<a-radio value="0">按件</a-radio>
|
||||
<a-radio value="1">按重量</a-radio>
|
||||
</a-radio-group>
|
||||
</a-form-item>
|
||||
<a-form-item label="" name="provinceId">
|
||||
<a-input
|
||||
allow-clear
|
||||
placeholder="请输入"
|
||||
<a-form-item label="省份ID" name="provinceId">
|
||||
<a-input-number
|
||||
:min="0"
|
||||
class="ele-fluid"
|
||||
placeholder="请输入省份ID"
|
||||
v-model:value="form.provinceId"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item label="" name="cityId">
|
||||
<a-input allow-clear placeholder="请输入" v-model:value="form.cityId" />
|
||||
<a-form-item label="城市ID" name="cityId">
|
||||
<a-input-number
|
||||
:min="0"
|
||||
class="ele-fluid"
|
||||
placeholder="请输入城市ID"
|
||||
v-model:value="form.cityId"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item label="首件数量/重量" name="firstNum">
|
||||
<a-input
|
||||
allow-clear
|
||||
<a-input-number
|
||||
:min="0"
|
||||
:precision="2"
|
||||
class="ele-fluid"
|
||||
placeholder="请输入首件数量/重量"
|
||||
v-model:value="form.firstNum"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item label="收件价格" name="firstAmount">
|
||||
<a-input
|
||||
allow-clear
|
||||
placeholder="请输入收件价格"
|
||||
<a-form-item label="首件价格" name="firstAmount">
|
||||
<a-input-number
|
||||
:min="0"
|
||||
:precision="2"
|
||||
class="ele-fluid"
|
||||
placeholder="请输入首件价格"
|
||||
v-model:value="form.firstAmount"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item label="续件价格" name="extraAmount">
|
||||
<a-input
|
||||
allow-clear
|
||||
placeholder="请输入续件价格"
|
||||
v-model:value="form.extraAmount"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item label="续件数量/重量" name="extraNum">
|
||||
<a-input
|
||||
allow-clear
|
||||
<a-input-number
|
||||
:min="0"
|
||||
:precision="2"
|
||||
class="ele-fluid"
|
||||
placeholder="请输入续件数量/重量"
|
||||
v-model:value="form.extraNum"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item
|
||||
label="状态, 0已发布, 1待审核 2已驳回 3违规内容"
|
||||
name="status"
|
||||
>
|
||||
<a-form-item label="续件价格" name="extraAmount">
|
||||
<a-input-number
|
||||
:min="0"
|
||||
:precision="2"
|
||||
class="ele-fluid"
|
||||
placeholder="请输入续件价格"
|
||||
v-model:value="form.extraAmount"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item label="状态" name="status">
|
||||
<a-radio-group v-model:value="form.status">
|
||||
<a-radio :value="0">显示</a-radio>
|
||||
<a-radio :value="1">隐藏</a-radio>
|
||||
<a-radio :value="0">启用</a-radio>
|
||||
<a-radio :value="1">禁用</a-radio>
|
||||
</a-radio-group>
|
||||
</a-form-item>
|
||||
<a-form-item label="是否删除, 0否, 1是" name="deleted">
|
||||
<a-input
|
||||
allow-clear
|
||||
placeholder="请输入是否删除, 0否, 1是"
|
||||
v-model:value="form.deleted"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item label="修改时间" name="updateTime">
|
||||
<a-input
|
||||
allow-clear
|
||||
placeholder="请输入修改时间"
|
||||
v-model:value="form.updateTime"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item label="" name="sortNumber">
|
||||
<a-form-item label="排序号" name="sortNumber">
|
||||
<a-input-number
|
||||
:min="0"
|
||||
:max="9999"
|
||||
@@ -108,17 +107,20 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref, reactive, watch } from 'vue';
|
||||
import { ref, reactive, watch, onMounted } from 'vue';
|
||||
import { Form, message } from 'ant-design-vue';
|
||||
import { assignObject, uuid } from 'ele-admin-pro';
|
||||
import { assignObject } from 'ele-admin-pro';
|
||||
import {
|
||||
addShopExpressTemplateDetail,
|
||||
updateShopExpressTemplateDetail
|
||||
} from '@/api/shop/shopExpressTemplateDetail';
|
||||
import { ShopExpressTemplateDetail } from '@/api/shop/shopExpressTemplateDetail/model';
|
||||
import { listShopExpressTemplate } from '@/api/shop/shopExpressTemplate';
|
||||
import {
|
||||
ShopExpressTemplateDetail
|
||||
} from '@/api/shop/shopExpressTemplateDetail/model';
|
||||
import type { ShopExpressTemplate } from '@/api/shop/shopExpressTemplate/model';
|
||||
import { useThemeStore } from '@/store/modules/theme';
|
||||
import { storeToRefs } from 'pinia';
|
||||
import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
|
||||
import { FormInstance } from 'ant-design-vue/es/form';
|
||||
|
||||
// 是否是修改
|
||||
@@ -144,22 +146,24 @@
|
||||
const loading = ref(false);
|
||||
// 是否显示最大化切换按钮
|
||||
const maxable = ref(true);
|
||||
// 表格选中数据
|
||||
// 表单实例
|
||||
const formRef = ref<FormInstance | null>(null);
|
||||
const images = ref<ItemType[]>([]);
|
||||
// 运费模板下拉选项
|
||||
const templateOptions = ref<ShopExpressTemplate[]>([]);
|
||||
|
||||
// 用户信息
|
||||
// 表单数据
|
||||
const form = reactive<ShopExpressTemplateDetail>({
|
||||
shopExpressTemplateDetailId: undefined,
|
||||
id: undefined,
|
||||
templateId: undefined,
|
||||
type: undefined,
|
||||
type: '0',
|
||||
provinceId: undefined,
|
||||
cityId: undefined,
|
||||
firstNum: undefined,
|
||||
firstAmount: undefined,
|
||||
extraAmount: undefined,
|
||||
extraNum: undefined,
|
||||
deleted: undefined,
|
||||
deleted: 0,
|
||||
tenantId: undefined,
|
||||
createTime: undefined,
|
||||
updateTime: undefined,
|
||||
@@ -174,11 +178,45 @@
|
||||
|
||||
// 表单验证规则
|
||||
const rules = reactive({
|
||||
shopExpressTemplateDetailName: [
|
||||
templateId: [
|
||||
{
|
||||
required: true,
|
||||
type: 'string',
|
||||
message: '请填写运费模板名称',
|
||||
message: '请选择所属运费模板',
|
||||
trigger: 'change'
|
||||
}
|
||||
],
|
||||
type: [
|
||||
{
|
||||
required: true,
|
||||
message: '请选择计费方式',
|
||||
trigger: 'change'
|
||||
}
|
||||
],
|
||||
firstNum: [
|
||||
{
|
||||
required: true,
|
||||
message: '请输入首件数量/重量',
|
||||
trigger: 'blur'
|
||||
}
|
||||
],
|
||||
firstAmount: [
|
||||
{
|
||||
required: true,
|
||||
message: '请输入首件价格',
|
||||
trigger: 'blur'
|
||||
}
|
||||
],
|
||||
extraNum: [
|
||||
{
|
||||
required: true,
|
||||
message: '请输入续件数量/重量',
|
||||
trigger: 'blur'
|
||||
}
|
||||
],
|
||||
extraAmount: [
|
||||
{
|
||||
required: true,
|
||||
message: '请输入续件价格',
|
||||
trigger: 'blur'
|
||||
}
|
||||
]
|
||||
@@ -186,6 +224,17 @@
|
||||
|
||||
const { resetFields } = useForm(form, rules);
|
||||
|
||||
/* 加载运费模板列表 */
|
||||
const loadTemplates = () => {
|
||||
listShopExpressTemplate()
|
||||
.then((data) => {
|
||||
templateOptions.value = data || [];
|
||||
})
|
||||
.catch(() => {
|
||||
templateOptions.value = [];
|
||||
});
|
||||
};
|
||||
|
||||
/* 保存编辑 */
|
||||
const save = () => {
|
||||
if (!formRef.value) {
|
||||
@@ -195,9 +244,7 @@
|
||||
.validate()
|
||||
.then(() => {
|
||||
loading.value = true;
|
||||
const formData = {
|
||||
...form
|
||||
};
|
||||
const formData = { ...form };
|
||||
const saveOrUpdate = isUpdate.value
|
||||
? updateShopExpressTemplateDetail
|
||||
: addShopExpressTemplateDetail;
|
||||
@@ -216,11 +263,14 @@
|
||||
.catch(() => {});
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
loadTemplates();
|
||||
});
|
||||
|
||||
watch(
|
||||
() => props.visible,
|
||||
(visible) => {
|
||||
if (visible) {
|
||||
images.value = [];
|
||||
if (props.data) {
|
||||
assignObject(form, props.data);
|
||||
isUpdate.value = true;
|
||||
|
||||
Reference in New Issue
Block a user