From 746c671538f8f0e220d483b72b25884f76b4cfda Mon Sep 17 00:00:00 2001 From: lzhizhao <790086754@qq.com> Date: Thu, 5 Jun 2025 16:33:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A2=84=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=AE=80=E5=8D=95=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/presale/order/index.vue | 460 ++++++------------ .../presale/order/popup/view-details.vue | 459 ++++++++--------- 2 files changed, 343 insertions(+), 576 deletions(-) diff --git a/src/views/modules/presale/order/index.vue b/src/views/modules/presale/order/index.vue index cb8d926..47925b9 100644 --- a/src/views/modules/presale/order/index.vue +++ b/src/views/modules/presale/order/index.vue @@ -1,370 +1,209 @@ - - - - -
- + + + + + + + + + + + + + + + + + + + + + +
+
+ +
- diff --git a/src/views/modules/presale/order/popup/view-details.vue b/src/views/modules/presale/order/popup/view-details.vue index 6965be0..48277c4 100644 --- a/src/views/modules/presale/order/popup/view-details.vue +++ b/src/views/modules/presale/order/popup/view-details.vue @@ -15,183 +15,203 @@ class="demo-ruleForm" > - - - - - - - - + + + + {{ + ruleForm.preSaleStage === 1 + ? '已付定金' + : ruleForm.preSaleStage === 2 + ? '已付尾款' + : '待付定金' + }} + + + + + {{ ruleForm.orderNo }} + + + + {{ ruleForm.unitOrderNo }} + + + + {{ ruleForm.productCount }} + - - + + + {{ ruleForm.totalMoney }} + - - - - 是 + + {{ ruleForm.deliveryMoney }} + - 否 + + {{ ruleForm.couponMoney }} + - - 选择是，用户可在付尾款前申请退定金（申请后自动退，无需审核），或付尾款时间结束后系统自动退定金 - - - + + + + + {{ ruleForm.payTime }} + + + + {{ ruleForm.predictDeliveryTime }} + + + + {{ ruleForm.predictIncome }} + + + + + + {{ ruleForm.distance }} + + + + {{ ruleForm.predictAutoCancelTime }} + + + + {{ ruleForm.remark }} + + + + + + {{ ruleForm.packageMoney }} + + + + {{ ruleForm.platformMoney }} + + + + {{ ruleForm.completePrepareTime }} + + + + + + {{ ruleForm.startDeliveryTime }} + + + + {{ ruleForm.completeDeliveryTime }} + + + + {{ ruleForm.createTime }} + + + + + + {{ ruleForm.pickTime }} + + + + {{ ruleForm.completeTime }} + + + + +
- 已选择商品 + 订单商品
-
- 商品ID:{{ ruleForm.productId }} - 商品名称:{{ ruleForm.name }} -
- + + + + - - - - - + + - - - - - - - - - -
-
@@ -203,51 +223,31 @@ import { debounce, cloneDeep } from 'lodash' export default { components: {}, - props: { - marketId: { - type: String, - default: '' - }, - shopId: { - type: String, - default: '' - } - }, + props: {}, data() { return { isAdd: true, //表格属性 modalConfig: { - title: '查看预售', + title: '订单详情', show: false, width: '1200px', fullscreen: true }, modalData: {}, - ruleForm: { - productList: [], - isRefundEarnestMoney: 1 //定金可退 1是 0 - }, - pickerOptions: { - disabledDate(time) { - return time.getTime() < Date.now() - } - }, - orderTime: [], //订单支付时间 - arrears: [], //尾款时间 - delivery: [], //发货时间 + ruleForm: {}, tableData: [] } }, watch: { - 'modalConfig.show'(newVal) { - if (newVal) { - //关闭弹窗清空校验 - setTimeout(() => { - this.$refs.ruleForm.resetFields() - }) - } - } + // "modalConfig.show"(newVal) { + // if (newVal) { + // //关闭弹窗清空校验 + // setTimeout(() => { + // this.$refs.ruleForm.resetFields(); + // }); + // } + // }, }, methods: { queryTableData(pageNo, pageSize) {}, @@ -262,109 +262,38 @@ export default { } return { add: () => { - this.orderTime = [] - this.arrears = [] - this.delivery = [] - this.ruleForm = { - startTime: '', - endTime: '', - balancePaymentStartTime: '', - balancePaymentEndTime: '', - estimatedStartDeliveryTime: '', - estimatedEndDeliveryTime: '', - productList: [], - isRefundEarnestMoney: 1 //定金可退 1是 0 - } - this.modalConfig.title = '新增预售' + this.modalConfig.title = '订单详情' this.isAdd = true }, update: () => { - this.modalConfig.title = '查看预售' + this.modalConfig.title = '订单详情' this.isAdd = false } } }, init(row) { - console.log(row.startTime, row.endTime) - this.orderTime = [row.startTime, row.endTime] - this.arrears = [row.balancePaymentStartTime, row.balancePaymentEndTime] - this.delivery = [ - row.estimatedStartDeliveryTime, - row.estimatedEndDeliveryTime - ] - ;(this.ruleForm = { - productId: row.id, - advanceSellId: row.advanceSellId, - startTime: row.startTime, - name: row.name, - endTime: row.endTime, - balancePaymentStartTime: row.balancePaymentStartTime, - balancePaymentEndTime: row.balancePaymentEndTime, - estimatedStartDeliveryTime: row.estimatedStartDeliveryTime, - estimatedEndDeliveryTime: row.estimatedEndDeliveryTime, - isRefundEarnestMoney: Number(row.isRefundEarnestMoney), - productSpecificationList: row.productSpecificationList - }), - console.log(this.orderTime, this.arrears, this.delivery) - - // this.ruleForm = row; - }, - //订单支付时间 - getOrderTime(e) { - if (e) { - console.log(e) - this.ruleForm.startTime = e[0] - this.ruleForm.endTime = e[1] - } else { - this.ruleForm.startTime = '' - this.ruleForm.endTime = '' - } - }, - //尾款支付时间 - getArrearsTime(e) { - if (e) { - console.log(e) - this.ruleForm.balancePaymentStartTime = e[0] - this.ruleForm.balancePaymentEndTime = e[1] - } else { - this.ruleForm.balancePaymentStartTime = '' - this.ruleForm.balancePaymentEndTime = '' - } - }, - //发货时间 - deliveryTime(e) { - if (e) { - console.log(e) - this.ruleForm.estimatedStartDeliveryTime = e[0] - this.ruleForm.estimatedEndDeliveryTime = e[1] - } else { - this.ruleForm.estimatedStartDeliveryTime = '' - this.ruleForm.estimatedEndDeliveryTime = '' - } - }, - selectProduct() { - console.log('选择商品', this.marketId, this.shopId) - this.$nextTick(() => { - this.$refs.commodity.toggle().add({ - marketId: this.marketId, - shopId: this.shopId - }) - }) + console.log(row) + this.ruleForm = row }, handleSelectionChange(e) { console.log(e) }, - getProduct(row) { - this.ruleForm.productList = row.map(item => { - return { - productId: item.id, - name: item.name, - productSpecificationList: item.productSpecificationList - } - }) - console.log(this.ruleForm.productList, this.ruleForm.productList.length) - - console.log('获取商品') + getRefundStatus(val) { + if (val == 0) { + return '正常' + } else if (val == 1) { + return '退款中' + } else if (val == 2) { + return '完全退款' + } else if (val == 3) { + return '部分退款' + } else if (val == 4) { + return '拒绝用户退款' + } else if (val == -1) { + return '退款失败' + } else if (val == -2) { + return '用户申请退款中' + } } }, computed: {