zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:bug修改

Browse Source
This commit is contained in:
dzc committed 2026-01-14 09:33:47 +08:00
1 parent 4072cba72f
commit e037e31f78
3 files changed
+158 -42
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/api/hard/hard-third-mi-order.ts
+8
View File
@@ -1,5 +1,13 @@
import request from "/@/utils/request"
export function refundOrder(params: any) {
return request({
url: "/hard/hard-third-mi-order/refund",
method: "get",
params,
})
}
export function refreshOrder(params: any) {
return request({
url: "/hard/hard-third-mi-order/refresh",
src/views/hard/canteen-product-total/index.vue
+2 -2
View File
@@ -15,8 +15,8 @@
:apiParams="{ parentIsNull: false, types: '1' }" />
</el-form-item>
<el-form-item style="width: 450px" label="创建时间" prop="createTimeList">
<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
type="daterange" />
<el-date-picker v-model="state.queryForm.createTimeList"
value-format="YYYY-MM-DD HH:mm:ss" type="daterange" />
</el-form-item>
<el-form-item>
<el-button icon="Search" type="primary" @click="doSearch">{{ $t("common.queryBtn")
src/views/hard/hard-third-mi-order/index.vue
+148 -40
View File
@@ -1,36 +1,67 @@
<template>
<div class="layout-padding">
<div class="layout-padding-auto layout-padding-view">
<el-row>
<div class="mb8" style="width: 100%">
<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
v-auth="'thirdmi_hardThirdMiOrder_add'">
新 增
</el-button>
<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'thirdmi_hardThirdMiOrder_del'"
@click="handleDelete(selectObjs)">
删除
</el-button>
<right-toolbar v-model:showSearch="showSearch" :export="'thirdmi_hardThirdMiOrder_export'"
@exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
@queryTable="getDataList"></right-toolbar>
</div>
</el-row>
<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
<el-row>
<el-form-item style="width: 250px" label="支付类型" prop="bizType">
<dict-select v-model="state.queryForm.bizType" dict-code="hard_third_mi_type" />
</el-form-item>
<el-form-item style="width: 250px" label="订单状态" prop="orderStatus">
<dict-select v-model="state.queryForm.orderStatus" dict-code="hard_third_mi_status" />
</el-form-item>
<el-form-item style="width: 450px" label="授权时间" prop="createOrderTimeList">
<el-date-picker v-model="state.queryForm.createOrderTimeList" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" />
</el-form-item>
<el-form-item style="width: 450px" label="下单时间" prop="payOrderTimeList">
<el-date-picker v-model="state.queryForm.payOrderTimeList" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" />
</el-form-item>
<el-form-item style="width: 450px" label="退款时间" prop="refundOrderTimeList">
<el-date-picker v-model="state.queryForm.refundOrderTimeList" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" />
</el-form-item>
<el-form-item>
<el-button icon="Search" type="primary" @click="getDataList">
{{ $t("common.queryBtn") }}
</el-button>
<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
</el-form-item>
</el-row>
</el-form>
<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 label="上架类型" width="150">
<el-table-column width="150" label="用户">
<template #default="{ row }">
<dict-tag :options="mi_type" :value="row.bizType" />
<dict-tag :options="hard_third_mi_type" :value="row.bizType" />
</template>
</el-table-column>
<el-table-column prop="userId" width="350" label="订单号">
<template #default="{ row }">
<div class="status">
<span>外部订单号:</span>
<span v-if="row.thirdOrderNo" style="text-align: left;">{{ row.thirdOrderNo }} </span>
<span class="color-danger" v-else>未授权</span>
</div>
<div class="status">
<span>内部订单号:</span>
<span v-if="row.outOrderNo" style="text-align: left;">{{ row.outOrderNo }} </span>
<span class="color-danger" v-else>未授权</span>
</div>
<div class="status">
<span>授权id:</span>
<span v-if="row.authId" style="text-align: left;">{{ row.authId }} </span>
<span class="color-danger" v-else>未授权</span>
</div>
<div class="status">
<span>流程id:</span>
<span v-if="row.flowId" style="text-align: left;">{{ row.flowId }} </span>
<span class="color-danger" v-else>未授权</span>
</div>
</template>
</el-table-column>
<el-table-column prop="userId" label="用户id" show-overflow-tooltip />
<el-table-column prop="authId" label="授权id" show-overflow-tooltip />
<el-table-column prop="flowId" label="流程id" show-overflow-tooltip />
<el-table-column prop="orderId" label="订单id" show-overflow-tooltip />
<el-table-column prop="outOrderNo" label="外部订单号" show-overflow-tooltip />
<el-table-column prop="thirdOrderNo" label="第三方订单号" show-overflow-tooltip />
<el-table-column label="时间" width="250">
<template #default="{ row }">
<div class="status">
@@ -49,19 +80,70 @@
</div>
</template>
</el-table-column>
<el-table-column prop="orderStatus" label="订单状态" show-overflow-tooltip />
<el-table-column prop="orgJson" label="原始json数据" show-overflow-tooltip />
<el-table-column label="操作" fixed="right" width="250">
<el-table-column prop="orderStatus" width="150" label="金额">
<template #default="{ row }">
<el-button icon="Refresh" text type="primary" @click="refreshOrder(row)">
同步
</el-button>
<el-button icon="Refresh" text type="primary" @click="payOrder(row)">
支付
</el-button>
<el-button icon="delete" text type="primary" @click="handleDelete([row.id])">
取消
</el-button>
<div class="status">
<span>押金:</span>
<span class="color-success">
{{ displayPrice(row.depositPrice, "元", 2) }}
</span>
</div>
<div class="status">
<span>订单金额:</span>
<span class="color-success">
{{ displayPrice(row.orderPrice, "元", 2) }}
</span>
</div>
<div class="status">
<span>支付金额:</span>
<span class="color-success">
{{ displayPrice(row.payPrice, "元", 2) }}
</span>
</div>
</template>
</el-table-column>
<el-table-column prop="orderStatus" width="250" label="设备信息">
<template #default="{ row }">
<div class="status">
<span>设备名</span>
<span>
{{ row.hardName }}
</span>
</div>
<div class="status">
<span>设备类型</span>
<span>
<dict-tag :options="hard_type" :value="row.hardType" />
</span>
</div>
</template>
</el-table-column>
<el-table-column prop="orderStatus" width="100" label="订单状态">
<template #default="{ row }">
<dict-tag :options="hard_third_mi_status" :value="row.orderStatus" />
</template>
</el-table-column>
<el-table-column prop="orgOrderJson" label="第三方订单json" width="180">
<template #default="{ row }">
<preview-json :json="row.orgOrderJson" />
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template #default="{ row }">
<div class="grid grid-cols-2 justify-evenly">
<el-button style="margin: 0px;" icon="Refresh" text type="primary" @click="refreshOrder(row)">
同步
</el-button>
<el-button style="margin: 0px;" icon="Goods" text type="primary" @click="payOrder(row)">
支付
</el-button>
<el-button style="margin: 0px;" icon="Stamp" text type="primary" @click="refund(row)">
退款
</el-button>
<el-button style="margin: 0px;" icon="delete" text type="primary" @click="handleDelete([row.id])">
取消
</el-button>
</div>
</template>
</el-table-column>
</el-table>
@@ -79,11 +161,12 @@ import { BasicTableProps, useTable } from "/@/hooks/table";
import * as thirdMiOrderApi from '/@/api/hard/hard-third-mi-order'
import { useMessage, useMessageBox } from "/@/hooks/message";
import { useDict } from '/@/hooks/dict';
import { displayPrice } from "/@/utils/formatMoney"
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
// 定义查询字典
const { mi_type } = useDict("mi_type")
const { hard_third_mi_type, hard_third_mi_status, hard_type } = useDict("hard_third_mi_type", "hard_third_mi_status", "hard_type")
// 定义变量内容
const formDialogRef = ref()
// 搜索变量
@@ -141,12 +224,35 @@ const refreshOrder = async (row: any) => {
// 支付
const payOrder = async (row: any) => {
try {
await useMessage().delConfirm("是否直接支付?")
} finally {
//
}
try {
await thirdMiOrderApi.payOrder({ id: row.id });
getDataList();
useMessage().success('支付成功');
} catch (err: any) {
useMessage().error(err.msg);
console.log("|支付|意外的错误:", err);
useMessage().error("支付失败");
}
}
// 退款
const refund = async (row: any) => {
try {
await useMessage().delConfirm("是否全额退款?")
} finally {
//
}
try {
await thirdMiOrderApi.refundOrder({ id: row.id });
getDataList();
useMessage().success('退款成功');
} catch (err: any) {
console.log("|退款|意外的错误:", err);
useMessage().error("退款失败");
}
}
@@ -172,15 +278,16 @@ const handleDelete = async (ids: string[]) => {
.status {
display: flex;
align-items: center;
margin-bottom: 2px;
font-size: 12px;
line-height: 20px;
span {
display: inline-block;
}
span:nth-child(1) {
min-width: 60px;
max-width: 100px;
min-width: 80px;
max-width: 80px;
text-align: left;
}
@@ -190,6 +297,7 @@ const handleDelete = async (ids: string[]) => {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
text-align: left;
}
}
</style>