Skip to content

phsl / admin

Go to a project
Commit e8d0e3b0 by Jony.L
Options

算力资源重构-算力资源SKU管理修改1.0

parent 1f847553
Showing with 74 additions and 22 deletions
src/utils/dict.ts
...@@ -179,6 +179,8 @@ export enum DICT_TYPE { ...@@ -179,6 +179,8 @@ export enum DICT_TYPE {
COMPUTE_RESOURCE_SPU_STATUS = 'compute_resource_spu_status', COMPUTE_RESOURCE_SPU_STATUS = 'compute_resource_spu_status',
COMPUTE_RESOURCE_CONFIG_CATEGORY = 'compute_resource_config_category', COMPUTE_RESOURCE_CONFIG_CATEGORY = 'compute_resource_config_category',
COMPUTE_RESOURCE_DURATION = 'compute_resource_duration', COMPUTE_RESOURCE_DURATION = 'compute_resource_duration',
COMPUTE_RESOURCE_ORDER_STATUS = 'compute_resource_order_status',
COMPUTE_RESOURCE_REFUND_STATUS = 'compute_resource_refund_status',
// ========== MALL - 商品模块 ========== // ========== MALL - 商品模块 ==========
PRODUCT_SPU_STATUS = 'product_spu_status', //商品状态 PRODUCT_SPU_STATUS = 'product_spu_status', //商品状态
......
src/views/compute/resourceorder/index.vue
...@@ -44,29 +44,34 @@ ...@@ -44,29 +44,34 @@
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="订单状态：0=待支付,1=已支付,2=已取消" prop="status"> <el-form-item label="订单状态" prop="status">
<el-select <el-select
v-model="queryParams.status" v-model="queryParams.status"
placeholder="请选择订单状态：0=待支付,1=已支付,2=已取消" placeholder="请选择订单状态"
clearable clearable
class="!w-240px" class="!w-240px"
> >
<el-option label="请选择字典生成" value="" /> <el-option
v-for="dict in getIntDictOptions(DICT_TYPE.COMPUTE_RESOURCE_ORDER_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="市场价格(分)" prop="marketPrice"> <el-form-item label="市场价格" prop="marketPrice">
<el-input <el-input
v-model="queryParams.marketPrice" v-model="queryParams.marketPrice"
placeholder="请输入市场价格(分)" placeholder="请输入市场价格"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="实付金额(分)" prop="paymentPrice"> <el-form-item label="实付金额" prop="paymentPrice">
<el-input <el-input
v-model="queryParams.paymentPrice" v-model="queryParams.paymentPrice"
placeholder="请输入实付金额(分)" placeholder="请输入实付金额"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px" class="!w-240px"
...@@ -143,14 +148,19 @@ ...@@ -143,14 +148,19 @@
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="算力资源状态：[0]未启用,[1]使用中,[2]已释放" prop="resourceStatus"> <el-form-item label="算力资源状态" prop="resourceStatus">
<el-select <el-select
v-model="queryParams.resourceStatus" v-model="queryParams.resourceStatus"
placeholder="请选择算力资源状态：[0]未启用,[1]使用中,[2]已释放" placeholder="请选择算力资源状态"
clearable clearable
class="!w-240px" class="!w-240px"
> >
<el-option label="请选择字典生成" value="" /> <el-option
v-for="dict in getIntDictOptions(DICT_TYPE.COMPUTE_RESOURCE_SPU_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="退款状态" prop="refundStatus"> <el-form-item label="退款状态" prop="refundStatus">
...@@ -160,7 +170,12 @@ ...@@ -160,7 +170,12 @@
clearable clearable
class="!w-240px" class="!w-240px"
> >
<el-option label="请选择字典生成" value="" /> <el-option
v-for="dict in getIntDictOptions(DICT_TYPE.COMPUTE_RESOURCE_REFUND_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="退款金额" prop="refundPrice"> <el-form-item label="退款金额" prop="refundPrice">
...@@ -172,14 +187,19 @@ ...@@ -172,14 +187,19 @@
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="开票状态：[0]未开 [1]开票中 [2]已开票" prop="invoiceStatus"> <el-form-item label="开票状态" prop="invoiceStatus">
<el-select <el-select
v-model="queryParams.invoiceStatus" v-model="queryParams.invoiceStatus"
placeholder="请选择开票状态：[0]未开 [1]开票中 [2]已开票" placeholder="请选择开票状态"
clearable clearable
class="!w-240px" class="!w-240px"
> >
<el-option label="请选择字典生成" value="" /> <el-option
v-for="dict in getIntDictOptions(DICT_TYPE.TRADE_INVOICE_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="发票链接" prop="invoiceUrl"> <el-form-item label="发票链接" prop="invoiceUrl">
...@@ -249,11 +269,23 @@ ...@@ -249,11 +269,23 @@
<el-table-column label="订单ID" align="center" prop="id" /> <el-table-column label="订单ID" align="center" prop="id" />
<el-table-column label="下单用户ID" align="center" prop="userId" /> <el-table-column label="下单用户ID" align="center" prop="userId" />
<el-table-column label="算力资源SKU ID" align="center" prop="skuId" /> <el-table-column label="算力资源SKU ID" align="center" prop="skuId" />
<el-table-column label="算力资源名称（下单时快照）" align="center" prop="spuName" /> <el-table-column label="算力资源名称" align="center" prop="spuName" />
<el-table-column label="订单编号" align="center" prop="orderNo" /> <el-table-column label="订单编号" align="center" prop="orderNo" />
<el-table-column label="订单状态：0=待支付,1=已支付,2=已取消" align="center" prop="status" /> <el-table-column label="订单状态" align="center" prop="status">
<el-table-column label="市场价格(分)" align="center" prop="marketPrice" /> <template #default="scope">
<el-table-column label="实付金额(分)" align="center" prop="paymentPrice" /> <dict-tag :type="DICT_TYPE.COMPUTE_RESOURCE_ORDER_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="市场价格" align="center" prop="marketPrice">
<template #default="{ row }">
¥{{ fenToYuan(row.marketPrice) }}
</template>
</el-table-column>
<el-table-column label="实付金额" align="center" prop="paymentPrice">
<template #default="{ row }">
¥{{ fenToYuan(row.paymentPrice) }}
</template>
</el-table-column>
<el-table-column label="支付订单编号" align="center" prop="payOrderId" /> <el-table-column label="支付订单编号" align="center" prop="payOrderId" />
<el-table-column <el-table-column
label="支付时间" label="支付时间"
...@@ -285,10 +317,26 @@ ...@@ -285,10 +317,26 @@
width="180px" width="180px"
/> />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="算力资源状态：[0]未启用,[1]使用中,[2]已释放" align="center" prop="resourceStatus" /> <el-table-column label="算力资源状态" align="center" prop="resourceStatus">
<el-table-column label="退款状态" align="center" prop="refundStatus" /> <template #default="scope">
<el-table-column label="退款金额" align="center" prop="refundPrice" /> <dict-tag :type="DICT_TYPE.COMPUTE_RESOURCE_SPU_STATUS" :value="scope.row.resourceStatus" />
<el-table-column label="开票状态：[0]未开 [1]开票中 [2]已开票" align="center" prop="invoiceStatus" /> </template>
</el-table-column>
<el-table-column label="退款状态" align="center" prop="refundStatus">
<template #default="scope">
<dict-tag :type="DICT_TYPE.COMPUTE_RESOURCE_REFUND_STATUS" :value="scope.row.refundStatus" />
</template>
</el-table-column>
<el-table-column label="退款金额" align="center" prop="refundPrice">
<template #default="{ row }">
¥{{ fenToYuan(row.refundPrice) }}
</template>
</el-table-column>
<el-table-column label="开票状态" align="center" prop="invoiceStatus">
<template #default="scope">
<dict-tag :type="DICT_TYPE.TRADE_INVOICE_STATUS" :value="scope.row.invoiceStatus" />
</template>
</el-table-column>
<el-table-column label="发票链接" align="center" prop="invoiceUrl" /> <el-table-column label="发票链接" align="center" prop="invoiceUrl" />
<el-table-column <el-table-column
label="创建时间" label="创建时间"
...@@ -337,6 +385,8 @@ import { dateFormatter } from '@/utils/formatTime' ...@@ -337,6 +385,8 @@ import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download' import download from '@/utils/download'
import { ResourceOrderApi, ResourceOrder } from '@/api/compute/resourceorder' import { ResourceOrderApi, ResourceOrder } from '@/api/compute/resourceorder'
import ResourceOrderForm from './ResourceOrderForm.vue' import ResourceOrderForm from './ResourceOrderForm.vue'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { fenToYuan } from '@/utils'
/** 算力资源订单 列表 */ /** 算力资源订单 列表 */
defineOptions({ name: 'ResourceOrder' }) defineOptions({ name: 'ResourceOrder' })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment