gxwebsoft/mp-10584
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

feat(glt): 添加水票模板步长字段并优化订单编辑界面

Browse Source 
- 在 GltTicketTemplate 模型中新增 step 字段定义
- 为水票模板编辑界面添加步长输入组件
- 初始化表单中 step 字段默认值为 1
- 注释掉水票订单编辑界面中的冗余表单项
- 恢复订单编辑界面中修改按钮的显示
- 为经销商订单列表添加订单状态标签显示
- 在订单列表中增加订单状态列配置
- 注释掉开发环境配置中的服务器API URL
This commit is contained in:
赵忠林
2026-03-16 12:00:09 +08:00
parent 4b118675fd
commit 05b9be7c2e
6 changed files with 127 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@@ -1,6 +1,6 @@
VITE_APP_NAME=后台管理(开发环境) VITE_APP_NAME=后台管理(开发环境)
#VITE_API_URL=http://127.0.0.1:9200/api #VITE_API_URL=http://127.0.0.1:9200/api
VITE_SERVER_API_URL=http://127.0.0.1:8000/api #VITE_SERVER_API_URL=http://127.0.0.1:8000/api
#VITE_API_URL=https://glt-api.websoft.top/api #VITE_API_URL=https://glt-api.websoft.top/api

2
src/api/glt/gltTicketTemplate/model/index.ts
View File

@@ -28,6 +28,8 @@ export interface GltTicketTemplate {
releasePeriods?: number; releasePeriods?: number;
// 首期释放时机：0=支付成功当刻；1=下个月同日 // 首期释放时机：0=支付成功当刻；1=下个月同日
firstReleaseMode?: number; firstReleaseMode?: number;
// 步长
step?: number;
// 用户ID // 用户ID
userId?: number; userId?: number;
// 排序(数字越小越靠前) // 排序(数字越小越靠前)

154
src/views/glt/gltTicketOrder/components/gltTicketOrderEdit.vue
View File

@@ -19,40 +19,44 @@
styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' } styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
" "
> >
<a-form-item label="用户水票ID" name="userTicketId"> <!-- <a-form-item label="用户水票ID" name="userTicketId">-->
<a-input <!-- <a-input-->
allow-clear <!-- allow-clear-->
placeholder="请输入用户水票ID" <!-- placeholder="请输入用户水票ID"-->
v-model:value="form.userTicketId" <!-- v-model:value="form.userTicketId"-->
/> <!-- />-->
</a-form-item> <!-- </a-form-item>-->
<a-form-item label="门店ID" name="storeId"> <!-- <a-form-item label="门店ID" name="storeId">-->
<a-input <!-- <a-input-->
allow-clear <!-- allow-clear-->
placeholder="请输入门店ID" <!-- placeholder="请输入门店ID"-->
v-model:value="form.storeId" <!-- v-model:value="form.storeId"-->
/> <!-- />-->
</a-form-item> <!-- </a-form-item>-->
<a-form-item label="配送员" name="riderId"> <!-- <a-form-item label="配送员" name="riderId">-->
<a-input <!-- <a-input-->
allow-clear <!-- allow-clear-->
placeholder="请输入配送员" <!-- placeholder="请输入配送员"-->
v-model:value="form.riderId" <!-- v-model:value="form.riderId"-->
/> <!-- />-->
</a-form-item> <!-- </a-form-item>-->
<a-form-item label="仓库ID" name="warehouseId"> <!-- <a-form-item label="仓库ID" name="warehouseId">-->
<a-input <!-- <a-input-->
allow-clear <!-- allow-clear-->
placeholder="请输入仓库ID" <!-- placeholder="请输入仓库ID"-->
v-model:value="form.warehouseId" <!-- v-model:value="form.warehouseId"-->
/> <!-- />-->
</a-form-item> <!-- </a-form-item>-->
<a-form-item label="关联收货地址" name="addressId"> <!-- <a-form-item label="关联收货地址" name="addressId">-->
<a-input <!-- <a-input-->
allow-clear <!-- allow-clear-->
placeholder="请输入关联收货地址" <!-- placeholder="请输入关联收货地址"-->
v-model:value="form.addressId" <!-- v-model:value="form.addressId"-->
/> <!-- />-->
<!-- </a-form-item>-->
<a-form-item label="订单编号" name="orderNo">
{{ form.orderNo }}
</a-form-item> </a-form-item>
<a-form-item label="收货地址" name="address"> <a-form-item label="收货地址" name="address">
<a-input <a-input
@@ -62,54 +66,48 @@
/> />
</a-form-item> </a-form-item>
<a-form-item label="买家留言" name="buyerRemarks"> <a-form-item label="买家留言" name="buyerRemarks">
<a-input <a-textarea
allow-clear :rows="4"
:maxlength="200"
placeholder="请输入买家留言" placeholder="请输入买家留言"
v-model:value="form.buyerRemarks" v-model:value="form.buyerRemarks"
/> />
</a-form-item> </a-form-item>
<a-form-item label="用于统计" name="price"> <!-- <a-form-item label="用于统计" name="price">-->
<a-input <!-- <a-input-->
allow-clear <!-- allow-clear-->
placeholder="请输入用于统计" <!-- placeholder="请输入用于统计"-->
v-model:value="form.price" <!-- v-model:value="form.price"-->
/> <!-- />-->
</a-form-item> <!-- </a-form-item>-->
<a-form-item label="购买数量" name="totalNum"> <!-- <a-form-item label="购买数量" name="totalNum">-->
<a-input <!-- <a-input-->
allow-clear <!-- allow-clear-->
placeholder="请输入购买数量" <!-- placeholder="请输入购买数量"-->
v-model:value="form.totalNum" <!-- v-model:value="form.totalNum"-->
/> <!-- />-->
</a-form-item> <!-- </a-form-item>-->
<a-form-item label="用户ID" name="userId"> <!-- <a-form-item label="用户ID" name="userId">-->
<a-input <!-- <a-input-->
allow-clear <!-- allow-clear-->
placeholder="请输入用户ID" <!-- placeholder="请输入用户ID"-->
v-model:value="form.userId" <!-- v-model:value="form.userId"-->
/> <!-- />-->
</a-form-item> <!-- </a-form-item>-->
<a-form-item label="订单编号" name="orderNo"> <!-- <a-form-item label="备注" name="comments">-->
<a-input <!-- <a-textarea-->
allow-clear <!-- :rows="4"-->
placeholder="请输入订单编号" <!-- :maxlength="200"-->
v-model:value="form.orderNo" <!-- placeholder="请输入描述"-->
/> <!-- v-model:value="form.comments"-->
</a-form-item> <!-- />-->
<a-form-item label="备注" name="comments"> <!-- </a-form-item>-->
<a-textarea <!-- <a-form-item label="状态" name="status">-->
:rows="4" <!-- <a-radio-group v-model:value="form.status">-->
:maxlength="200" <!-- <a-radio :value="0">显示</a-radio>-->
placeholder="请输入描述" <!-- <a-radio :value="1">隐藏</a-radio>-->
v-model:value="form.comments" <!-- </a-radio-group>-->
/> <!-- </a-form-item>-->
</a-form-item>
<a-form-item label="状态" name="status">
<a-radio-group v-model:value="form.status">
<a-radio :value="0">显示</a-radio>
<a-radio :value="1">隐藏</a-radio>
</a-radio-group>
</a-form-item>
</a-form> </a-form>
</ele-modal> </ele-modal>
</template> </template>

4
src/views/glt/gltTicketOrder/index.vue
View File

@@ -117,8 +117,8 @@
</template> </template>
<template v-if="column.key === 'action'"> <template v-if="column.key === 'action'">
<a-space> <a-space>
<!-- <a @click="openEdit(record)">修改</a>--> <a @click="openEdit(record)">修改</a>
<!-- <a-divider type="vertical" />--> <a-divider type="vertical" />
<a-popconfirm <a-popconfirm
v-if="record.orderStatus == 6" v-if="record.orderStatus == 6"
title="确定要删除此记录吗？" title="确定要删除此记录吗？"

13
src/views/glt/gltTicketTemplate/components/gltTicketTemplateEdit.vue
View File

@@ -187,6 +187,18 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12">
<a-form-item label="步长" name="step">
<a-input-number
:min="1"
:max="99"
class="ele-fluid"
placeholder="步长"
v-model:value="form.step"
/>
</a-form-item>
</a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="排序" name="sortNumber"> <a-form-item label="排序" name="sortNumber">
<a-input-number <a-input-number
@@ -268,6 +280,7 @@
monthlyReleaseQty: 10, monthlyReleaseQty: 10,
releasePeriods: 0, releasePeriods: 0,
firstReleaseMode: 0, firstReleaseMode: 0,
step: 1,
userId: undefined, userId: undefined,
sortNumber: 100, sortNumber: 100,
comments: '', comments: '',

34
src/views/shop/shopDealerOrder/index.vue
View File

@@ -103,6 +103,32 @@
</div> </div>
</template> </template>
<template v-if="column.key === 'orderStatus'">
<a-space :size="6" wrap>
<!-- 订单状态 -->
<a-tag v-if="record.orderStatus === 0">未完成</a-tag>
<a-tag v-if="record.orderStatus === 1" color="green"
>已完成</a-tag
>
<a-tag v-if="record.orderStatus === 2">已关闭</a-tag>
<a-tag v-if="record.orderStatus === 3" color="red"
>关闭中</a-tag
>
<a-tag v-if="record.orderStatus === 4" color="red"
>退款申请中</a-tag
>
<a-tag v-if="record.orderStatus === 5" color="red"
>退款被拒绝</a-tag
>
<a-tag v-if="record.orderStatus === 6" color="orange"
>已退款</a-tag
>
<a-tag v-if="record.orderStatus === 7" color="pink"
>客户端申请退款</a-tag
>
</a-space>
</template>
<template v-if="column.key === 'createTime'"> <template v-if="column.key === 'createTime'">
<div class="flex flex-col"> <div class="flex flex-col">
<a-tooltip title="创建时间"> <a-tooltip title="创建时间">
@@ -282,7 +308,13 @@
key: 'createTime', key: 'createTime',
align: 'center', align: 'center',
width: 180 width: 180
} },
{
title: '订单状态',
dataIndex: 'orderStatus',
key: 'orderStatus',
align: 'center'
},
// { // {
// title: '操作', // title: '操作',
// key: 'action', // key: 'action',