From 0c045df28935e21879b8c0b58b58311c011294c5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 09 五月 2025 16:42:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/platform/components/PlatformSign.vue | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/admin/src/views/platform/components/PlatformSign.vue b/admin/src/views/platform/components/PlatformSign.vue
index c9d2191..a50ca78 100644
--- a/admin/src/views/platform/components/PlatformSign.vue
+++ b/admin/src/views/platform/components/PlatformSign.vue
@@ -4,7 +4,7 @@
<div class="df_ac mb20">
<span>鎼滅储杞﹁締锛�</span>
<el-input class="flex1 mr20" v-model="carCodeFront" placeholder="璇疯緭鍏ヨ溅鐗屽彿"></el-input>
- <el-button type="primary" @click="getList">鏌ユ壘</el-button>
+ <el-button type="primary" @click="getList(1)">鏌ユ壘</el-button>
<el-button @click="reset">閲嶇疆</el-button>
</div>
<div class="list">
@@ -37,7 +37,7 @@
</div>
<div class="ite">
<span>鎬昏繍杈撻噺锛�</span>
- <span>{{ item.totalNum }}涓囨敮</span>
+ <span>{{ item.totalNum || item.ioQty }}涓囨敮</span>
</div>
<div v-if="item.type != 4" class="ite" style="width: 66%">
<span>杩愯緭鍏徃锛�</span>
@@ -96,13 +96,16 @@
handleCall(item) {
// const activePlatform = this.activePlat
platformJobSign({ jobId: item.id, signType: '2' }).then(res => {
- Message.success('绛惧埌鎴愬姛')
- this.$emit('success')
- this.getList()
+ this.$message.success('绛惧埌鎴愬姛')
+ this.$emit('success')
+ this.getList()
})
},
- getList() {
+ getList(page) {
const { activePlat, pagination, carCodeFront } = this
+ if (page) {
+ pagination.page = page
+ }
platformJobPage({
model: { platformGroupId: activePlat.id, queryStatus: '0,1', carCodeFront },
page: pagination.page,
@@ -137,7 +140,7 @@
},
handleSizeChange(e) {
this.pagination.pageSize = e
- this.getList()
+ this.getList(1)
},
handlePageChange(e) {
this.pagination.page = e
@@ -164,7 +167,9 @@
<style lang="scss" scoped>
@import "@/assets/style/variables.scss";
-
+.table-pagination {
+ bottom: 0px !important;
+}
.queuing_modal {
padding: 10px 30px;
--
Gitblit v1.9.3