This commit is contained in:
weipengfei 2024-06-12 09:59:38 +08:00
parent 48a001cf52
commit 1b0f7569b5
4 changed files with 17 additions and 16 deletions

View File

@ -23,7 +23,7 @@
<div class="mt-4 w-1/3">优惠券金额{{ datas.coupon_price }}</div>
<div class="mt-4 w-1/3">积分抵扣{{ datas.deduction_price }}</div>
<div class="mt-4 w-1/3">支付时间{{ datas.pay_time }}</div>
<div class="mt-4 w-1/3">支付方式{{ datas.pay_type }}</div>
<div class="mt-4 w-1/3 flex">支付方式<dict-value :options="dictData.pay_type" :value="datas.pay_type"></dict-value></div>
</div>
</div>
</div>
@ -31,10 +31,15 @@
<script lang="ts" setup name="orderInfo">
import type { PropType } from 'vue'
const props = defineProps({
datas: {
type: Object,
required: true
},
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})

View File

@ -15,7 +15,9 @@
</div>
<div class="flex flex-col">
<div style="color: gray;">支付方式</div>
<div style="color: black;">{{ formData.pay_type || '-' }}</div>
<div style="color: black;">
<dict-value :options="dictData.pay_type" :value="formData.pay_type"></dict-value>
</div>
</div>
<div class="flex flex-col flex-2">
<div style="color: gray;">支付时间</div>
@ -25,7 +27,7 @@
</div>
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" type="border-card">
<el-tab-pane label="订单信息" name="first">
<orderInfo :datas="formData"></orderInfo>
<orderInfo :datas="formData" :dictData="dictData"></orderInfo>
</el-tab-pane>
<el-tab-pane label="商品信息" name="second">
<storeTable :oid="formData.id" ref="storeRef"></storeTable>

View File

@ -19,16 +19,6 @@
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<!-- <el-button v-perms="['store_order.store_order/add']" type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button v-perms="['store_order.store_order/delete']" :disabled="!selectData.length"
@click="handleDelete(selectData)">
删除
</el-button> -->
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
@ -46,7 +36,11 @@
<el-table-column label="用户" prop="nickname" show-overflow-tooltip />
<el-table-column label="实际支付金额" prop="pay_price" show-overflow-tooltip />
<el-table-column label="支付时间" prop="pay_time" show-overflow-tooltip />
<el-table-column label="支付方式" prop="pay_type" show-overflow-tooltip />
<el-table-column label="支付方式" prop="pay_type" show-overflow-tooltip>
<template #default="{row}">
<dict-value :options="dictData.pay_type" :value="row.pay_type"></dict-value>
</template>
</el-table-column>
<el-table-column label="订单状态" prop="status_name" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
@ -68,7 +62,7 @@
</div>
</el-card>
<!-- <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" /> -->
<details-popup v-if="showDetails" ref="detailsRef" @success="getLists" @close="showDetails = false" />
<details-popup v-if="showDetails" ref="detailsRef" @success="getLists" @close="showDetails = false" :dictData="dictData" />
</div>
</template>

View File

@ -49,7 +49,7 @@
<el-switch v-model="formDataInfo.is_store" :active-value="1" :inactive-value="0" active-text="开启"
inactive-text="关闭" inline-prompt disabled />
</el-form-item>
<el-form-item label="快递配送" prop="is_send">
<el-form-item label="同城配送" prop="is_send">
<el-switch v-model="formDataInfo.is_send" :active-value="1" :inactive-value="0" active-text="开启"
inactive-text="关闭" inline-prompt />
</el-form-item>