From d7aaa1eae5335b38ba1e8e9a465ef9099bc334c5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 二月 2025 11:53:56 +0800
Subject: [PATCH] jtt808初始化
---
admin/src/views/business/goodsorder.vue | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/business/goodsorder.vue b/admin/src/views/business/goodsorder.vue
index ef5d8ef..275e639 100644
--- a/admin/src/views/business/goodsorder.vue
+++ b/admin/src/views/business/goodsorder.vue
@@ -57,7 +57,12 @@
<el-table-column prop="money" label="鎶奸噾(鍏�)" min-width="80px" align="center"></el-table-column>
<el-table-column prop="payDate" label="浜ゆ娂閲戞椂闂�" min-width="145px" align="center"></el-table-column>
<el-table-column prop="refundMoney" label="閫�鎶奸噾(鍏冿級" min-width="90px" align="center"></el-table-column>
- <el-table-column prop="closeMoney" label="缁撶畻閲戦(鍏冿級" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="closeMoney" label="缁撶畻閲戦(鍏冿級" min-width="100px" align="center">
+ <template slot-scope="{row}">
+ <span v-if="row.closeMoney > row.money">{{row.money}}</span>
+ <span v-else>{{row.closeMoney}}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="closeDate" label="缁撶畻鏃堕棿" min-width="140px" align="center"></el-table-column>
<el-table-column prop="refundDate" label="閫�娆炬椂闂�" min-width="140px" align="center"></el-table-column>
@@ -87,8 +92,8 @@
>
<template slot-scope="{row}">
<el-button type="text" @click="showDetail(row)">璁㈠崟璇︽儏</el-button>
- <el-button type="text" @click="statement(row)" v-if="row.status != 4 && (row.memberRidesStatus>1 || !row.memberRidesStatus)" style="color: red">缁撶畻</el-button>
- <el-button type="text" @click="refenMoney(row)" v-if="row.status == 4">閫�娆�</el-button>
+ <el-button type="text" @click="statement(row)" v-if="row.status != 4 && (row.memberRidesStatus > 1 || !row.memberRidesStatus)" style="color: red">缁撶畻</el-button>
+ <el-button type="text" @click="refenMoney(row)" v-if="row.status == 4 && (row.refundMoney < row.money)">閫�娆�</el-button>
</template>
</el-table-column>
</el-table>
@@ -141,7 +146,8 @@
closeMoney: '',
startDate: '',
endDate: '',
-
+ type: 0
+
},
value1: [new Date(), new Date()]
}
@@ -153,7 +159,7 @@
'field.id': 'id',
'field.main': 'id'
})
- this.searchForm.startDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 00:00:00'
+ // this.searchForm.startDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 00:00:00'
this.search()
},
methods: {
@@ -181,7 +187,7 @@
.catch(err => {
this.$tip.apiFailed(err)
})
-
+
},
statement({id}) {
this.$dialog.messageWaring('纭畾寮哄埗缁撶畻鐮侊紵缁撶畻鍚庤鍗曡嚜鍔ㄥ畬鎴�', '寮哄埗缁撶畻')
@@ -189,13 +195,14 @@
closerGoodsorder(id)
.then(() => {
this.$tip.apiSuccess('缁撶畻鎴愬姛')
+ this.search()
})
.catch(err => {
this.$tip.apiFailed(err)
})
})
.catch(() => {})
-
+
},
refenMoney({id}) {
getGoodsorderCanBanlanceDTO({orderId:id})
--
Gitblit v1.9.3