From e7b0b34176549cfec809c6b89c4cab0999e488b9 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 28 三月 2023 16:40:56 +0800
Subject: [PATCH] 修改大部分问题

---
 pages/customer-page/customer-index/customer-index.vue |   47 +++++++++++++++++++++++++----------------------
 1 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index cce6dc0..b84232b 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -10,7 +10,7 @@
 					</view>
 					<view class="card-left__utils">
 						<u-button @tap.stop="receiveClick(item)" text="棰嗗彇" type="primary" v-if="item.cars2 != item.carNum" shape="circle"></u-button>
-						<u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle" v-if="item.carNum != item.carNumSurplus1"></u-button>
+						<u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle"></u-button>
 					</view>
 				</template>
 				<template v-slot:right-top>
@@ -60,13 +60,13 @@
 						<uni-th align="center" width="80">鎻愮叅鍗曚釜鏁�</uni-th>
 					</uni-tr>
 					<uni-tr v-for="(item, index) in historyCoalData" :key="index">
-						<uni-td align="center">{{ item.sendDate }}</uni-td>
-						<uni-td align="left">{{ item.deptName }}</uni-td>
-						<uni-td align="center">{{ item.filedName }}</uni-td>
-						<uni-td align="center">{{ item.coalName }}</uni-td>
-						<uni-td align="center">{{ item.orderCode }}</uni-td>
-						<uni-td align="center">{{ item.carNumSurplus }}</uni-td>
-						<uni-td align="center">{{ item.tmCount }}</uni-td>
+						<uni-td align="center" @row-click="faYundetail(item)">{{ item.sendDate }}</uni-td>
+						<uni-td align="left" @row-click="faYundetail(item)">{{ item.deptName }}</uni-td>
+						<uni-td align="center" @row-click="faYundetail(item)">{{ item.filedName }}</uni-td>
+						<uni-td align="center" @row-click="faYundetail(item)">{{ item.coalName }}</uni-td>
+						<uni-td align="center" @row-click="faYundetail(item)">{{ item.orderCode }}</uni-td>
+						<uni-td align="center" @row-click="faYundetail(item)">{{ item.carNumSurplus }}</uni-td>
+						<uni-td align="center" @row-click="faYundetail(item)">{{ item.tmCount }}</uni-td>
 					</uni-tr>
 				</uni-table>
 				<view class="more_text" v-if="showMoreData">娌℃湁鏁版嵁浜�...</view>
@@ -99,11 +99,12 @@
 		combinedTitle
 	},
 	watch: {
-		orderPlanDataStore(v) {
-			if (v.length > 0) {
-				console.log(v, 'props');
+		orderPlanDataStore: {
+			handler(v) {
 				this.orderPlanData = v;
-			}
+			},
+			deep: true,
+			immediate: true
 		}
 	},
 	data() {
@@ -120,7 +121,7 @@
 			loading: false,
 			scrollTop: 0,
 			// 姣忛〉鏁版嵁閲�
-			pageSize: 5,
+			pageSize: 10,
 			// 褰撳墠椤�
 			pageCurrent: 1,
 			// 鏁版嵁鎬婚噺
@@ -161,10 +162,6 @@
 					this.loading = false;
 				}
 			});
-		},
-		change2(e) {
-			this.pageCurrent = e.current;
-			this.getJhOrderPlanDataPage();
 		},
 		// 涓婃媺鍔犺浇
 		historyScrolltolower() {
@@ -218,14 +215,23 @@
 		},
 		// 鎻愮叅鍗曡鎯�
 		cardBodyClick(name) {
+			console.log(name, 'name');
 			let code = null;
+			let cars2 = null;
 			this.orderPlanData.forEach(item => {
 				if (item.id == name) {
 					code = item.code;
+					cars2 = item.cars2;
 				}
 			});
 			uni.navigateTo({
-				url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${name}&code=${code}`
+				url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${name}&code=${code}&cars2=${cars2}`
+			});
+		},
+		// 鐐瑰嚮鍘嗗彶鎻愮叅鍗曚竴琛岃幏鍙栬鎯�
+		faYundetail(v) {
+			uni.navigateTo({
+				url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&cars2=${v.cars2}`
 			});
 		},
 		// 杞彂
@@ -239,11 +245,8 @@
 </script>
 
 <style lang="scss" scoped>
-.uni-pagination-box {
-	height: 60rpx;
-}
 .scroll-Y {
-	height: 300rpx;
+	height: 600rpx;
 	.more_text {
 		color: #999;
 		font-size: 24rpx;

--
Gitblit v1.9.1