From 04f3f15c930c2b02187d0ce11d68978b65361d54 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 31 三月 2023 09:26:29 +0800
Subject: [PATCH] 修复多数bug
---
pages/driver-page/driver-index/driver-index.vue | 110 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 84 insertions(+), 26 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index a0867bd..f45b708 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>
@@ -55,7 +65,7 @@
<!-- 寰呴绾︽彁鐓ゅ崟 -->
<view class="daiYuYue" v-for="(item, index) in driverBillOfLoadingData.list3" :key="index">
<view class="daiYuYueTop">
- <text>鎻愮叅鍗曠紪鍙凤細{{ item.code }}</text>
+ <text class="tmcode">鎻愮叅鍗曠紪鍙凤細{{ item.code }}</text>
</view>
<view class="daiYuYueTable">
<!-- <view>{{ item.deptName }}</view>
@@ -63,14 +73,14 @@
<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-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-td align="left">{{ item.cars || 0 }} 杞︽</uni-td>
</uni-tr>
<uni-tr>
<uni-th align="center">鍙戣繍鏃ユ湡</uni-th>
@@ -100,7 +110,7 @@
<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>
@@ -120,13 +130,33 @@
import { customerId } from '@/utils/status';
export default {
+ props: {
+ indexdriverBillOfLoadingData: {
+ type: Object,
+ default: {}
+ }
+ },
+ watch: {
+ indexdriverBillOfLoadingData: {
+ handler(v) {
+ console.log(v, '鍒锋柊涔嬪悗鐨勫徃鏈洪椤�');
+ this.driverBillOfLoadingData = v;
+ },
+ deep: true,
+ immediate: true
+ }
+ },
data() {
return {
- driverBillOfLoadingData: [],
+ driverBillOfLoadingData: {},
// 鎶㈠崟妯℃�佹
qiangDanShow: false,
qiangDanTitle: '鎶㈠崟鎻愮ず',
- qiangDanContent: ''
+ qiangDanContent: '',
+ qiangDanOrderPlanId: null,
+ fleetId: '',
+ xsUserId: '',
+ customerId: ''
};
},
onShow() {
@@ -141,35 +171,49 @@
uni.showLoading({
title: '鍔犺浇涓�...'
});
- // this.$reqGet('qiangDanList', { id: customerId }).then(res => {
this.$reqGet('qiangDanList').then(res => {
- console.log('鎶㈠崟鍒楄〃', res);
+ console.log(res, '鍙告満棣栭〉');
uni.hideLoading();
this.driverBillOfLoadingData = res.data;
});
},
// 鎶㈠崟鎸夐挳
qiangDanBtn(value) {
- if (value.taskNum == 0) {
- this.qiangDan(value.orderPlanId);
+ 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() {},
+ qiangDanConfirm() {
+ this.qiangDanContent = '';
+ this.qiangDanShow = false;
+ this.qiangDan(this.qiangDanOrderPlanId, this.fleetId, this.customerId, this.xsUserId);
+ },
qiangDanCancel() {
this.qiangDanShow = false;
},
// 鎶㈠崟璇锋眰
- qiangDan(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();
- });
+ 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.data ? res.data : '鎶㈠崟澶辫触');
+ }
+ })
+ .then(() => {
+ setTimeout(() => {
+ this.qiangDanList();
+ }, 1000);
+ });
},
list3CardIconClick(value) {
uni.navigateTo({
@@ -244,22 +288,30 @@
font-weight: 300;
&Top {
background-color: #f5f5f5;
- height: vww(40);
+ height: vww(60);
padding-left: vww(12);
line-height: vww(40);
border: vww(1) solid #eeeeee;
font-weight: 400;
+ // .tmcode {
+ // overflow: hidden;
+ // text-overflow: ellipsis;
+ // white-space: nowrap;
+ // width: 100%;
+ // }
}
&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;
@@ -278,11 +330,17 @@
margin-top: vww(24);
&Top {
background-color: #f5f5f5;
- height: vww(40);
+ height: vww(60);
padding-left: vww(12);
line-height: vww(40);
border: vww(1) solid #eeeeee;
font-weight: 400;
+ // .tmcode {
+ // overflow: hidden;
+ // text-overflow: ellipsis;
+ // white-space: nowrap;
+ // width: 100%;
+ // }
}
&Center {
border: vww(1) solid #eeeeee;
--
Gitblit v1.9.1