From 85876d4010058bb648c1f59f4b0a65fc95768c04 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期五, 07 六月 2024 08:27:21 +0800
Subject: [PATCH] Merge branch 'feature/jlhg/zxx' into jlhg
---
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
index 512cdf3..56a46f5 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
@@ -12,7 +12,7 @@
<view class="middle-container">
<view class="dept-name">
{{ deptName }}
- <text v-show="deptName">({{ coalName }})</text>
+ <text v-show="deptName">({{ coalName || productName}})</text>
</view>
<view class="dept-num">
<text style="font-size: 46rpx;
@@ -114,6 +114,7 @@
this.cars2 = value.cars2 ? value.cars2 : null;
this.deptName = value.deptName;
this.coalName = value.coalName;
+ this.productName = value.productName;
this.carNum = value.carNum ? value.carNum : null
console.log(value, '鍙戣繍璁″垝鍙傛暟');
},
@@ -123,12 +124,13 @@
orderCode: null,
orderPlanDetail: {},
coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
- '杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�'
+ '杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�', '濉啓'
],
yyDailyList: [],
// 棰嗗彇鏁伴噺
cars2: '',
coalName: '',
+ productName:'',
deptName: '',
total: 0,
carNum: ''
@@ -164,6 +166,7 @@
this.total = this.yyDailyList.reduce((prev, cur) => {
return prev + cur.clean;
}, 0);
+ console.log(this.total,'total')
} else {
this.total = 0;
}
--
Gitblit v1.9.1