From 04be125365bfd254166072f75da87e406f633ba3 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 09 一月 2025 18:36:56 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2
---
pages/order/list/_id.vue | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/pages/order/list/_id.vue b/pages/order/list/_id.vue
index 2307275..d19da68 100644
--- a/pages/order/list/_id.vue
+++ b/pages/order/list/_id.vue
@@ -361,11 +361,26 @@
span: 24,
readonly: true,
},
+ {
+ label: '提交时间：',
+ id: 'checkTime',
+ type: 'input',
+ span: 24,
+ readonly: true,
+ },
]
const dialogAuditForm = [
{
label: '审核结果：',
id: 'auditStatusStr',
+ type: 'input',
+ hidden: (row) => !row.auditStatusStr,
+ span: 24,
+ readonly: true,
+ },
+ {
+ label: '审核时间：',
+ id: 'auditTime',
type: 'input',
hidden: (row) => !row.auditStatusStr,
span: 24,
@@ -397,6 +412,8 @@
{ label: '合伙人：', id: 'partnerName', type: 'input' },
{ label: '库区：', id: 'warehouseName', type: 'input' },
{ label: '库位：', id: 'warehouseLocationCode', type: 'input' },
+ { label: '特殊需求：', id: 'specialNeedsStr', type: 'input' },
+ { label: '快递号：', id: 'deliveryNo', type: 'input' },
{
label: '备注：',
id: 'remarks',
@@ -412,6 +429,18 @@
type: 'row',
items: [
{
+ label: '优惠券类型：',
+ id: 'couponDiscountTypeName',
+ type: 'input',
+ hidden: (row) => !row.memberCouponAmount,
+ },
+ {
+ label: '使用条件：',
+ id: 'minOrderAmount',
+ type: 'input',
+ hidden: (row) => !row.memberCouponAmount,
+ },
+ {
label: '优惠券名称：',
id: 'memberCouponName',
type: 'input',
--
Gitblit v1.9.3