From 7c05649d5eba19fc5fdf4d120f106920d80341e3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 11 十月 2024 14:49:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/platform/components/PlatformSign.vue | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/admin/src/views/platform/components/PlatformSign.vue b/admin/src/views/platform/components/PlatformSign.vue
index 79b9000..1ff8326 100644
--- a/admin/src/views/platform/components/PlatformSign.vue
+++ b/admin/src/views/platform/components/PlatformSign.vue
@@ -19,13 +19,13 @@
<div class="status" :class="{ red: item.status == 0 }">{{ statusMap[item.status] }}</div>
</div>
<div class="info">
- <div v-if="item.type == 4" class="ite">
- <span>鍚堝悓鍗曞彿锛�</span>
- <span>{{ item.contractNum }}</span>
- </div>
- <div v-else class="ite">
+ <div v-if="item.billCode" class="ite">
<span>杩愯緭鍗曞彿锛�</span>
<span>{{ item.billCode }}</span>
+ </div>
+ <div v-else class="ite">
+ <span>鍚堝悓鍗曞彿锛�</span>
+ <span>{{ item.contractNum }}</span>
</div>
<div class="ite">
<span>椹鹃┒鍛橈細</span>
@@ -45,7 +45,7 @@
</div>
</div>
<div class="footer df_sb">
- <div v-if="item.type != 4" class="detail">杩愬崟璇︽儏</div>
+ <div @click="handleDetail(item)" v-if="item.type != 4" class="detail">杩愬崟璇︽儏</div>
<div v-else></div>
<el-button type="primary" @click="handleCall(item)">绛惧埌</el-button>
</div>
@@ -54,24 +54,28 @@
<pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="pagination">
</pagination>
</div>
+ <WaybillDetailRef v-if="isShowDetail" ref="WaybillDetailRef" />
</GlobalWindow>
</template>
<script>
import GlobalWindow from '@/components/common/GlobalWindow'
import Pagination from '@/components/common/Pagination'
+import WaybillDetailRef from "./WaybillDetail.vue"
import { platformJobPage, platformJobSign } from '@/api'
import { statusMap } from '../config'
import { Message } from 'element-ui'
export default {
components: {
GlobalWindow,
- Pagination
+ Pagination,
+ WaybillDetailRef
},
data() {
return {
statusMap,
isShowModal: false,
+ isShowDetail: false,
subLoading: false,
pagination: {
total: 0,
@@ -96,12 +100,20 @@
getList() {
const { activePlat, pagination, carCodeFront } = this
platformJobPage({
- model: { platformGroupId: activePlat.id, queryStatus: '0,1' },
+ model: { platformGroupId: activePlat.id, queryStatus: '0,1', carCodeFront },
page: pagination.page,
capacity: pagination.pageSize
}).then(res => {
this.dataList = res.records
this.pagination.total = res.total
+ })
+ },
+ handleDetail(row) {
+ this.isShowDetail = true
+ this.$nextTick(() => {
+ this.$refs.WaybillDetailRef.isShowModal = true
+ this.$refs.WaybillDetailRef.id = row.id
+ this.$refs.WaybillDetailRef.getDetail()
})
},
reset() {
@@ -214,6 +226,7 @@
.footer {
.detail {
color: $primaryColor;
+ cursor: pointer;
}
}
}
--
Gitblit v1.9.3