This commit is contained in:
weiwei committed 2025-08-28 19:32:43 +08:00
commit 206dbedfd1
24 files changed
+933 -253

No files matched your search

+1 -1
View File
@@ -12,7 +12,7 @@ ENV = 'development'
# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期
# VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
# VITE_ADMIN_PROXY_PATH = http://localhost:9999/
VITE_ADMIN_PROXY_PATH = http://192.168.101.185:9999/ # 邓-本地
VITE_ADMIN_PROXY_PATH = http://192.168.101.185:9999 # 邓-本地
# VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上
# 图片访问基础地址
+40
View File
@@ -0,0 +1,40 @@
import request from "/@/utils/request"
export function fetchList(query?: Object) {
return request({
url: "/admin/sysUserCar/page",
method: "get",
params: query,
})
}
export function addObj(obj?: Object) {
return request({
url: "/admin/sysUserCar",
method: "post",
data: obj,
})
}
export function getObj(id?: string) {
return request({
url: "/admin/sysUserCar/" + id,
method: "get",
})
}
export function delObjs(ids?: Object) {
return request({
url: "/admin/sysUserCar",
method: "delete",
data: ids,
})
}
export function putObj(obj?: Object) {
return request({
url: "/admin/sysUserCar",
method: "put",
data: obj,
})
}
+8
View File
@@ -8,6 +8,14 @@ export function adminRefund(data?: Object) {
})
}
export function adminReinforceRefund(data?: Object) {
return request({
url: "/hard/hard-after-sale/admin-reinforce-refund",
method: "post",
data,
})
}
export function history(query?: Object) {
return request({
url: "/hard/hard-after-sale/history",
+42 -35
View File
@@ -1,57 +1,64 @@
import request from "/@/utils/request"
export function getCarByOrderId(query?: Object) {
return request({
url: '/hard/hard-car/order-id',
method: 'get',
params: query
})
return request({
url: "/hard/hard-car/order-id",
method: "get",
params: query,
})
}
export function refundCar(query?: Object) {
return request({
url: "/hard/hard-car/refund-car",
method: "get",
params: query,
})
}
export function pageJoin(query?: Object) {
return request({
url: '/hard/hard-car/page-join',
method: 'get',
params: query
})
return request({
url: "/hard/hard-car/page-join",
method: "get",
params: query,
})
}
export function fetchList(query?: Object) {
return request({
url: '/hard/hard-car/page',
method: 'get',
params: query
})
return request({
url: "/hard/hard-car/page",
method: "get",
params: query,
})
}
export function addObj(obj?: Object) {
return request({
url: '/hard/hard-car',
method: 'post',
data: obj
})
return request({
url: "/hard/hard-car",
method: "post",
data: obj,
})
}
export function getObj(id?: string) {
return request({
url: '/hard/hard-car/' + id,
method: 'get'
})
return request({
url: "/hard/hard-car/" + id,
method: "get",
})
}
export function delObjs(ids?: Object) {
return request({
url: '/hard/hard-car',
method: 'delete',
data: ids
})
return request({
url: "/hard/hard-car",
method: "delete",
data: ids,
})
}
export function putObj(obj?: Object) {
return request({
url: '/hard/hard-car',
method: 'put',
data: obj
})
return request({
url: "/hard/hard-car",
method: "put",
data: obj,
})
}
+2 -2
View File
@@ -203,13 +203,13 @@ export function useTable(options?: BasicTableProps) {
* 刷新后不跳转第一页,则入参 getDataList(false)
* @param refresh 是否刷新当前页码
*/
const getDataList = (refresh?: any) => {
const getDataList = async (refresh?: any) => {
// 如果需要刷新,则将state.pagination.current重置为1
if (refresh !== false) {
state.pagination!.current = 1
}
// 再次发起查询操作
query()
await query()
}
/**
+114
View File
@@ -0,0 +1,114 @@
<template>
<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
<el-row :gutter="24">
<el-col :span="24" class="mb20">
<el-form-item label="用户" prop="userId">
<select-user v-model="form.userId" placeholder="请输入用户ID" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="车牌号" prop="carNumber">
<el-input v-model="form.carNumber" placeholder="请输入车牌号" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="车辆类型" prop="carType">
<dict-select v-model="form.carType" dict-code="car_type" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
</span>
</template>
</el-dialog>
</template>
<script setup lang="ts" name="SysUserCarDialog">
import { useDict } from '/@/hooks/dict';
import { useMessage } from "/@/hooks/message";
import { getObj, addObj, putObj } from '/@/api/admin/sysUserCar'
import { rule } from '/@/utils/validate';
const emit = defineEmits(['refresh']);
// 定义变量内容
const dataFormRef = ref();
const visible = ref(false)
const loading = ref(false)
// 定义字典
const { car_type } = useDict("car_type")
// 提交表单数据
const form = reactive({
id: '',
userId: '',
carNumber: '',
carType: '',
enableStatus: '',
});
// 定义校验规则
const dataRules = ref({
userId: [{ required: true, message: '请选择用户', trigger: 'change' }],
carNumber: [{ required: true, message: '请输入车牌号', trigger: 'blur' }],
carType: [{ required: true, message: '请选择车辆类型', trigger: 'change' }],
})
// 打开弹窗
const openDialog = (id: string) => {
visible.value = true
form.id = ''
// 重置表单数据
nextTick(() => {
dataFormRef.value?.resetFields();
});
// 获取sysUserCar信息
if (id) {
form.id = id
getsysUserCarData(id)
}
};
// 提交
const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => { });
if (!valid) return false;
try {
loading.value = true;
form.id ? await putObj(form) : await addObj(form);
useMessage().success(form.id ? '修改成功' : '添加成功');
visible.value = false;
emit('refresh');
} catch (err: any) {
useMessage().error(err.msg);
} finally {
loading.value = false;
}
};
// 初始化表单数据
const getsysUserCarData = (id: string) => {
// 获取数据
loading.value = true
getObj(id).then((res: any) => {
Object.assign(form, res.data)
}).finally(() => {
loading.value = false
})
};
// 暴露变量
defineExpose({
openDialog
});
</script>
+161
View File
@@ -0,0 +1,161 @@
<template>
<div class="layout-padding">
<div class="layout-padding-auto layout-padding-view">
<el-row v-show="showSearch">
<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
<el-form-item style="width: 250px" label="用户" prop="userId">
<select-user v-model="state.queryForm.userId" clearable />
</el-form-item>
<el-form-item style="width: 250px" label="车牌号" prop="carNumber">
<el-input v-model="state.queryForm.carNumber" placeholder="请输入车牌号" />
</el-form-item>
<el-form-item style="width: 250px" label="车辆类型" prop="carType">
<dict-select v-model="state.queryForm.carType" dict-code="car_type" />
</el-form-item>
<el-form-item style="width: 250px" label="是否启用" prop="enableStatus">
<dict-select v-model="state.queryForm.enableStatus" dict-code="yes_no_type" />
</el-form-item>
<el-form-item>
<el-button icon="Search" type="primary" @click="getDataList">查询</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-row>
<el-row>
<div class="mb8" style="width: 100%">
<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
v-auth="'admin_sysUserCar_add'">
新 增
</el-button>
<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'admin_sysUserCar_del'"
@click="handleDelete(selectObjs)">
删除
</el-button>
<right-toolbar v-model:showSearch="showSearch" :export="'admin_sysUserCar_export'" @exportExcel="exportExcel"
class="ml10 mr20" style="float: right;" @queryTable="getDataList"></right-toolbar>
</div>
</el-row>
<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
@sort-change="sortChangeHandle">
<el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="80" />
<el-table-column prop="username" label="用户名" />
<el-table-column prop="userDeptName" label="部门" />
<el-table-column prop="carNumber" label="车牌号">
<template #default="{ row }">
<el-tag type="primary">{{ row.carNumber }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="carType" label="车辆类型">
<template #default="{ row }">
<dict-tag :options="car_type" :value="row.carType" />
</template>
</el-table-column>
<el-table-column prop="enableStatus" label="是否启用">
<template #default="{ row }">
<el-switch active-value="1" inactive-value="0" v-model="row.enableStatus"
@change="enableStatusChange(row)" />
</template>
</el-table-column>
<el-table-column label="操作" width="150">
<template #default="scope">
<el-button icon="edit-pen" text type="primary" v-auth="'admin_sysUserCar_edit'"
@click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
<el-button icon="delete" text type="primary" v-auth="'admin_sysUserCar_del'"
@click="handleDelete([scope.row.id])">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
</div>
<!-- 编辑、新增 -->
<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
</div>
</template>
<script setup lang="ts" name="systemSysUserCar">
import { BasicTableProps, useTable } from "/@/hooks/table";
import * as sysUserCarApi from "/@/api/admin/sysUserCar";
import { useMessage, useMessageBox } from "/@/hooks/message";
import { useDict } from '/@/hooks/dict';
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
// 定义查询字典
const { car_type } = useDict("car_type")
// 定义变量内容
const formDialogRef = ref()
// 搜索变量
const queryRef = ref()
const showSearch = ref(true)
// 多选变量
const selectObjs = ref([]) as any
const multiple = ref(true)
const state: BasicTableProps = reactive<BasicTableProps>({
queryForm: {},
pageList: sysUserCarApi.fetchList
})
// table hook
const {
getDataList,
currentChangeHandle,
sizeChangeHandle,
sortChangeHandle,
downBlobFile,
tableStyle
} = useTable(state)
// 清空搜索条件
const resetQuery = () => {
// 清空搜索条件
queryRef.value?.resetFields()
// 清空多选
selectObjs.value = []
getDataList()
}
// 导出excel
const exportExcel = () => {
downBlobFile('/admin/sysUserCar/export', Object.assign(state.queryForm, { ids: selectObjs }), 'sysUserCar.xlsx')
}
// 多选事件
const selectionChangHandle = (objs: { id: string }[]) => {
selectObjs.value = objs.map(({ id }) => id);
multiple.value = !objs.length;
};
// 删除操作
const handleDelete = async (ids: string[]) => {
try {
await useMessageBox().confirm('此操作将永久删除');
} catch {
return;
}
try {
await sysUserCarApi.delObjs(ids);
getDataList();
useMessage().success('删除成功');
} catch (err: any) {
useMessage().error(err.msg);
}
};
// 修改启用状态
async function enableStatusChange(row: any) {
try {
await sysUserCarApi.putObj(row)
getDataList()
useMessage().success("操作成功")
} catch (e) {
useMessage().error("操作错误")
}
}
</script>
+4 -10
View File
@@ -1,19 +1,13 @@
<template>
<el-dialog title="购物车" v-model="visible" :close-on-click-modal="false" draggable>
<el-table
:data="state.dataList"
v-loading="state.loading"
border
:cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle"
@sort-change="sortChangeHandle"
show-summary
:summary-method="getSummaries"
>
<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle" @sort-change="sortChangeHandle" show-summary
:summary-method="getSummaries">
<el-table-column label="商品名" align="center" prop="productName" />
<el-table-column label="商品图片" align="center" prop="code">
<template #default="{ row }">
<preview-image v-if="row.productPic" :src="row.productPic" />
<div v-else class="w-[50px] h-[50px]" />
</template>
</el-table-column>
<el-table-column label="商品价格" align="center" prop="productPrice">
@@ -41,14 +41,8 @@
</el-descriptions>
<el-descriptions :column="1" title="商品信息">
<el-descriptions-item labelClassName="no-colon">
<el-table
:data="state.dataList"
v-loading="state.loading"
border
:cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle"
@sort-change="sortChangeHandle"
>
<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle" @sort-change="sortChangeHandle">
<el-table-column label="商品名" align="center" prop="productName" />
<el-table-column label="商品图片" align="center" prop="code">
<template #default="{ row }">
@@ -75,16 +69,13 @@
<el-descriptions-item :column="1" label="退款状态: ">
<dict-tag :options="hard_sale_status" :value="globalData.afterSaleData.status" />
</el-descriptions-item>
<el-descriptions-item
:column="1"
<el-descriptions-item :column="1"
v-if="globalData.type == 'apply' && globalData.afterSaleData.status == 10"
v-auth="'hard_hardAfterSale_change'"
label="操作: "
label-class-name="no-colon"
>
v-auth="'hard_hardAfterSale_change'" label="操作: " label-class-name="no-colon">
<div class="flex justify-evenly">
<el-button type="primary" @click="agree"> 同意售后 </el-button>
<el-button type="danger" @click="refundRejectRef.openDialog(globalData.detail.id)"> 拒绝售后 </el-button>
<el-button type="danger" @click="refundRejectRef.openDialog(globalData.detail.id)"> 拒绝售后
</el-button>
</div>
</el-descriptions-item>
</el-descriptions>
@@ -1,129 +0,0 @@
<template>
<el-dialog title="后台退款" v-model="visible" width="30%" :close-on-click-modal="false" draggable>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px" v-loading="loading">
<el-row :gutter="24">
<el-col :span="24" class="mb20">
<el-form-item label="售后方式" prop="way">
<dict-select disabled v-model="form.way" dict-code="hard_after_sale_way" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="退款原因" prop="applyReason">
<el-select v-model="form.applyReason">
<el-option v-for="reason in state.setting.afterSaleRefundReasons" :key="reason" :label="reason" :value="reason" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="补充凭证图片" prop="applyPicUrls">
<upload-imgs v-model="form.applyPicUrls" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="相关描述" prop="applyDescription">
<el-input v-model="form.applyDescription" placeholder="请输入备注" type="textarea" :autosize="{ minRows: 6 }" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
</span>
</template>
</el-dialog>
</template>
<script setup lang="ts" name="admin-refund-dialog">
import { useMessage } from "/@/hooks/message"
import * as hardAfterSaleApi from "/@/api/hard/hard-after-sale"
import * as walletSettingApi from "/@/api/wallet/wallet-setting"
const emit = defineEmits(["refresh"])
// 定义变量内容
const dataFormRef = ref()
const visible = ref(false)
const loading = ref(false)
// 定义字典
// 提交表单数据
const form = reactive({
orderId: "",
way: "10",
applyReason: "",
applyPicUrls: "",
applyDescription: "",
})
const state = reactive<any>({
setting: {},
})
// 定义校验规则
const dataRules = ref({
way: [{ required: true, message: "请选择售后方式", trigger: "change" }],
applyReason: [{ required: true, message: "请选择退款原因", trigger: "change" }],
})
// 打开弹窗
const openDialog = (id: string) => {
visible.value = true
form.orderId = ""
// 重置表单数据
nextTick(() => {
dataFormRef.value?.resetFields()
})
// 获取hardwareOrder信息
if (id) {
form.orderId = id
gethardwareOrderData(id)
}
}
// 初始化表单数据
const gethardwareOrderData = async (id: string) => {
// 获取数据
loading.value = true
try {
const { data } = await walletSettingApi.getObj()
if (data.afterSaleRefundReasons) {
data.afterSaleRefundReasons = data.afterSaleRefundReasons?.split(",")
}
if (data.afterSaleReturnReasons) {
data.afterSaleReturnReasons = data.afterSaleReturnReasons?.split(",")
}
state.setting = data
} finally {
loading.value = false
}
}
// 提交
const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => {})
if (!valid) return false
try {
loading.value = true
await hardAfterSaleApi.adminRefund(form)
useMessage().success("退款成功")
visible.value = false
emit("refresh")
} catch (err: any) {
useMessage().error(err.msg)
} finally {
loading.value = false
}
}
// 暴露变量
defineExpose({
openDialog,
})
</script>
@@ -0,0 +1,101 @@
<template>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px">
<el-row :gutter="24">
<el-col :span="24" class="mb20">
<el-form-item label="售后方式" prop="way">
<dict-select disabled v-model="form.way" dict-code="hard_after_sale_way" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="退款原因" prop="applyReason">
<el-select v-model="form.applyReason">
<el-option v-for="reason in state.setting.afterSaleRefundReasons" :key="reason" :label="reason"
:value="reason" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="补充凭证图片" prop="applyPicUrls">
<upload-imgs v-model="form.applyPicUrls" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="相关描述" prop="applyDescription">
<el-input v-model="form.applyDescription" placeholder="请输入备注" type="textarea"
:autosize="{ minRows: 6 }" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</template>
<script setup lang="ts" name="RefundForm">
import { useMessage } from "/@/hooks/message"
import * as walletSettingApi from "/@/api/wallet/wallet-setting"
// 定义变量内容
const dataFormRef = ref()
// 提交表单数据
const form = reactive({
orderId: "",
way: "10",
applyReason: "",
applyPicUrls: "",
applyDescription: "",
})
const state = reactive<any>({
setting: {},
})
onMounted(() => {
getSetting()
})
// 定义校验规则
const dataRules = ref({
way: [{ required: true, message: "请选择售后方式", trigger: "change" }],
applyReason: [{ required: true, message: "请选择退款原因", trigger: "change" }],
})
// 初始化表单数据
const getSetting = async () => {
try {
const { data } = await walletSettingApi.getObj()
if (data.afterSaleRefundReasons) {
data.afterSaleRefundReasons = data.afterSaleRefundReasons?.split(",")
}
if (data.afterSaleReturnReasons) {
data.afterSaleReturnReasons = data.afterSaleReturnReasons?.split(",")
}
state.setting = data
} catch (error: any) {
console.log(error);
}
}
// 提交
const validate = async () => {
const valid = await dataFormRef.value.validate().catch(() => { })
if (!valid) {
if (!form.applyReason) {
useMessage().error("请选择退款原因")
}
return false
}
return form
}
const resetFields = async () => {
await dataFormRef.value.resetFields()
}
defineExpose({
validate,
resetFields
})
</script>
@@ -0,0 +1,121 @@
<template>
<el-dialog title="后台退款" v-model="visible" width="50%" :close-on-click-modal="false" draggable>
<el-tabs v-model="state.currentTab" class="demo-tabs" @tab-click="tabClick">
<el-tab-pane v-for="(v) in data.tabs" :key="v.name" :label="v.label" :name="v.name" />
</el-tabs>
<div class="container" v-loading="loading">
<refund-form ref="refundFormRef" v-show="state.currentTab === 'INFO'" />
<refund-table ref="refundTableRef" v-show="state.currentTab === 'CAR'" />
</div>
<template #footer>
<span class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
</span>
</template>
</el-dialog>
</template>
<script setup lang="ts" name="admin-refund-dialog">
import { useMessage } from "/@/hooks/message"
import * as hardAfterSaleApi from "/@/api/hard/hard-after-sale"
const RefundForm = defineAsyncComponent(() => import("./form.vue"))
const RefundTable = defineAsyncComponent(() => import("./table.vue"))
const emit = defineEmits(["refresh"])
const data = {
tabs: [
{
label: "退款信息",
name: "INFO",
},
{
label: "退款购物车",
name: "CAR",
},
]
}
const refundTableRef = ref()
const refundFormRef = ref()
// 定义变量内容
const visible = ref(false)
const loading = ref(false)
const state = reactive<any>({
currentTab: data.tabs[0].name,
setting: {},
orderId: "",
})
// 打开弹窗
const openDialog = (id: string) => {
visible.value = true
state.orderId = id
nextTick(() => {
refundTableRef.value?.getCarList(state.orderId)
refundFormRef.value?.resetFields()
})
}
function tabClick(e: any) {
nextTick(async () => {
loading.value = true
try {
await new Promise((resolve) => setTimeout(() => resolve(true), 250))
switch (e.paneName) {
case "CAR":
refundTableRef.value?.getCarList(state.orderId)
break
}
await new Promise((resolve) => setTimeout(() => resolve(true), 250))
} catch (error: any) {
console.log(error);
} finally {
loading.value = false
}
})
}
// 提交
const onSubmit = async () => {
// 校验
const formValidate = await refundFormRef.value?.validate()
if (formValidate === false) return
// 判断有没有选择退款商品
const tableValidate = await refundTableRef.value?.validate()
if (tableValidate === false) return
try {
loading.value = true
const _data = {
...formValidate,
orderId: state.orderId,
carList: tableValidate
}
await hardAfterSaleApi.adminReinforceRefund(_data)
useMessage().success("退款成功")
visible.value = false
emit("refresh")
} catch (err: any) {
useMessage().error(err.msg)
} finally {
loading.value = false
}
}
// 暴露变量
defineExpose({
openDialog,
})
</script>
<style>
.container {
min-height: 450px;
}
</style>
@@ -0,0 +1,273 @@
<template>
<div class="refund-table">
<el-descriptions :column="1" title="购物车商品">
<el-descriptions-item labelClassName="no-colon">
<el-table :data="state.dataList" border :cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle" @sort-change="sortChangeHandle" show-summary
:summary-method="getSummaries">
<el-table-column label="商品名" align="center" prop="productName" />
<el-table-column label="商品图片" align="center" prop="code">
<template #default="{ row }">
<preview-image v-if="row.productPic" :src="row.productPic" />
<div v-else class="w-[60px] h-[60px]" />
</template>
</el-table-column>
<el-table-column label="商品价格" align="center" prop="productPrice">
<template #default="{ row }">
<span>{{ displayPrice(row.productPrice) }}</span>
</template>
</el-table-column>
<el-table-column label="商品数量" align="center" prop="productCount" />
<el-table-column label="商品总额" align="center" prop="totalPrice">
<template #default="{ row }">
<span>{{ displayPrice(row.totalPrice) }}</span>
</template>
</el-table-column>
</el-table>
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="1" title="已退款商品">
<el-descriptions-item labelClassName="no-colon">
<el-table :data="refundSuccessList" border :cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle" @sort-change="sortChangeHandle" show-summary
:summary-method="getSummaries">
<el-table-column label="商品名" align="center" prop="productName" />
<el-table-column label="商品图片" align="center" prop="code">
<template #default="{ row }">
<preview-image v-if="row.productPic" :src="row.productPic" />
<div v-else class="w-[60px] h-[60px]" />
</template>
</el-table-column>
<el-table-column label="商品价格" align="center" prop="productPrice">
<template #default="{ row }">
<span>{{ displayPrice(row.productPrice) }}</span>
</template>
</el-table-column>
<el-table-column label="已退款商品数量" align="center" prop="productCount" />
<el-table-column label="已退款商品总额" align="center" prop="totalPrice">
<template #default="{ row }">
<span>{{ displayPrice(row.totalPrice) }}</span>
</template>
</el-table-column>
</el-table>
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="1" title="退款商品">
<template #extra>
<el-button type="primary" text @click="handleAllRefund">全部退款</el-button>
</template>
<el-descriptions-item labelClassName="no-colon">
<el-table :data="disposeDataList" border :cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle" @sort-change="sortChangeHandle" show-summary
:summary-method="getSummaries">
<el-table-column label="商品名" align="center" prop="productName" />
<el-table-column label="商品图片" align="center" prop="code">
<template #default="{ row }">
<preview-image v-if="row.productPic" :src="row.productPic" />
<div v-else class="w-[60px] h-[60px]" />
</template>
</el-table-column>
<el-table-column label="商品价格" align="center" prop="productPrice">
<template #default="{ row }">
<span>{{ displayPrice(row.productPrice) }}</span>
</template>
</el-table-column>
<el-table-column label="退款商品数量" align="center" prop="refundProductCount">
<template #default="{ row }">
<div class="w-full h-full">
<el-input-number size="small" v-if="row.productNature == 2"
v-model="row.refundProductCount" :min="0" :max="row.productCount" :step="0.1"
@change="handleRefundProductCount($event, row)" />
<el-input-number size="small" v-else v-model="row.refundProductCount" :min="0"
:max="row.productCount" @change="handleRefundProductCount($event, row)" />
<div class="h-4">
<div v-if="row.productCount <= row.refundProductCount" class="color-danger text-xs">
该商品已全部退款
</div>
</div>
</div>
</template>
</el-table-column>
<el-table-column label="退款商品总额" align="center" prop="refundTotalPrice">
<template #default="{ row }">
<span>{{ displayPrice(row.refundTotalPrice) }}</span>
</template>
</el-table-column>
</el-table>
</el-descriptions-item>
</el-descriptions>
</div>
</template>
<script setup lang="ts" name="RefundTable">
import { useMessage } from "/@/hooks/message"
import { BasicTableProps, useTable } from "/@/hooks/table"
import { displayPrice } from "/@/utils/formatMoney"
import * as hardCar from "/@/api/hard/hard-car"
const state: BasicTableProps = reactive<BasicTableProps>({
createdIsNeed: false,
queryForm: {},
pageList: hardCar.getCarByOrderId,
})
const refundSuccessList = ref<any>([])
const disposeDataList = ref<any>([])
// table hook
const { getDataList, sortChangeHandle, tableStyle } = useTable(state)
const getCarList = async (orderId: string) => {
state.queryForm.orderId = orderId
// 获取订单商品列表
await getDataList()
if (!state.dataList || !state.dataList.length) {
return
}
// 获取已退款的商品
const { data } = await hardCar.refundCar({ orderId })
if (!data || !data.length) {
disposeDataList.value = state.dataList.map((item) => {
if (!item) return null
return {
...item,
refundProductCount: 0,
refundTotalPrice: 0,
}
}).filter(Boolean)
return
}
refundSuccessList.value = data
// 计算出需要退款的商品
const refundViewList = [...state.dataList]
for (const item of refundViewList) {
const target = data.find((v: any) => v.productId == item.productId)
if (!target) continue
// 购物车商品 - 已退款商品
item.productCount = item.productCount - target.productCount
item.totalPrice = item.totalPrice - target.totalPrice
}
disposeDataList.value = refundViewList.map((item) => {
if (!item) return null
return {
...item,
refundProductCount: 0,
refundTotalPrice: 0,
}
}).filter(Boolean)
}
const handleRefundProductCount = (value: any, row: any) => {
const target = disposeDataList.value.find((item: any) => item.id == row.id)
if (!target) return
const { productPrice } = target
target.refundTotalPrice = productPrice * value
}
// 全部退款
const handleAllRefund = () => {
if (!state.dataList || !state.dataList.length) return
const _list = [...disposeDataList.value]
for (const v of _list) {
const target = state.dataList.find((item: any) => item.id == v.id)
if (!target) continue
v.refundProductCount = target.productCount
v.refundTotalPrice = target.totalPrice
}
disposeDataList.value = _list
}
const getSummaries = (param: any) => {
const { columns, data } = param
const totalColumns = ["productCount", "totalPrice", "totalPrice", "refundProductCount", "refundTotalPrice"]
const totalRow = Array.from({ length: columns.length }, () => "")
totalRow[0] = "合计"
columns.forEach((i: any, index: number) => {
if (totalColumns.includes(i.property)) {
const total = data
.filter((v: any) => v[i.property] != null)
.map((v: any) => Number(v[i.property]))
.reduce((pren: number, next: number) => pren + next, 0)
if (i.property.includes("Price")) {
totalRow[index] = displayPrice(total)
} else {
totalRow[index] = total
}
}
})
return totalRow
}
// 提交
const validate = async () => {
let valid = true
for (const v of disposeDataList.value) {
if (v.refundProductCount <= 0) {
valid = false
break
}
}
if (!valid) {
useMessage().error("退款商品列表不能为空")
return false
}
// 处理一下
return disposeDataList.value.map((item: any) => {
return {
...item,
productCount: item.refundProductCount,
totalPrice: item.refundTotalPrice,
}
})
}
// 暴露变量
defineExpose({
getCarList,
validate,
})
</script>
<style lang="scss" scoped>
.refund-table {
padding: 0 10px;
}
:deep(.el-descriptions) {
&:not(:nth-child(1)) {
margin-top: 20px;
}
.el-descriptions__title {
display: flex;
align-items: center;
&::before {
display: inline-block;
width: 3px;
height: 20px;
margin-right: 10px;
background-color: #409eff;
content: "";
}
}
.el-descriptions-item__container {
margin: 0 10px;
.no-colon {
margin: 0;
&::after {
content: "";
}
}
}
}
</style>
+4 -5
View File
@@ -54,7 +54,8 @@
</div>
<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
@sort-change="sortChangeHandle" :show-summary="false" :summary-method="getSummaries">
@sort-change="sortChangeHandle" :show-summary="false" :summary-method="getSummaries"
row-key="id">
<el-table-column type="selection" width="60" align="center" />
<el-table-column type="index" label="#" width="50" />
<el-table-column width="200" label="用户">
@@ -223,8 +224,7 @@
v-auth="'hard_hardwareOrder_edit'" @click="formDialogRef.openDialog(row.id)">
编辑
</el-button>
<el-button
v-if="!row.payRefundId && row.orderType !== '5' && !['5', '6', '8'].includes(row.payType)"
<el-button v-if="row.orderType !== '5' && !['5', '6', '8'].includes(row.payType)"
icon="stamp" text type="primary" v-auth="'hard_hardAfterSale_adminRefund'"
@click="adminRefundDailogRef.openDialog(row.id)">
退款
@@ -242,7 +242,6 @@
</template>
</DraggableDepTree>
</div>
<!-- 编辑、新增 -->
<transaction-list ref="transactionListRef" @refresh="getDataList(false)" />
<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
@@ -266,7 +265,7 @@ const { push } = useRouter()
// 引入组件
const FormDialog = defineAsyncComponent(() => import("./form.vue"))
const AdminRefundDialog = defineAsyncComponent(() => import("./admin-refund-dialog.vue"))
const AdminRefundDialog = defineAsyncComponent(() => import("./components/admin-refund-dialog/index.vue"))
const ShopCar = defineAsyncComponent(() => import("../components/shop-car.vue"))
const TransactionList = defineAsyncComponent(() => import("/@/views/wallet/components/transaction-list.vue"))
// 定义查询字典
@@ -131,10 +131,10 @@
</template>
<script setup lang="ts" name="MeetingBookingDialog">
import { useDict } from '/@/hooks/dict';
import { useMessage } from "/@/hooks/message";
import { getObj, addObj, putObj, getMeetingRoomTimeSlots, getMeetingRoomList } from '/@/api/integrated/meetingBooking'
import { rule } from '/@/utils/validate';
import { useDict } from '/src/hooks/dict';
import { useMessage } from "/src/hooks/message";
import { getObj, addObj, putObj, getMeetingRoomTimeSlots, getMeetingRoomList } from '/src/api/integrated/meetingBooking'
import { rule } from '/src/utils/validate';
import axios from 'axios'
import { ref, onMounted, watch } from 'vue'
import dayjs from 'dayjs'
@@ -67,10 +67,10 @@
</template>
<script setup lang="ts" name="systemMeetingBooking">
import { BasicTableProps, useTable } from "/@/hooks/table";
import { fetchList, delObjs } from "/@/api/integrated/meetingBooking";
import { useMessage, useMessageBox } from "/@/hooks/message";
import { useDict } from '/@/hooks/dict';
import { BasicTableProps, useTable } from "/src/hooks/table";
import { fetchList, delObjs } from "/src/api/integrated/meetingBooking";
import { useMessage, useMessageBox } from "/src/hooks/message";
import { useDict } from '/src/hooks/dict';
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
@@ -111,7 +111,7 @@ const resetQuery = () => {
// 导出excel
const exportExcel = () => {
downBlobFile('/integrated/meetingBooking/export', Object.assign(state.queryForm, { ids: selectObjs }), 'meetingBooking.xlsx')
downBlobFile('/integrated/meetingBooking/export', Object.assign(state.queryForm, { ids: selectObjs }), 'booking.xlsx')
}
// 多选事件
@@ -39,10 +39,10 @@
</template>
<script setup lang="ts" name="CleanUserDialog">
import { useDict } from '/@/hooks/dict';
import { useMessage } from "/@/hooks/message";
import { getObj, addObj, putObj } from '/@/api/integrated/cleanUser'
import { rule } from '/@/utils/validate';
import { useDict } from '/src/hooks/dict';
import { useMessage } from "/src/hooks/message";
import { getObj, addObj, putObj } from '/src/api/integrated/cleanUser'
import { rule } from '/src/utils/validate';
const emit = defineEmits(['refresh']);
// 定义变量内容
@@ -117,4 +117,4 @@ const getcleanUserData = (id: string) => {
defineExpose({
openDialog
});
</script>
</script>
@@ -32,7 +32,7 @@
@queryTable="getDataList"></right-toolbar>
</div>
</el-row>
<el-table :data="state.dataList" v-loading="state.loading" border
<el-table :data="state.dataList" v-loading="state.loading" border
:cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
@selection-change="selectionChangHandle"
@sort-change="sortChangeHandle">
@@ -60,10 +60,10 @@
</template>
<script setup lang="ts" name="systemCleanUser">
import { BasicTableProps, useTable } from "/@/hooks/table";
import { fetchList, delObjs } from "/@/api/integrated/cleanUser";
import { useMessage, useMessageBox } from "/@/hooks/message";
import { useDict } from '/@/hooks/dict';
import { BasicTableProps, useTable } from "/src/hooks/table";
import { fetchList, delObjs } from "/src/api/integrated/cleanUser";
import { useMessage, useMessageBox } from "/src/hooks/message";
import { useDict } from '/src/hooks/dict';
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
@@ -129,4 +129,4 @@ const handleDelete = async (ids: string[]) => {
useMessage().error(err.msg);
}
};
</script>
</script>
@@ -52,10 +52,10 @@
</template>
<script setup lang="ts" name="MeetingEquipmentDialog">
import { useDict } from '/@/hooks/dict';
import { useMessage } from "/@/hooks/message";
import { getObj, addObj, putObj } from '/@/api/integrated/meetingEquipment'
import { rule } from '/@/utils/validate';
import { useDict } from '/src/hooks/dict';
import { useMessage } from "/src/hooks/message";
import { getObj, addObj, putObj } from '/src/api/integrated/meetingEquipment'
import { rule } from '/src/utils/validate';
const emit = defineEmits(['refresh']);
// 定义变量内容
@@ -67,10 +67,10 @@
</template>
<script setup lang="ts" name="systemMeetingEquipment">
import { BasicTableProps, useTable } from "/@/hooks/table";
import { fetchList, delObjs } from "/@/api/integrated/meetingEquipment";
import { useMessage, useMessageBox } from "/@/hooks/message";
import { useDict } from '/@/hooks/dict';
import { BasicTableProps, useTable } from "/src/hooks/table";
import { fetchList, delObjs } from "/src/api/integrated/meetingEquipment";
import { useMessage, useMessageBox } from "/src/hooks/message";
import { useDict } from '/src/hooks/dict';
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
@@ -49,10 +49,10 @@
<el-col :span="12" class="mb20">
<el-form-item label="保洁信息" prop="cleanUserId">
<el-select v-model="form.cleanUserId" placeholder="请选择保洁人员" clearable>
<el-option
v-for="item in cleanUserOptions"
:key="item.id"
:label="item.name || item.label || item.cleanUserName"
<el-option
v-for="item in cleanUserOptions"
:key="item.id"
:label="item.name || item.label || item.cleanUserName"
:value="item.id || item.value"
/>
</el-select>
@@ -154,12 +154,12 @@
</template>
<script setup lang="ts" name="MeetingRoomDialog">
import { useDict } from '/@/hooks/dict';
import { useMessage } from "/@/hooks/message";
import { getObj, addObj, putObj } from '/@/api/integrated/meetingRoom'
import { fetchList } from '/@/api/integrated/meetingEquipment'
import { dropdown } from '/@/api/integrated/cleanUser'
import { rule } from '/@/utils/validate';
import { useDict } from '/src/hooks/dict';
import { useMessage } from "/src/hooks/message";
import { getObj, addObj, putObj } from '/src/api/integrated/meetingRoom'
import { fetchList } from '/src/api/integrated/meetingEquipment'
import { dropdown } from '/src/api/integrated/cleanUser'
import { rule } from '/src/utils/validate';
const emit = defineEmits(['refresh']);
// 定义变量内容
@@ -273,17 +273,17 @@ const handleCurrentChange = (val: number) => {
// 确认选择设备
const handleEquipmentConfirm = () => {
// 过滤掉已经存在的设备
const newEquipment = selectedEquipment.value.filter(selected =>
const newEquipment = selectedEquipment.value.filter(selected =>
!equipmentList.value.some(existing => existing.equipId === selected.id)
)
// 添加新选择的设备
equipmentList.value.push(...newEquipment.map(item => ({
equipId: item.id,
equipmentName: item.name,
quantity: 1
})))
equipmentDialogVisible.value = false
}
@@ -53,10 +53,10 @@
</template>
<script setup lang="ts" name="systemMeetingRoom">
import { BasicTableProps, useTable } from "/@/hooks/table";
import { fetchList, delObjs } from "/@/api/integrated/meetingRoom";
import { useMessage, useMessageBox } from "/@/hooks/message";
import { useDict } from '/@/hooks/dict';
import { BasicTableProps, useTable } from "/src/hooks/table";
import { fetchList, delObjs } from "/src/api/integrated/meetingRoom";
import { useMessage, useMessageBox } from "/src/hooks/message";
import { useDict } from '/src/hooks/dict';
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
@@ -33,10 +33,10 @@
</template>
<script setup lang="ts" name="MeetingRoomEquipmentDialog">
import { useDict } from '/@/hooks/dict';
import { useMessage } from "/@/hooks/message";
import { getObj, addObj, putObj } from '/@/api/integrated/meetingRoomEquipment'
import { rule } from '/@/utils/validate';
import { useDict } from '/src/hooks/dict';
import { useMessage } from "/src/hooks/message";
import { getObj, addObj, putObj } from '/src/api/integrated/meetingRoomEquipment'
import { rule } from '/src/utils/validate';
const emit = defineEmits(['refresh']);
// 定义变量内容
@@ -108,4 +108,4 @@ const getmeetingRoomEquipmentData = (id: string) => {
defineExpose({
openDialog
});
</script>
</script>
@@ -16,7 +16,7 @@
@queryTable="getDataList"></right-toolbar>
</div>
</el-row>
<el-table :data="state.dataList" v-loading="state.loading" border
<el-table :data="state.dataList" v-loading="state.loading" border
:cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
@selection-change="selectionChangHandle"
@sort-change="sortChangeHandle">
@@ -43,10 +43,10 @@
</template>
<script setup lang="ts" name="systemMeetingRoomEquipment">
import { BasicTableProps, useTable } from "/@/hooks/table";
import { fetchList, delObjs } from "/@/api/integrated/meetingRoomEquipment";
import { useMessage, useMessageBox } from "/@/hooks/message";
import { useDict } from '/@/hooks/dict';
import { BasicTableProps, useTable } from "/src/hooks/table";
import { fetchList, delObjs } from "/src/api/integrated/meetingRoomEquipment";
import { useMessage, useMessageBox } from "/src/hooks/message";
import { useDict } from '/src/hooks/dict';
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
@@ -112,4 +112,4 @@ const handleDelete = async (ids: string[]) => {
useMessage().error(err.msg);
}
};
</script>
</script>