From fb4fa76b4c1a93c833cd97f97f41b6158ab1aef7 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 21 四月 2023 17:24:44 +0800
Subject: [PATCH] 修改bug
---
pages/driver-page/driver-index/driver-index.vue | 216 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 170 insertions(+), 46 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 26009b6..36c7b7a 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -3,22 +3,31 @@
<view class="driver-index-body">
<!-- 寰呴鍙栨彁鐓ゅ崟 -->
<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.list1 ? (driverBillOfLoadingData.list1.length == 0 ? true : false) : true"
+ ></u-empty>
<card v-for="(item, index) in driverBillOfLoadingData.list1" :key="index" :name="item.id" backgroundType="2">
<template v-slot:left>
<view class="card-left__top">
<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" v-if="item.carNum - item.taskNum !== 0"></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">
@@ -26,39 +35,91 @@
<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.list3 ? (driverBillOfLoadingData.list3.length == 0 ? true : false) : true"
+ ></u-empty>
<view>
<!-- 寰呴绾︽彁鐓ゅ崟 -->
<view class="daiYuYue" v-for="(item, index) in driverBillOfLoadingData.list3" :key="index">
<view class="daiYuYueTop">
- <text>鎻愮叅鍗曠紪鍙凤細{{ item.code }}</text>
+ <view class="tmcode">鎻愮叅鍗曠紪鍙凤細{{ item.code }}</view>
</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 || 0 }} 杞︽</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.id)"></u-button></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>
+ <text class="tmcode">鎻愮叅鍗曠紪鍙凤細{{ item.code || '' }}</text>
</view>
<view class="haveYuYueCenter">
<view>{{ item.deptName || '' }}</view>
<view>{{ item.coalName || '' }}</view>
- <view>鎺掗槦鏁帮細鏆傛棤{{}}</view>
</view>
<view class="haveYuYueBottom">
- <text>{{ item.yuYueTime || '鏃舵' }}</text>
+ <text>{{ item.yuYueSection || '鏃舵' }}</text>
</view>
</view>
</view>
@@ -68,10 +129,34 @@
<script>
import { customerId } from '@/utils/status';
+
export default {
+ props: {
+ indexdriverBillOfLoadingData: {
+ type: Object,
+ default: {}
+ }
+ },
+ watch: {
+ indexdriverBillOfLoadingData: {
+ handler(v) {
+ this.driverBillOfLoadingData = v;
+ },
+ deep: true,
+ immediate: true
+ }
+ },
data() {
return {
- driverBillOfLoadingData: []
+ driverBillOfLoadingData: {},
+ // 鎶㈠崟妯℃�佹
+ qiangDanShow: false,
+ qiangDanTitle: '鎶㈠崟鎻愮ず',
+ qiangDanContent: '',
+ qiangDanOrderPlanId: null,
+ fleetId: '',
+ xsUserId: '',
+ customerId: ''
};
},
onShow() {
@@ -86,23 +171,48 @@
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 => {
- this.$reqPost('qiangDan', { orderPlanId: id }, 'params').then(res => {
- if (res.code == 0) {
- this.$u.toast('鎶㈠崟鎴愬姛');
- }
- console.log('鎶㈠崟', res);
- this.qiangDanList();
- });
+ // 鎶㈠崟鎸夐挳
+ qiangDanBtn(value) {
+ if (value.tmcCount == '0') {
+ this.qiangDan(value.orderPlanId, value.fleetId, value.customerId === null ? '0' : value.customerId, value.xsUserId === null ? '0' : value.xsUserId);
+ } else {
+ this.qiangDanOrderPlanId = value.orderPlanId;
+ this.fleetId = value.fleetId;
+ this.customerId = value.customerId === null ? '0' : value.customerId;
+ this.xsUserId = value.xsUserId === null ? '0' : value.xsUserId;
+ this.qiangDanShow = true;
+ this.qiangDanContent = `宸叉姠${value.tmcCount}鍗曪紝纭畾鎶㈠崟锛焋;
+ }
+ },
+ // 鎶㈠崟妯℃�佹
+ qiangDanConfirm() {
+ this.qiangDanContent = '';
+ this.qiangDanShow = false;
+ this.qiangDan(this.qiangDanOrderPlanId, this.fleetId, this.customerId, this.xsUserId);
+ },
+ qiangDanCancel() {
+ this.qiangDanShow = false;
+ },
+ // 鎶㈠崟璇锋眰
+ qiangDan(id, fleetId, customerId, xsUserId) {
+ this.$reqPost('qiangDan', { orderPlanId: id, fleetId: fleetId, customerId: customerId, xsUserId: xsUserId }, 'params')
+ .then(res => {
+ if (res.code == 0) {
+ this.$u.toast('鎶㈠崟鎴愬姛');
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鎶㈠崟澶辫触');
+ }
+ })
+ .then(() => {
+ setTimeout(() => {
+ this.qiangDanList();
+ }, 1000);
+ });
},
list3CardIconClick(value) {
uni.navigateTo({
@@ -116,9 +226,9 @@
});
},
// 鍘婚绾�
- toAppointmentClick(id) {
+ toAppointmentClick(value) {
uni.navigateTo({
- url: `/pages/driver-page/appointment/appointment?takeCoalId=${id}`
+ url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}`
});
}
}
@@ -177,25 +287,35 @@
font-weight: 300;
&Top {
background-color: #f5f5f5;
- height: vww(40);
+ height: vww(60);
padding-left: vww(12);
- line-height: vww(40);
+ line-height: vww(31);
border: vww(1) solid #eeeeee;
font-weight: 400;
+ .tmcode {
+ word-break: break-all;
+ width: 100%;
+ }
}
&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;
+ }
}
}
}
@@ -207,11 +327,15 @@
margin-top: vww(24);
&Top {
background-color: #f5f5f5;
- height: vww(40);
+ height: vww(60);
padding-left: vww(12);
- line-height: vww(40);
+ line-height: vww(31);
border: vww(1) solid #eeeeee;
font-weight: 400;
+ .tmcode {
+ word-break: break-all;
+ width: 100%;
+ }
}
&Center {
border: vww(1) solid #eeeeee;
--
Gitblit v1.9.1