From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/reportRecord.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/business/reportRecord.vue b/admin/src/views/business/reportRecord.vue
index 82a650f..b5a71a7 100644
--- a/admin/src/views/business/reportRecord.vue
+++ b/admin/src/views/business/reportRecord.vue
@@ -59,6 +59,7 @@
prop="status"
fixed="right"
label="鐘舵��"
+ align="center"
min-width="100"
>
<template slot-scope="{ row }">
@@ -66,21 +67,21 @@
>寰呮彁浜ゅ鎵�</span
>
<span v-if="row.status === 1" style="color: rgba(245, 154, 35, 0.996)"
- >瀹℃壒涓�</span
+ >澶勭悊涓�</span
>
<span v-if="row.status === 2" style="color: rgba(245, 154, 35, 0.996)"
- >瀹℃牳閫氳繃</span
+ >宸插悓鎰�</span
>
- <span style="color: gray" v-if="row.status === 3">瀹℃牳涓嶉�氳繃</span>
+ <span style="color: gray" v-if="row.status === 3">宸叉嫆缁�</span>
<span v-if="row.status === 4" style="color: gray">鍙栨秷</span>
- <span v-if="row.status === 5" style="color: green">棰勭害鎴愬姛</span>
- <span v-if="row.status === 6" style="color: gray">棰勭害澶辫触</span>
+ <span v-if="row.status === 5" style="color: green">涓嬪彂鎴愬姛</span>
+ <span v-if="row.status === 6" style="color: gray">涓嬪彂澶辫触</span>
<span v-if="row.status === 7" style="color: green">鎷滆涓�</span>
<span v-if="row.status === 8" style="color: red">宸茬绂�</span>
<span v-if="row.status === 9" style="color: gray">宸插け鏁�</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" width="100" fixed="right">
+ <el-table-column label="鎿嶄綔" align="center" width="100" fixed="right">
<template slot-scope="{ row }">
<el-button
type="text"
@@ -148,7 +149,8 @@
},
pagination: {
capacity: 10,
- page: 1
+ page: 1,
+ total: 0
},
total: 0
}
@@ -202,6 +204,7 @@
...pagination
}).then(res => {
this.dataList = res.records || []
+ this.pagination.total = res.total
})
},
clear () {
@@ -212,6 +215,7 @@
},
handleSizeChange (capacity) {
this.pagination.capacity = capacity
+ this.getList()
}
}
}
--
Gitblit v1.9.3