1、右上角的登录信息改为优先显示真实姓名

2、修复已知bug
This commit is contained in:
2024-07-27 13:53:11 +08:00
parent 904bd82e39
commit b9df13a916
23 changed files with 1499 additions and 92 deletions

View File

@@ -334,6 +334,7 @@
import { GoodsSku } from "@/api/shop/goodsSku/model";
import { GoodsSpec } from "@/api/shop/goodsSpec/model";
import { generateGoodsSku, listGoodsSku } from "@/api/shop/goodsSku";
import { listGoodsSpec } from "@/api/shop/goodsSpec";
// 是否是修改
const isUpdate = ref(false);
@@ -371,7 +372,6 @@
const name = ref();
const value = ref();
const skuList = ref<GoodsSku[]>([]);
const fileList = ref<any[]>([]);
const files = ref<ItemType[]>([]);
const goodsSpec = ref<GoodsSpec>();
const category = ref<string[]>([]);
@@ -584,9 +584,26 @@
const onChange = (text: string) => {
// 加载商品多规格
if(text == 'spec'){
listGoodsSku({goodsId: props.data?.goodsId}).then(data => {
skuList.value = data;
})
const goodsId = props.data?.goodsId;
if(goodsId){
listGoodsSpec({goodsId}).then(data => {
console.log(data[0].specValue);
const specValue = data[0].specValue;
if(specValue){
spec.value = JSON.parse(specValue).map( d => {
console.log(d);
return {
value: d.value,
detail: d.detail
};
})
}
console.log(spec.value);
})
listGoodsSku({goodsId}).then(data => {
skuList.value = data;
})
}
}
};
@@ -710,13 +727,10 @@
.validate()
.then(() => {
loading.value = true;
files.value.map((d) => {
fileList.value.push(d.url);
});
const formData = {
...form,
content: content.value,
files: JSON.stringify(fileList.value),
files: JSON.stringify(files.value),
goodsSpec: goodsSpec.value,
goodsSkus: skuList.value
};
@@ -741,8 +755,8 @@
(visible) => {
if (visible) {
images.value = [];
files.value = [];
category.value = [];
files.value = [];
if (props.data) {
assignObject(form, props.data);
if (props.data.image) {
@@ -753,14 +767,7 @@
});
}
if(props.data.files){
const arr = JSON.parse(props.data.files);
arr.map((img) => {
files.value.push({
uid: uuid(),
url: img,
status: 'done'
});
});
files.value = JSON.parse(props.data.files);
}
if(props.data.goodsSpecs){
goodsSpec.value = props.data.goodsSpecs[0];
@@ -793,7 +800,7 @@
isUpdate.value = true;
} else {
spec.value = [];
goodsSpec.value = {};
goodsSpec.value = undefined;
skuList.value = [];
isUpdate.value = false;
}

View File

@@ -0,0 +1,332 @@
<!-- 编辑弹窗 -->
<template>
<ele-modal
:width="800"
:visible="visible"
:maskClosable="false"
:maxable="maxable"
:title="isUpdate ? '编辑会员充值订单表' : '添加会员充值订单表'"
:body-style="{ paddingBottom: '28px' }"
@update:visible="updateVisible"
@ok="save"
>
<a-form
ref="formRef"
:model="form"
:rules="rules"
:label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
:wrapper-col="
styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
"
>
<a-form-item label="订单号" name="orderNo">
<a-input
allow-clear
placeholder="请输入订单号"
v-model:value="form.orderNo"
/>
</a-form-item>
<a-form-item label="用户ID" name="userId">
<a-input
allow-clear
placeholder="请输入用户ID"
v-model:value="form.userId"
/>
</a-form-item>
<a-form-item label="充值方式(10自定义金额 20套餐充值)" name="rechargeType">
<a-input
allow-clear
placeholder="请输入充值方式(10自定义金额 20套餐充值)"
v-model:value="form.rechargeType"
/>
</a-form-item>
<a-form-item label="机构id" name="organizationId">
<a-input
allow-clear
placeholder="请输入机构id"
v-model:value="form.organizationId"
/>
</a-form-item>
<a-form-item label="充值套餐ID" name="planId">
<a-input
allow-clear
placeholder="请输入充值套餐ID"
v-model:value="form.planId"
/>
</a-form-item>
<a-form-item label="用户支付金额" name="payPrice">
<a-input
allow-clear
placeholder="请输入用户支付金额"
v-model:value="form.payPrice"
/>
</a-form-item>
<a-form-item label="赠送金额" name="giftMoney">
<a-input
allow-clear
placeholder="请输入赠送金额"
v-model:value="form.giftMoney"
/>
</a-form-item>
<a-form-item label="实际到账金额" name="actualMoney">
<a-input
allow-clear
placeholder="请输入实际到账金额"
v-model:value="form.actualMoney"
/>
</a-form-item>
<a-form-item label="用户可用余额" name="balance">
<a-input
allow-clear
placeholder="请输入用户可用余额"
v-model:value="form.balance"
/>
</a-form-item>
<a-form-item label="支付方式(微信/支付宝)" name="payMethod">
<a-input
allow-clear
placeholder="请输入支付方式(微信/支付宝)"
v-model:value="form.payMethod"
/>
</a-form-item>
<a-form-item label="支付状态(10待支付 20已支付)" name="payStatus">
<a-input
allow-clear
placeholder="请输入支付状态(10待支付 20已支付)"
v-model:value="form.payStatus"
/>
</a-form-item>
<a-form-item label="付款时间" name="payTime">
<a-input
allow-clear
placeholder="请输入付款时间"
v-model:value="form.payTime"
/>
</a-form-item>
<a-form-item label="第三方交易记录ID" name="tradeId">
<a-input
allow-clear
placeholder="请输入第三方交易记录ID"
v-model:value="form.tradeId"
/>
</a-form-item>
<a-form-item label="来源客户端 (APP、H5、小程序等)" name="platform">
<a-input
allow-clear
placeholder="请输入来源客户端 (APP、H5、小程序等)"
v-model:value="form.platform"
/>
</a-form-item>
<a-form-item label="所属门店ID" name="shopId">
<a-input
allow-clear
placeholder="请输入所属门店ID"
v-model:value="form.shopId"
/>
</a-form-item>
<a-form-item label="排序(数字越小越靠前)" name="sortNumber">
<a-input-number
:min="0"
:max="9999"
class="ele-fluid"
placeholder="请输入排序号"
v-model:value="form.sortNumber"
/>
</a-form-item>
<a-form-item label="备注" name="comments">
<a-textarea
:rows="4"
:maxlength="200"
placeholder="请输入描述"
v-model:value="form.comments"
/>
</a-form-item>
<a-form-item label="状态, 0正常, 1冻结" name="status">
<a-radio-group v-model:value="form.status">
<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="merchantCode">
<a-input
allow-clear
placeholder="请输入商户编码"
v-model:value="form.merchantCode"
/>
</a-form-item>
<a-form-item label="修改时间" name="updateTime">
<a-input
allow-clear
placeholder="请输入修改时间"
v-model:value="form.updateTime"
/>
</a-form-item>
</a-form>
</ele-modal>
</template>
<script lang="ts" setup>
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject, uuid } from 'ele-admin-pro';
import { addRechargeOrder, updateRechargeOrder } from '@/api/shop/rechargeOrder';
import { RechargeOrder } from '@/api/shop/rechargeOrder/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';
import { FileRecord } from '@/api/system/file/model';
// 是否是修改
const isUpdate = ref(false);
const useForm = Form.useForm;
// 是否开启响应式布局
const themeStore = useThemeStore();
const { styleResponsive } = storeToRefs(themeStore);
const props = defineProps<{
// 弹窗是否打开
visible: boolean;
// 修改回显的数据
data?: RechargeOrder | null;
}>();
const emit = defineEmits<{
(e: 'done'): void;
(e: 'update:visible', visible: boolean): void;
}>();
// 提交状态
const loading = ref(false);
// 是否显示最大化切换按钮
const maxable = ref(true);
// 表格选中数据
const formRef = ref<FormInstance | null>(null);
const images = ref<ItemType[]>([]);
// 用户信息
const form = reactive<RechargeOrder>({
orderId: undefined,
orderNo: undefined,
userId: undefined,
rechargeType: undefined,
organizationId: undefined,
planId: undefined,
payPrice: undefined,
giftMoney: undefined,
actualMoney: undefined,
balance: undefined,
payMethod: undefined,
payStatus: undefined,
payTime: undefined,
tradeId: undefined,
platform: undefined,
shopId: undefined,
sortNumber: undefined,
comments: undefined,
status: undefined,
deleted: undefined,
merchantCode: undefined,
tenantId: undefined,
createTime: undefined,
updateTime: undefined,
rechargeOrderId: undefined,
rechargeOrderName: '',
status: 0,
comments: '',
sortNumber: 100
});
/* 更新visible */
const updateVisible = (value: boolean) => {
emit('update:visible', value);
};
// 表单验证规则
const rules = reactive({
rechargeOrderName: [
{
required: true,
type: 'string',
message: '请填写会员充值订单表名称',
trigger: 'blur'
}
]
});
const chooseImage = (data: FileRecord) => {
images.value.push({
uid: data.id,
url: data.path,
status: 'done'
});
form.image = data.path;
};
const onDeleteItem = (index: number) => {
images.value.splice(index, 1);
form.image = '';
};
const { resetFields } = useForm(form, rules);
/* 保存编辑 */
const save = () => {
if (!formRef.value) {
return;
}
formRef.value
.validate()
.then(() => {
loading.value = true;
const formData = {
...form
};
const saveOrUpdate = isUpdate.value ? updateRechargeOrder : addRechargeOrder;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
message.success(msg);
updateVisible(false);
emit('done');
})
.catch((e) => {
loading.value = false;
message.error(e.message);
});
})
.catch(() => {});
};
watch(
() => props.visible,
(visible) => {
if (visible) {
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
}
isUpdate.value = true;
} else {
isUpdate.value = false;
}
} else {
resetFields();
}
},
{ immediate: true }
);
</script>

View File

@@ -0,0 +1,42 @@
<!-- 搜索表单 -->
<template>
<a-space :size="10" style="flex-wrap: wrap">
<a-button type="primary" class="ele-btn-icon" @click="add">
<template #icon>
<PlusOutlined />
</template>
<span>添加</span>
</a-button>
</a-space>
</template>
<script lang="ts" setup>
import { PlusOutlined } from '@ant-design/icons-vue';
import type { GradeParam } from '@/api/user/grade/model';
import { watch } from 'vue';
const props = withDefaults(
defineProps<{
// 选中的角色
selection?: [];
}>(),
{}
);
const emit = defineEmits<{
(e: 'search', where?: GradeParam): void;
(e: 'add'): void;
(e: 'remove'): void;
(e: 'batchMove'): void;
}>();
// 新增
const add = () => {
emit('add');
};
watch(
() => props.selection,
() => {}
);
</script>

View File

@@ -0,0 +1,341 @@
<template>
<div class="page">
<div class="ele-body">
<a-card :bordered="false" :body-style="{ padding: '16px' }">
<ele-pro-table
ref="tableRef"
row-key="rechargeOrderId"
:columns="columns"
:datasource="datasource"
:customRow="customRow"
tool-class="ele-toolbar-form"
class="sys-org-table"
>
<template #toolbar>
<search
@search="reload"
:selection="selection"
@add="openEdit"
@remove="removeBatch"
@batchMove="openMove"
/>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'image'">
<a-image :src="record.image" :width="50" />
</template>
<template v-if="column.key === 'status'">
<a-tag v-if="record.status === 0" color="green">显示</a-tag>
<a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
</template>
<template v-if="column.key === 'action'">
<a-space>
<a @click="openEdit(record)">修改</a>
<a-divider type="vertical" />
<a-popconfirm
title="确定要删除此记录吗?"
@confirm="remove(record)"
>
<a class="ele-text-danger">删除</a>
</a-popconfirm>
</a-space>
</template>
</template>
</ele-pro-table>
</a-card>
<!-- 编辑弹窗 -->
<RechargeOrderEdit v-model:visible="showEdit" :data="current" @done="reload" />
</div>
</div>
</template>
<script lang="ts" setup>
import { createVNode, ref } from 'vue';
import { message, Modal } from 'ant-design-vue';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import type { EleProTable } from 'ele-admin-pro';
import { toDateString } from 'ele-admin-pro';
import type {
DatasourceFunction,
ColumnItem
} from 'ele-admin-pro/es/ele-pro-table/types';
import Search from './components/search.vue';
import RechargeOrderEdit from './components/rechargeOrderEdit.vue';
import { pageRechargeOrder, removeRechargeOrder, removeBatchRechargeOrder } from '@/api/shop/rechargeOrder';
import type { RechargeOrder, RechargeOrderParam } from '@/api/shop/rechargeOrder/model';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
// 表格选中数据
const selection = ref<RechargeOrder[]>([]);
// 当前编辑数据
const current = ref<RechargeOrder | null>(null);
// 是否显示编辑弹窗
const showEdit = ref(false);
// 是否显示批量移动弹窗
const showMove = ref(false);
// 加载状态
const loading = ref(true);
// 表格数据源
const datasource: DatasourceFunction = ({
page,
limit,
where,
orders,
filters
}) => {
if (filters) {
where.status = filters.status;
}
return pageRechargeOrder({
...where,
...orders,
page,
limit
});
};
// 表格列配置
const columns = ref<ColumnItem[]>([
{
title: '订单ID',
dataIndex: 'orderId',
key: 'orderId',
align: 'center',
width: 90,
},
{
title: '订单号',
dataIndex: 'orderNo',
key: 'orderNo',
align: 'center',
},
{
title: '用户ID',
dataIndex: 'userId',
key: 'userId',
align: 'center',
},
{
title: '充值方式(10自定义金额 20套餐充值)',
dataIndex: 'rechargeType',
key: 'rechargeType',
align: 'center',
},
{
title: '机构id',
dataIndex: 'organizationId',
key: 'organizationId',
align: 'center',
},
{
title: '充值套餐ID',
dataIndex: 'planId',
key: 'planId',
align: 'center',
},
{
title: '用户支付金额',
dataIndex: 'payPrice',
key: 'payPrice',
align: 'center',
},
{
title: '赠送金额',
dataIndex: 'giftMoney',
key: 'giftMoney',
align: 'center',
},
{
title: '实际到账金额',
dataIndex: 'actualMoney',
key: 'actualMoney',
align: 'center',
},
{
title: '用户可用余额',
dataIndex: 'balance',
key: 'balance',
align: 'center',
},
{
title: '支付方式(微信/支付宝)',
dataIndex: 'payMethod',
key: 'payMethod',
align: 'center',
},
{
title: '支付状态(10待支付 20已支付)',
dataIndex: 'payStatus',
key: 'payStatus',
align: 'center',
},
{
title: '付款时间',
dataIndex: 'payTime',
key: 'payTime',
align: 'center',
},
{
title: '第三方交易记录ID',
dataIndex: 'tradeId',
key: 'tradeId',
align: 'center',
},
{
title: '来源客户端 (APP、H5、小程序等)',
dataIndex: 'platform',
key: 'platform',
align: 'center',
},
{
title: '所属门店ID',
dataIndex: 'shopId',
key: 'shopId',
align: 'center',
},
{
title: '排序(数字越小越靠前)',
dataIndex: 'sortNumber',
key: 'sortNumber',
align: 'center',
},
{
title: '备注',
dataIndex: 'comments',
key: 'comments',
align: 'center',
},
{
title: '状态, 0正常, 1冻结',
dataIndex: 'status',
key: 'status',
align: 'center',
},
{
title: '是否删除, 0否, 1是',
dataIndex: 'deleted',
key: 'deleted',
align: 'center',
},
{
title: '商户编码',
dataIndex: 'merchantCode',
key: 'merchantCode',
align: 'center',
},
{
title: '注册时间',
dataIndex: 'createTime',
key: 'createTime',
align: 'center',
sorter: true,
ellipsis: true,
customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
},
{
title: '修改时间',
dataIndex: 'updateTime',
key: 'updateTime',
align: 'center',
},
{
title: '操作',
key: 'action',
width: 180,
fixed: 'right',
align: 'center',
hideInSetting: true
}
]);
/* 搜索 */
const reload = (where?: RechargeOrderParam) => {
selection.value = [];
tableRef?.value?.reload({ where: where });
};
/* 打开编辑弹窗 */
const openEdit = (row?: RechargeOrder) => {
current.value = row ?? null;
showEdit.value = true;
};
/* 打开批量移动弹窗 */
const openMove = () => {
showMove.value = true;
};
/* 删除单个 */
const remove = (row: RechargeOrder) => {
const hide = message.loading('请求中..', 0);
removeRechargeOrder(row.rechargeOrderId)
.then((msg) => {
hide();
message.success(msg);
reload();
})
.catch((e) => {
hide();
message.error(e.message);
});
};
/* 批量删除 */
const removeBatch = () => {
if (!selection.value.length) {
message.error('请至少选择一条数据');
return;
}
Modal.confirm({
title: '提示',
content: '确定要删除选中的记录吗?',
icon: createVNode(ExclamationCircleOutlined),
maskClosable: true,
onOk: () => {
const hide = message.loading('请求中..', 0);
removeBatchRechargeOrder(selection.value.map((d) => d.rechargeOrderId))
.then((msg) => {
hide();
message.success(msg);
reload();
})
.catch((e) => {
hide();
message.error(e.message);
});
}
});
};
/* 查询 */
const query = () => {
loading.value = true;
};
/* 自定义行属性 */
const customRow = (record: RechargeOrder) => {
return {
// 行点击事件
onClick: () => {
// console.log(record);
},
// 行双击事件
onDblclick: () => {
openEdit(record);
}
};
};
query();
</script>
<script lang="ts">
export default {
name: 'RechargeOrder'
};
</script>
<style lang="less" scoped></style>