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/fayunPlanDetails/fayunPlanDetails.vue | 185 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 139 insertions(+), 46 deletions(-)
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
index 9d73963..ed6d1c9 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
@@ -1,59 +1,102 @@
<template>
<view class="fayunPlan">
- <view>
+ <view class="fayunPlanBody">
+ <combined-title title="棰嗗彇鎯呭喌"></combined-title>
<view class="compDetails">
- <view class="comp">{{ orderPlanDetail.compName }}</view>
<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
<uni-tr>
- <uni-td align="left">{{ orderPlanDetail.coalName }}</uni-td>
- <uni-td align="left">{{ orderPlanDetail.cars }}寮�</uni-td>
+ <uni-th align="left" width="120">杞彂鎬婚噺</uni-th>
+ <uni-td align="left">{{ orderPlanDetail.fowardSum || 0 }}寮�</uni-td>
</uni-tr>
<uni-tr>
- <uni-td align="left">璐т唬棰嗗彇{{ orderPlanDetail.huoDais }}寮�</uni-td>
- <uni-td align="left">鍙告満棰嗗彇{{ orderPlanDetail.siJis }}寮�</uni-td>
+ <uni-th align="left">棰嗗彇鎬婚噺</uni-th>
+ <uni-td align="left">{{ cars2 || 0 }}寮�</uni-td>
+ </uni-tr>
+ <uni-tr v-for="(item, index) in orderPlanDetail.huodaiList" :key="index">
+ <uni-th align="left">{{ item.huoDaiName }}</uni-th>
+ <uni-td align="left">{{ item.fleetOrHuodaiNub }}寮�</uni-td>
+ </uni-tr>
+ <uni-tr v-for="(item, index) in orderPlanDetail.cheduiList" :key="index">
+ <uni-th align="left">{{ item.cheduiName }}</uni-th>
+ <uni-td align="left">{{ item.fleetOrHuodaiNub }}寮�</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鍙告満鎬婚鍙�</uni-th>
+ <uni-td align="left">{{ orderPlanDetail.sijiSum || 0 }}寮�</uni-td>
</uni-tr>
</uni-table>
</view>
-
- <view class="compDetails">
- <view class="comp">棰勭害鎯呭喌</view>
- <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
- <uni-tr v-for="(item, index) in orderPlanDetail.list">
- <uni-td align="left">{{ orderPlanDetail.coalName }}</uni-td>
- <uni-td align="left">{{ orderPlanDetail.cars }}寮�</uni-td>
- </uni-tr>
- </uni-table>
+ <combined-title title="鎻愮叅鍗曡鎯�"></combined-title>
+ <view class="empty-pointer" v-if="!yyDailyList">鏆傛棤鏇村鏁版嵁</view>
+ <view class="compDetails card" v-for="(item, index) in yyDailyList" :key="index">
+ <view class="coal-status">
+ <view class="label-title">鎻愮叅鍗曠姸鎬�</view>
+ <view class="label-value">{{ coalStatus[item.status] }}</view>
+ </view>
+ <view class="coal-clean">
+ <view class="label-title">鍑�閲�</view>
+ <view class="label-value">{{ item.clean || 0 }}</view>
+ </view>
+ <view class="coal-carNo">
+ <view class="label-title">杞︾墝鍙�</view>
+ <view class="label-value">{{ item.carNo || '' }}</view>
+ </view>
+ <view class="coal-allowance">
+ <view class="label-title">浣欓噺</view>
+ <view class="label-value">{{ item.allowance || 0 }}</view>
+ </view>
+ <view class="more-button"><u-button type="success" text="鏇村" @click="showMore(index)"></u-button></view>
</view>
</view>
</view>
</template>
<script>
+import combinedTitle from '@/components/combined-title/combined-title.vue';
export default {
+ components: {
+ combinedTitle
+ },
onLoad(value) {
- console.log('椤甸潰鍔犺浇', value);
- if (value.orderPlanId) {
- this.orderPlanId = value.orderPlanId;
- }
+ this.orderPlanId = value.orderPlanId;
+ this.orderCode = value.code;
+ this.cars2 = value.cars2;
+ console.log(value, '鍙戣繍璁″垝鍙傛暟');
},
data() {
return {
orderPlanId: null,
- orderPlanDetail: {}
+ orderCode: null,
+ orderPlanDetail: {},
+ coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�'],
+ yyDailyList: [],
+ // 棰嗗彇鏁伴噺
+ cars2: ''
};
},
- onShow(){
+ onShow() {
this.init();
},
methods: {
+ showMore(index) {
+ uni.navigateTo({
+ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore?orderPlanId=${this.orderPlanId}&index=${index}`
+ });
+ },
init() {
this.GetOrderPlanDetail();
},
// 鑾峰彇鍙戣繍璁″垝璇︽儏
GetOrderPlanDetail() {
+ uni.showLoading({
+ title: '鍔犺浇涓�...'
+ });
this.$reqGet('xiangqingList', { orderPlanId: this.orderPlanId }).then(res => {
- console.log('鍙戣繍璁″垝璇︽儏', res);
- this.orderPlanDetail = res.data;
+ if (res.code == 0) {
+ this.orderPlanDetail = res.data;
+ this.yyDailyList = res.data.yyDailyList;
+ uni.hideLoading();
+ }
});
}
}
@@ -61,40 +104,90 @@
</script>
<style lang="scss" scoped>
+.empty-pointer {
+ position: absolute;
+ top: 50%;
+ left: 38%;
+ color: #909399;
+}
::v-deep.fayunPlan {
width: 100%;
margin: 0 auto;
+ background-color: #f4f4f4;
display: flex;
flex-direction: column;
- .compDetails {
+ .fayunPlanBody {
width: 94%;
- margin: vww(24) auto 0 auto;
- .comp {
- font-size: vww(16);
- font-weight: 400;
- padding: 0 vww(10);
- height: vww(40);
- line-height: vww(40);
- border: 1px solid #ebeef5;
- border-bottom: none;
- background-color: #f5f5f5;
+ margin: 0 auto;
+
+ .compDetails {
+ width: 94%;
+ margin: vww(24) auto 0 auto;
+ .comp {
+ font-size: vww(16);
+ font-weight: 400;
+ padding: 0 vww(10);
+ height: vww(40);
+ line-height: vww(40);
+ border: 1px solid #ebeef5;
+ border-bottom: none;
+ background-color: #f5f5f5;
+ }
}
+ .card {
+ width: 94%;
+ height: vww(150);
+ margin: vww(24) auto 0 auto;
+ background-color: #fff;
+ border-radius: 4px;
+ box-shadow: 0 2px 12px 0 #ebeef5;
+ position: relative;
+ display: flex;
+ justify-content: center;
+ align-items: flex-start;
+ .coal-status,
+ .coal-clean,
+ .coal-allowance,
+ .coal-carNo {
+ width: 50%;
+ margin-top: vww(30);
+ height: vww(50);
+ text-align: center;
+ .label-title {
+ color: #909399;
+ }
+ .label-value {
+ margin-top: vww(10);
+ color: #606266;
+ }
+ }
+ .more-button {
+ width: vww(60);
+ position: absolute;
+ top: vww(100);
+ display: flex;
+ justify-content: center;
+ }
+ }
+ // 琛ㄦ牸鏍峰紡
.uni-table {
.uni-table-tr {
padding: 0;
- // .uni-table-th {
- // height: vww(40);
- // line-height: vww(40);
- // padding: vww(5) vww(10);
- // color: #111111;
- // font-weight: 300;
- // background: #f5f5f5;
- // }
+ border: vww(1) solid #c6c6c6;
+ .uni-table-th {
+ font-size: vww(14);
+ height: vww(30);
+ line-height: vww(30);
+ padding: vww(5) vww(10);
+ color: #111111;
+ font-weight: 500;
+ background: #e2e2e2;
+ }
.uni-table-td {
- font-size: vww(16);
- font-weight: 300;
- height: vww(40);
- line-height: vww(40);
+ font-size: vww(14);
+ font-weight: 400;
+ height: vww(30);
+ line-height: vww(30);
padding: vww(5) vww(10);
color: #111111;
}
--
Gitblit v1.9.1