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 | 143 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 103 insertions(+), 40 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 1520179..34a11e5 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -16,16 +16,16 @@
<text>{{ item.carNum }}</text>
寮�
</view>
- <view class="card-left__utils"><u-button @tap.stop="qiangDanClick(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">
@@ -33,30 +33,33 @@
<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>
</template>
</card>
- <!-- 鎴戠殑鎻愮叅鍗� -->
- <combined-title title="鎴戠殑鎻愮叅鍗�"></combined-title>
- <!-- 鍗＄墖 -->
- <!-- <view v-for="(item, index) in driverBillOfLoadingData.list2" :key="index"> -->
+ <!-- 鎶㈠崟鎻愮ず妯℃�佹 -->
+ <view class="qianDanModel">
+ <u-modal :show="qiangDanShow" :title="qiangDanTitle" showCancelButton :content="qiangDanContent" @confirm="qiangDanConfirm" @cancel="qiangDanCancel"></u-modal>
+ </view>
+
+ <!-- 寰呴绾︽彁鐓ゅ崟 -->
+ <combined-title title="寰呴绾︽彁鐓ゅ崟"></combined-title>
<u-empty
mode="data"
icon="http://cdn.uviewui.com/uview/empty/data.png"
textSize="30"
iconSize="1000"
- v-if="
- driverBillOfLoadingData.list2
- ? driverBillOfLoadingData.list2.length == 0
- ? true
- : false
- : true && driverBillOfLoadingData.list3
- ? driverBillOfLoadingData.list3.length == 0
- ? true
- : false
- : true
- "
+ v-if="driverBillOfLoadingData.list3 ? (driverBillOfLoadingData.list3.length == 0 ? true : false) : true"
></u-empty>
<view>
<!-- 寰呴绾︽彁鐓ゅ崟 -->
@@ -65,13 +68,46 @@
<text>鎻愮叅鍗曠紪鍙凤細{{ item.code }}</text>
</view>
<view class="daiYuYueTable">
- <view>{{ item.deptName }}</view>
+ <!-- <view>{{ item.deptName }}</view>
<view>{{ item.coalName }}</view>
- <view>宸查绾︼細{{ item.cars }} 杞�</view>
+ <view>宸查绾︼細{{ item.cars }} 杞�</view> -->
+ <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
+ <uni-tr>
+ <uni-th align="center">鐓ゅ満</uni-th>
+ <uni-th align="center">鐓ょ</uni-th>
+ <uni-th align="center">宸查绾�</uni-th>
+ </uni-tr>
+ <uni-tr>
+ <uni-td align="left">{{ item.deptName || '' }}</uni-td>
+ <uni-td align="left">{{ item.coalName || '' }}</uni-td>
+ <uni-td align="left">{{ item.cars || '' }} 杞�</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="center">鍙戣繍鏃ユ湡</uni-th>
+ <uni-th align="center">鐓ゅ満</uni-th>
+ <uni-th align="center">瀹㈡埛</uni-th>
+ </uni-tr>
+ <uni-tr>
+ <uni-td align="left">{{ item.sendDate || '' }}</uni-td>
+ <uni-td align="left">{{ item.filedName || '' }}</uni-td>
+ <uni-td align="left">{{ item.customerName || '' }}</uni-td>
+ </uni-tr>
+ </uni-table>
</view>
<view><u-button text="棰勭害" type="primary" @click="toAppointmentClick(item)"></u-button></view>
</view>
- <!-- 宸查绾︽彁鐓ゅ崟 -->
+ </view>
+
+ <!-- 宸查绾︽彁鐓ゅ崟 -->
+ <combined-title title="宸查绾︽彁鐓ゅ崟"></combined-title>
+ <u-empty
+ mode="data"
+ icon="http://cdn.uviewui.com/uview/empty/data.png"
+ textSize="30"
+ iconSize="1000"
+ v-if="driverBillOfLoadingData.list2 ? (driverBillOfLoadingData.list2.length == 0 ? true : false) : true"
+ ></u-empty>
+ <view class="">
<view @click="list3CardIconClick(item)" class="haveYuYue" v-for="(item, index) in driverBillOfLoadingData.list2" :key="index">
<view class="haveYuYueTop">
<text>鎻愮叅鍗曠紪鍙凤細{{ item.code || '' }}</text>
@@ -96,7 +132,12 @@
export default {
data() {
return {
- driverBillOfLoadingData: []
+ driverBillOfLoadingData: [],
+ // 鎶㈠崟妯℃�佹
+ qiangDanShow: false,
+ qiangDanTitle: '鎶㈠崟鎻愮ず',
+ qiangDanContent: '',
+ qiangDanOrderPlanId: null
};
},
onShow() {
@@ -111,21 +152,37 @@
uni.showLoading({
title: '鍔犺浇涓�...'
});
- // this.$reqGet('qiangDanList', { id: customerId }).then(res => {
this.$reqGet('qiangDanList').then(res => {
- console.log('鎶㈠崟鍒楄〃', res);
uni.hideLoading();
this.driverBillOfLoadingData = res.data;
});
},
- // 鎶㈠崟
- qiangDanClick(id) {
- // this.$reqPost('qiangDan', { orderPlanId: id, wxUserId: customerId }, 'params').then(res => {
+ // 鎶㈠崟鎸夐挳
+ qiangDanBtn(value) {
+ if (value.tmcCount == '0') {
+ this.qiangDan(value.orderPlanId);
+ } else {
+ this.qiangDanOrderPlanId = value.orderPlanId;
+ this.qiangDanShow = true;
+ this.qiangDanContent = `宸叉姠${value.tmcCount}鍗曪紝纭畾鎶㈠崟锛焋;
+ }
+ },
+ // 鎶㈠崟妯℃�佹
+ qiangDanConfirm() {
+ this.qiangDanContent = '';
+ this.qiangDan(this.qiangDanOrderPlanId);
+ },
+ qiangDanCancel() {
+ this.qiangDanShow = false;
+ },
+ // 鎶㈠崟璇锋眰
+ qiangDan(id) {
this.$reqPost('qiangDan', { orderPlanId: id }, 'params').then(res => {
if (res.code == 0) {
this.$u.toast('鎶㈠崟鎴愬姛');
+ } else {
+ this.$u.toast(res.data ? res.data : '鎶㈠崟澶辫触');
}
- console.log('鎶㈠崟', res);
this.qiangDanList();
});
},
@@ -209,18 +266,24 @@
font-weight: 400;
}
&Table {
- border: vww(1) solid #eeeeee;
- border-top: none;
- display: flex;
- flex: 1;
- height: vww(40);
- line-height: vww(40);
- view {
- border-right: vww(1) solid #eeeeee;
- width: 33.3%;
- text-align: center;
- &:nth-child(3) {
- border-right: none;
+ .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: #f5f5f5;
+ }
+ .uni-table-td {
+ font-weight: 400;
+ line-height: 58rpx;
+ padding: vww(5) vww(10);
+ color: #111111;
+ }
}
}
}
--
Gitblit v1.9.1