From 7986bc00e330411ffc73da24fdd168c6af8cf295 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 27 三月 2023 10:46:12 +0800
Subject: [PATCH] 0327测试

---
 pages/driver-page/driver-index/driver-index.vue |   46 +++++++++++++++++++++++++++++++---------------
 1 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 3446a6c..630c030 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -16,21 +16,31 @@
 						<text>{{ item.carNum }}</text>
 						寮�
 					</view>
-					<view class="card-left__utils"><u-button @tap.stop="qiangDan(item.orderPlanId)" text="鎶㈠崟" type="primary" shape="circle"></u-button></view>
+					<view class="card-left__utils"><u-button @tap.stop="qiangDanBtn(item)" text="鎶㈠崟" type="primary" shape="circle"></u-button></view>
 				</template>
 				<template v-slot:right-top>
 					<view class="right-top">
 						<view class="card-right-top-row">
 							<view>
-								<text>{{ item.compName }}</text>
+								<text>{{ item.deptName || '' }}</text>
 							</view>
 							<view>
-								<text>{{ item.coalName }}</text>
+								<text>{{ item.coalName || '' }}</text>
 							</view>
 						</view>
 						<view class="card-right-top-row">
 							<view>
 								<text>鍓╀綑{{ item.carNum - item.taskNum }}寮�</text>
+							</view>
+						</view>
+						<view class="card-right-top-row">
+							<view>
+								<text>{{ item.filedName || '' }}</text>
+							</view>
+						</view>
+						<view class="card-right-top-row">
+							<view>
+								<text>{{ item.orderCode || '' }}</text>
 							</view>
 						</view>
 					</view>
@@ -127,7 +137,8 @@
 			qiangDanShow: false,
 			qiangDanTitle: '鎶㈠崟鎻愮ず',
 			qiangDanContent: '',
-			qiangDanOrderPlanId:null
+			qiangDanOrderPlanId: null,
+			fleetId: ''
 		};
 	},
 	onShow() {
@@ -149,31 +160,34 @@
 		},
 		// 鎶㈠崟鎸夐挳
 		qiangDanBtn(value) {
-			if (value.tmcCount == 0) {
-				this.qiangDan(value.orderPlanId);
+			if (value.tmcCount == '0') {
+				this.qiangDan(value.orderPlanId, value.fleetId);
 			} else {
-				this.qiangDanOrderPlanId = value.orderPlanId
-				this.qiangDanShow = true
-				this.qiangDanContent = `宸叉姠${value.tmcCount}鍗曪紝纭畾鎶㈠崟锛焋
+				this.qiangDanOrderPlanId = value.orderPlanId;
+				this.fleetId = value.fleetId;
+				this.qiangDanShow = true;
+				this.qiangDanContent = `宸叉姠${value.tmcCount}鍗曪紝纭畾鎶㈠崟锛焋;
 			}
 		},
 		// 鎶㈠崟妯℃�佹
 		qiangDanConfirm() {
-			this.qiangDanContent = ''
-			this.qiangDan(this.qiangDanOrderPlanId);
+			this.qiangDanContent = '';
+			this.qiangDan(this.qiangDanOrderPlanId, this.fleetId);
 		},
 		qiangDanCancel() {
 			this.qiangDanShow = false;
 		},
 		// 鎶㈠崟璇锋眰
-		qiangDan(id) {
-			this.$reqPost('qiangDan', { orderPlanId: id }, 'params').then(res => {
+		qiangDan(id, fleetId) {
+			this.$reqPost('qiangDan', { orderPlanId: id, fleetId: fleetId }, 'params').then(res => {
 				if (res.code == 0) {
 					this.$u.toast('鎶㈠崟鎴愬姛');
+					this.qiangDanShow = false;
+					this.qiangDanList();
 				} else {
 					this.$u.toast(res.data ? res.data : '鎶㈠崟澶辫触');
+					this.qiangDanShow = false;
 				}
-				this.qiangDanList();
 			});
 		},
 		list3CardIconClick(value) {
@@ -257,14 +271,16 @@
 			}
 			&Table {
 				.uni-table {
+					min-width: 94% !important;
 					.uni-table-tr {
 						padding: 0;
 						.uni-table-th {
+							width: 33.3%;
 							line-height: 58rpx;
 							padding: vww(5) vww(10);
 							color: #111111;
 							font-weight: 400;
-							background: #e5e5e5;
+							background: #f5f5f5;
 						}
 						.uni-table-td {
 							font-weight: 400;

--
Gitblit v1.9.1