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/driver-page/driver-index/driver-index.vue | 35 ++++++++++++++++++++++++++--------- 1 files changed, 26 insertions(+), 9 deletions(-) diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue index e90e112..34a11e5 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> @@ -126,7 +136,8 @@ // 鎶㈠崟妯℃�佹 qiangDanShow: false, qiangDanTitle: '鎶㈠崟鎻愮ず', - qiangDanContent: '' + qiangDanContent: '', + qiangDanOrderPlanId: null }; }, onShow() { @@ -141,22 +152,26 @@ uni.showLoading({ title: '鍔犺浇涓�...' }); - // this.$reqGet('qiangDanList', { id: customerId }).then(res => { this.$reqGet('qiangDanList').then(res => { - console.log('鎶㈠崟鍒楄〃', res); uni.hideLoading(); this.driverBillOfLoadingData = res.data; }); }, // 鎶㈠崟鎸夐挳 qiangDanBtn(value) { - if (value.taskNum == 0) { + if (value.tmcCount == '0') { this.qiangDan(value.orderPlanId); } else { + this.qiangDanOrderPlanId = value.orderPlanId; + this.qiangDanShow = true; + this.qiangDanContent = `宸叉姠${value.tmcCount}鍗曪紝纭畾鎶㈠崟锛焋; } }, // 鎶㈠崟妯℃�佹 - qiangDanConfirm() {}, + qiangDanConfirm() { + this.qiangDanContent = ''; + this.qiangDan(this.qiangDanOrderPlanId); + }, qiangDanCancel() { this.qiangDanShow = false; }, @@ -252,14 +267,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