|
@@ -62,25 +62,6 @@
|
|
class="!w-240px"
|
|
class="!w-240px"
|
|
/>
|
|
/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <!-- <el-form-item label="状态" prop="status">
|
|
|
|
- <el-select
|
|
|
|
- v-model="queryParams.status"
|
|
|
|
- placeholder="请选择状态"
|
|
|
|
- clearable
|
|
|
|
- class="!w-240px"
|
|
|
|
- >
|
|
|
|
- <el-option label="请选择字典生成" value="" />
|
|
|
|
- </el-select>
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="备注" prop="remark">
|
|
|
|
- <el-input
|
|
|
|
- v-model="queryParams.remark"
|
|
|
|
- placeholder="请输入备注"
|
|
|
|
- clearable
|
|
|
|
- @keyup.enter="handleQuery"
|
|
|
|
- class="!w-240px"
|
|
|
|
- />
|
|
|
|
- </el-form-item> -->
|
|
|
|
<el-form-item label="创建时间" prop="createTime">
|
|
<el-form-item label="创建时间" prop="createTime">
|
|
<el-date-picker
|
|
<el-date-picker
|
|
v-model="queryParams.createTime"
|
|
v-model="queryParams.createTime"
|
|
@@ -95,14 +76,7 @@
|
|
<el-form-item>
|
|
<el-form-item>
|
|
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
|
|
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
|
|
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
|
|
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
|
|
- <!-- <el-button
|
|
|
|
- type="primary"
|
|
|
|
- plain
|
|
|
|
- @click="openForm('create')"
|
|
|
|
- v-hasPermi="['menduner:system:redeem:create']"
|
|
|
|
- >
|
|
|
|
- <Icon icon="ep:plus" class="mr-5px" /> 新增
|
|
|
|
- </el-button>
|
|
|
|
|
|
+ <!--
|
|
<el-button
|
|
<el-button
|
|
type="success"
|
|
type="success"
|
|
plain
|
|
plain
|
|
@@ -119,21 +93,17 @@
|
|
<!-- 列表 -->
|
|
<!-- 列表 -->
|
|
<ContentWrap>
|
|
<ContentWrap>
|
|
<el-table v-loading="loading" :data="list" :stripe="true">
|
|
<el-table v-loading="loading" :data="list" :stripe="true">
|
|
- <!-- <el-table-column label="id" align="center" prop="id" /> -->
|
|
|
|
<el-table-column label="商品名" align="center" prop="name" />
|
|
<el-table-column label="商品名" align="center" prop="name" />
|
|
- <!-- <el-table-column label="url" align="center" prop="url" /> -->
|
|
|
|
<el-table-column label="商品图片" align="center" min-width="80" prop="url">
|
|
<el-table-column label="商品图片" align="center" min-width="80" prop="url">
|
|
<template #default="scope">
|
|
<template #default="scope">
|
|
<img :src="scope.row.url" alt="" class="h-70px" />
|
|
<img :src="scope.row.url" alt="" class="h-70px" />
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column label="兑换积分" align="center" prop="point" />
|
|
<el-table-column label="兑换积分" align="center" prop="point" />
|
|
- <!-- <el-table-column label="用户id" align="center" prop="userId" /> -->
|
|
|
|
<el-table-column label="联系人姓名" align="center" prop="contactName" />
|
|
<el-table-column label="联系人姓名" align="center" prop="contactName" />
|
|
<el-table-column label="联系电话/收货人电话" align="center" prop="contactPhone" />
|
|
<el-table-column label="联系电话/收货人电话" align="center" prop="contactPhone" />
|
|
<el-table-column label="联系地址" align="center" prop="contactAddress" />
|
|
<el-table-column label="联系地址" align="center" prop="contactAddress" />
|
|
- <!-- <el-table-column label="状态" align="center" prop="status" /> -->
|
|
|
|
- <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
|
|
|
|
|
|
+ <el-table-column label="订单编号" align="center" prop="orderNo" />
|
|
<el-table-column
|
|
<el-table-column
|
|
label="创建时间"
|
|
label="创建时间"
|
|
align="center"
|
|
align="center"
|
|
@@ -141,9 +111,16 @@
|
|
:formatter="dateFormatter"
|
|
:formatter="dateFormatter"
|
|
width="180px"
|
|
width="180px"
|
|
/>
|
|
/>
|
|
- <!-- <el-table-column label="操作" align="center">
|
|
|
|
|
|
+ <el-table-column label="操作" align="center">
|
|
<template #default="scope">
|
|
<template #default="scope">
|
|
<el-button
|
|
<el-button
|
|
|
|
+ link
|
|
|
|
+ type="primary"
|
|
|
|
+ @click="uploadOrderNo(scope.row.id)"
|
|
|
|
+ >
|
|
|
|
+ {{ scope.row.orderNo ? '修改订单编号' : '上传订单编号'}}
|
|
|
|
+ </el-button>
|
|
|
|
+ <!-- <el-button
|
|
link
|
|
link
|
|
type="primary"
|
|
type="primary"
|
|
@click="openForm('update', scope.row.id)"
|
|
@click="openForm('update', scope.row.id)"
|
|
@@ -158,9 +135,9 @@
|
|
v-hasPermi="['menduner:system:redeem:delete']"
|
|
v-hasPermi="['menduner:system:redeem:delete']"
|
|
>
|
|
>
|
|
删除
|
|
删除
|
|
- </el-button>
|
|
|
|
|
|
+ </el-button> -->
|
|
</template>
|
|
</template>
|
|
- </el-table-column> -->
|
|
|
|
|
|
+ </el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
<!-- 分页 -->
|
|
<!-- 分页 -->
|
|
<Pagination
|
|
<Pagination
|
|
@@ -173,6 +150,8 @@
|
|
|
|
|
|
<!-- 表单弹窗:添加/修改 -->
|
|
<!-- 表单弹窗:添加/修改 -->
|
|
<!-- <RedeemForm ref="formRef" @success="getList" /> -->
|
|
<!-- <RedeemForm ref="formRef" @success="getList" /> -->
|
|
|
|
+
|
|
|
|
+ <UploadOrderNo ref="uploadOrderNoRef" @success="getList" />
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script setup lang="ts">
|
|
<script setup lang="ts">
|
|
@@ -180,6 +159,7 @@ import { dateFormatter } from '@/utils/formatTime'
|
|
// import download from '@/utils/download'
|
|
// import download from '@/utils/download'
|
|
import { RedeemApi, RedeemVO } from '@/api/menduner/system/redeem'
|
|
import { RedeemApi, RedeemVO } from '@/api/menduner/system/redeem'
|
|
// import RedeemForm from './RedeemForm.vue'
|
|
// import RedeemForm from './RedeemForm.vue'
|
|
|
|
+import UploadOrderNo from './uploadOrderNo.vue'
|
|
|
|
|
|
/** 兑换 列表 */
|
|
/** 兑换 列表 */
|
|
defineOptions({ name: 'Redeem' })
|
|
defineOptions({ name: 'Redeem' })
|
|
@@ -230,6 +210,12 @@ const resetQuery = () => {
|
|
handleQuery()
|
|
handleQuery()
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+/** 上传订单编号 */
|
|
|
|
+const uploadOrderNoRef = ref()
|
|
|
|
+const uploadOrderNo = (id: number) => {
|
|
|
|
+ uploadOrderNoRef.value.open(id)
|
|
|
|
+}
|
|
|
|
+
|
|
/** 添加/修改操作 */
|
|
/** 添加/修改操作 */
|
|
// const formRef = ref()
|
|
// const formRef = ref()
|
|
// const openForm = (type: string, id?: number) => {
|
|
// const openForm = (type: string, id?: number) => {
|