From 8903e1a476fd1140acbc1a91e187de6d771e4664 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期四, 23 三月 2023 17:56:23 +0800
Subject: [PATCH] 1.待领取列表增加字段 矿、煤场、煤种、客户名称、发运日期、日计划编号（完成） 2.多次抢单弹框再次确认是否抢单（完成） 3.待预约提煤单列表显示样式（完成）
---
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue | 148 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 102 insertions(+), 46 deletions(-)
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
index 348131f..b13c229 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
@@ -1,38 +1,73 @@
<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-th align="left">鎬婚鍙栭噺</uni-th>
- <uni-td align="left">{{ orderPlanDetail.fowerdsum || 0 }}寮�</uni-td>
+ <uni-th align="left" width="120">杞彂鎬婚噺</uni-th>
+ <uni-td align="left">{{ orderPlanDetail.fowardSum || 0 }}寮�</uni-td>
</uni-tr>
<uni-tr>
- <uni-th align="left">杞﹂槦鍜岃揣浠�</uni-th>
+ <uni-th align="left">棰嗗彇鎬婚噺</uni-th>
<uni-td align="left">{{ orderPlanDetail.fleetOrHuodaiNub || 0 }}寮�</uni-td>
</uni-tr>
- <uni-tr>
- <uni-th align="left">杞﹂槦</uni-th>
- <uni-td align="left">{{ orderPlanDetail.cheduiList || 0 }}寮�</uni-td>
+ <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.huodaiList || 0 }}寮�</uni-td>
- </uni-tr>
- <uni-tr>
- <uni-th align="left">鍙告満</uni-th>
+ <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>
+ <combined-title title="鎻愮叅鍗曡鎯�"></combined-title>
+ <view class="compDetails" v-for="(item, index) in orderPlanDetail.yyDailyList" :key="index">
<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
- <uni-tr v-for="(item, index) in orderPlanDetail.yyDailyList">
- <uni-td align="left">{{ orderPlanDetail.yyDailyList }}</uni-td>
- <uni-td align="left">{{ orderPlanDetail.yyDailyList }}寮�</uni-td>
+ <uni-tr>
+ <uni-th align="left">鎻愮叅鍗曠紪鍙�</uni-th>
+ <uni-td align="left">{{ item.code || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鎻愮叅鍗曠姸鎬�</uni-th>
+ <uni-td align="left">{{ coalStatus[item.status] }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">杞︾墝鍙�</uni-th>
+ <uni-td align="left">{{ item.carNo || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鍏ュ満鏃堕棿</uni-th>
+ <uni-td align="left">{{ item.inTime || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鍑哄満鏃堕棿</uni-th>
+ <uni-td align="left">{{ item.outTime || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鐨噸</uni-th>
+ <uni-td align="left">{{ item.skin || 0 }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">姣涢噸</uni-th>
+ <uni-td align="left">{{ item.hair || 0 }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鍑�閲�</uni-th>
+ <uni-td align="left">{{ item.clean || 0 }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">璁㈠崟缂栧彿</uni-th>
+ <uni-td align="left">{{ orderCode || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">璁㈠崟鍓╀綑閲�</uni-th>
+ <uni-td align="left">{{ item.allowance || 0 }}</uni-td>
</uni-tr>
</uni-table>
</view>
@@ -41,20 +76,27 @@
</template>
<script>
+import combinedTitle from '@/components/combined-title/combined-title.vue';
export default {
+ components: {
+ combinedTitle
+ },
onLoad(value) {
console.log('椤甸潰鍔犺浇', value);
- if (value.orderPlanId) {
+ if (value.orderPlanId && value.code) {
this.orderPlanId = value.orderPlanId;
+ this.orderCode = value.code;
}
},
data() {
return {
orderPlanId: null,
- orderPlanDetail: {}
+ orderCode: null,
+ orderPlanDetail: {},
+ coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�']
};
},
- onShow(){
+ onShow() {
this.init();
},
methods: {
@@ -63,8 +105,14 @@
},
// 鑾峰彇鍙戣繍璁″垝璇︽儏
GetOrderPlanDetail() {
+ uni.showLoading({
+ title: '鍔犺浇涓�...'
+ });
this.$reqGet('xiangqingList', { orderPlanId: this.orderPlanId }).then(res => {
- this.orderPlanDetail = res.data;
+ if (res.code == 0) {
+ this.orderPlanDetail = res.data;
+ uni.hideLoading();
+ }
});
}
}
@@ -77,35 +125,43 @@
margin: 0 auto;
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;
+ }
}
+ // 琛ㄦ牸鏍峰紡
.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