From dbc79ab43fced444933174bd4148ee9f5dd777c3 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 12 七月 2024 14:20:39 +0800
Subject: [PATCH] fix:修改测试问题
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 183 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 145 insertions(+), 38 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index 69233de..7e4c363 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -7,13 +7,13 @@
fontSize='36'></u-notice-bar>
<view class="top-information">
<view class="cutomer-name"
- v-if="orderType == '杞叆' || orderType == '杞嚭'">鐓ゅ満:{{ coalDetailsData.toFiledName || '' }}</view>
+ v-if="orderType == '杞叆' || orderType == '杞嚭'">鍦哄湴:{{ coalDetailsData.toFiledName || '' }}</view>
<view class="cutomer-name"
v-else>瀹㈡埛:{{ coalDetailsData.customerName || '' }}</view>
<view class="fild-name">
<view class="">鐭垮満:{{ coalDetailsData.deptName || '鏆傛棤' }}</view>
<view class=""
- v-if="orderType == '杞叆' || orderType == '杞嚭'">鐓ゅ満:{{ coalDetailsData.filedName || '' }}</view>
+ v-if="orderType == '杞叆' || orderType == '杞嚭'">鍦哄湴:{{ coalDetailsData.filedName || '' }}</view>
<view class=""
v-else>浠撳簱:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
</view>
@@ -63,7 +63,7 @@
<view class="concrete"
style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
鍑�</view>
- <view class="num" v-if="weightObj.clean">{{ Number(weightObj.clean).toFixed(2) ||"" }}</view>
+ <view class="num" v-if="(weightObj.clean || (weightObj.clean && weightObj.clean === 0) )">{{ Number(weightObj.clean).toFixed(2) ||"" }}</view>
</view>
</view>
</view>
@@ -81,7 +81,8 @@
<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-th align="center">鎵ｅ惃</uni-th>
+ <uni-th align="center">浠舵暟</uni-th>
</uni-tr>
<uni-tr v-for="(subItem, index) in tmTaskCoalList" :key="index">
<uni-td align="center">
@@ -93,13 +94,15 @@
<view class="name" v-if="subItem.hair">{{ Number(subItem.hair) .toFixed(2) || '' }}</view>
</uni-td>
<uni-td align='right'>
- <view class="name" v-if="subItem.clean">{{ Number( subItem.clean).toFixed(2) || '' }}</view>
+ <view class="name" v-if="(subItem.clean || (subItem.clean && subItem.clean === 0))">{{ Number( subItem.clean).toFixed(2) || '' }}</view>
</uni-td>
聽 <uni-td align="right">
<view>{{ subItem.discount }}</view
></uni-td>
-
+ <uni-td align="right">
+ <view>{{ subItem.productQuantity }}</view
+ ></uni-td>
</uni-tr>
</uni-table>
</view>
@@ -128,16 +131,16 @@
<!-- title -->
<view slot="title">
<view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
-
</view>
<view class="" slot='cont'>
-<u-form :model="originInfoForm"
+ <u-form :model="originInfoForm"
:rules="rules"
label-position="top"
label-width="160"
:label-style="{'marginLeft':'9px'}"
ref="originInfoRef">
- <u-form-item prop="coalContactSkin">
+ <view v-if="coalDetailsData.isWeight">
+ <u-form-item prop="coalContactSkin">
<view class="second-line">
<view class="label-text"
:class="{ focusClass: isfocus1 }"><text style="color: #f56c6c;">*</text>鐨噸</view>
@@ -185,17 +188,57 @@
</view>
<view class="unit">鍚�</view>
</view>
- </u-form-item>
+ </u-form-item>
+ </view>
+ <!-- 杈撳叆鏁伴噺 -->
+ <view v-else class="table-div">
+ <uni-table
+ border
+ id="table-box"
+ 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-th align="center">鏁伴噺</uni-th>
+ </uni-tr>
+ <uni-tr v-for="(subItem, index) in coalDetailsData.tmTaskCoalList" :key="index">
+ <uni-td align="center">
+ <view class="name">{{ subItem.productName }}</view></uni-td>
+ <!-- <uni-td align='right'>
+ <view v-if="subItem.skin">{{ Number( subItem.skin).toFixed(2) || ''}}</view>
+ </uni-td>
+ <uni-td align='right'>
+ <view class="name" v-if="subItem.hair">{{ Number(subItem.hair) .toFixed(2) || '' }}</view>
+ </uni-td>
+ <uni-td align='right'>
+ <view class="name" v-if="subItem.clean">{{ Number( subItem.clean).toFixed(2) || '' }}</view>
+ </uni-td> -->
+
+ 聽 <uni-td align="right">
+ <view>
+ <u--input
+ placeholder="璇疯緭鍏ヤ骇鍝佹暟閲�"
+ type='number'
+ v-model="subItem.productQuantity"
+ ></u--input>
+ </view></uni-td>
+
+ </uni-tr>
+ </uni-table>
+ </view>
+
<u-form-item prop='contactPicture'>
<view class="label-text">
- <text style="color: #f56c6c;">*</text>鍘熷彂纾呭崟
+ <text style="color: #f56c6c;">*</text>鍘熷彂鍗曟嵁
</view>
<u-upload :fileList="fileList1"
@afterRead="afterRead"
@delete="deletePic"
name="1"
multiple
- :maxCount="2"
+ :maxCount="deletable ? fileList1.length : 2"
width="250"
height="150"
:previewFullImage="true"
@@ -311,7 +354,7 @@
<!-- <view class="completeOutSale">
<u-modal :show="completeOutSaleShow"
title="纭"
- content="鏄惁瀹屾垚澶栭攢鎻愮叅鍗�"
+ content="鏄惁瀹屾垚澶栭攢鏀跺彂鍗�"
:showCancelButton="true"
@confirm="completeOutSaleConfirm"
@cancel="completeOutSaleCancel"></u-modal>
@@ -331,14 +374,14 @@
placement="row"
@change="radioChange"
>
- <u-radio label="鐓ゅ満" :name="'鐓ゅ満'" :labelSize="30" :size="30"></u-radio>
- <u-radio label="鍗曚綅" :name="'鍗曚綅'":labelSize="30" :size="30"></u-radio>
+ <u-radio label="鍦哄湴" :name="'鍦哄湴'" :labelSize="30" :size="30"></u-radio>
+ <u-radio v-for="(item,index) in wareList" :label="'浠撳簱'+(index+1)" :name="index":labelSize="30" :size="30" ></u-radio>
</u-radio-group>
<div class="guidebox">
<u-swiper
v-if="guideLineshow"
- :height="200"
+ :height="400"
@click="swiperClick"
:list="swiperList"
keyName="image"
@@ -374,7 +417,7 @@
printerStyle
},
onPullDownRefresh() {
- this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
+ this.getTakeCoal(); //鑾峰彇鏀跺彂鍗曡鎯�
uni.stopPullDownRefresh();
},
onLoad(value) {
@@ -389,7 +432,7 @@
this.changeglobalIsFirstWeighing(1)
if (this.globalIsFirstWeighing === 1) {
console.log('鑾峰彇璇︽儏 onload');
- this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
+ this.getTakeCoal(); //鑾峰彇鏀跺彂鍗曡鎯�
}
this.init(); //鑾峰彇鏃ュ織
this.getgetService(); //鑾峰彇瀹㈡湇
@@ -398,7 +441,7 @@
this.coalDayPage(); //鑾峰彇鏃ュ織 瀹氭椂浠诲姟
if (this.globalIsFirstWeighing === 2) {
console.log('鑾峰彇璇︽儏 onShow');
- this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
+ this.getTakeCoal(); //鑾峰彇鏀跺彂鍗曡鎯�
}
},
onHide() {
@@ -419,7 +462,7 @@
return {
swiperList:[],
orderPlanId: null,
- radioValue:'鐓ゅ満',
+ radioValue:'鍦哄湴',
tmTaskCoalList:[],
currentNum:0,
guideLineshow:false,
@@ -430,10 +473,11 @@
affiliationId:'',
type:2,
},
+ wareList:[],
coalDetailsData: {
tmTaskCoalList:[]
- }, // 鎻愮叅鍗曡鎯�
- currentPageCoalStatus: 0, // 褰撳墠椤甸潰鎻愮叅鍗曠姸鎬�
+ }, // 鏀跺彂鍗曡鎯�
+ currentPageCoalStatus: 0, // 褰撳墠椤甸潰鏀跺彂鍗曠姸鎬�
// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁�
getWeightHouseObj: {
deptId: '',
@@ -492,8 +536,8 @@
},
completeOutSaleShow: false,
overTmWaixiao: null,
- list: [{ name: '鎵嬫満鍙�', subname: '1213456', id: 1 }, { name: '寰俊璇煶', id: 2 }], //鍛煎彨瀹㈡湇閫夐」
- servieceShow: false,
+ list: [{ name: '鎵嬫満鍙�', subname: '', id: 1 }], //鍛煎彨瀹㈡湇閫夐」 { name: '寰俊璇煶', id: 2 }
+ servieceShow: false,
ablePrintInduction: false, //鍏ラ棬璇佹槸鍚︽樉绀�
ablePrintOut: false, //鍑洪棬璇佹槸鍚︽樉绀�
enterLoading: false, //鍏ラ棬鎸夐挳loading
@@ -563,9 +607,25 @@
return this.correctStatus !== 3
},
coalContactClean() {
+ if(this.coalDetailsData.isWeight){
let xx = BigNumber(this.originInfoForm.coalContactHair ? this.originInfoForm.coalContactHair : 0)
let yy = BigNumber(this.originInfoForm.coalContactSkin ? this.originInfoForm.coalContactSkin : 0)
return xx.minus(yy).toNumber() > 0 ? xx.minus(yy).toNumber().toFixed(2) : 0
+ }else{
+ //鏁伴噺
+ if(!this.coalDetailsData.tmTaskCoalList.length){
+ return false
+ }else{
+ const reslut = this.coalDetailsData.tmTaskCoalList.find(item=>!item.productQuantity);
+ console.log(reslut);
+ if(reslut){
+ return false
+ }else{
+ return true
+ }
+ }
+ }
+
},
currentTime() {
let currentDate = new Date();
@@ -651,7 +711,7 @@
}
})
},
- // 鑾峰彇鎻愮叅鍗曡鎯�
+ // 鑾峰彇鏀跺彂鍗曡鎯�
getTakeCoal() {
uni.showLoading({
title: '鍔犺浇涓�'
@@ -659,11 +719,12 @@
this.$reqGet('getTakeCoal', { takeCoalId: this.orderPlanId }).then(res => {
if (res.code == 0) {
uni.hideLoading();
- console.log(res, '鎻愮叅鍗曡鎯�');
+ console.log(res, '鏀跺彂鍗曡鎯�');
this.coalDetailsData = res.data;
this.orderType = this.coalDetailsData.orderType;
//
this.isSpecial = res.data.isSpecial
+ this.wareList=res.data.bunkerIds.split(",")
// // 鍒ゆ柇鏄惁瀹屾垚澶栭攢璁㈠崟
// this.completeOutSale.orderType = this.coalDetailsData.orderType;
// this.completeOutSale.deptId = this.coalDetailsData.deptId;
@@ -682,7 +743,7 @@
// 鑾峰彇瀹㈡湇openId鍙傛暟璧嬪��
this.getServiceOpenid.deptId = this.coalDetailsData.deptId;
this.getServiceOpenid.filedId = this.coalDetailsData.filedId;
- // 鑾峰彇鎻愮叅鍗曠姸鎬�
+ // 鑾峰彇鏀跺彂鍗曠姸鎬�
this.currentPageCoalStatus = this.coalDetailsData.status;
// 鑾峰彇鍘熷彂淇℃伅
this.primarySkin = this.coalDetailsData.skinTwo;
@@ -693,8 +754,14 @@
this.ablePrintOut = this.coalDetailsData.hair && this.coalDetailsData.skin || this
.coalDetailsData.status === 6
// 鍘熷彂淇℃伅鍥炴樉浠ュ強鎺у埗鏄惁鍙慨鏀�
- this.haveInputOrigin = !this.coalDetailsData.skinTwo && this.coalDetailsData.orderType ===
- '澶栬喘'
+ const originFlag = this.coalDetailsData.tmTaskCoalList.find(item=>!item.productQuantity);
+ if(this.coalDetailsData.isWeight === 1){
+ this.haveInputOrigin = (!this.coalDetailsData.skinTwo && this.coalDetailsData.orderType ===
+ '澶栬喘')
+ }else{
+ this.haveInputOrigin = !!originFlag
+ }
+ console.log(originFlag,this.coalDetailsData.tmTaskCoalList,'origin')
this.deletable = this.coalDetailsData.status > 3
this.originInfoForm.coalContactSkin = this.coalDetailsData.skinTwo;
this.originInfoForm.coalContactHair = this.coalDetailsData.hairTwo;
@@ -757,7 +824,7 @@
});
}, 5000);
},
- // 灞曠ず鎻愮叅鍗曡鎯�
+ // 灞曠ず鏀跺彂鍗曡鎯�
showCaolPickUpBill() {
uni.navigateTo({
url: `/pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill?orderPlanId=${this.orderPlanId}`
@@ -1089,7 +1156,8 @@
taskCoalCode: this.coalDetailsData.code,
carNo: this.coalDetailsData.carNo,
}
- if (this.originInfoForm.coalContactSkin && this.originInfoForm.coalContactHair && this
+ if(this.coalDetailsData.isWeight === 1){
+ if (this.originInfoForm.coalContactSkin && this.originInfoForm.coalContactHair && this
.originInfoForm
.contactPicture) {
this.submitOriginInfoLoading = true
@@ -1111,6 +1179,42 @@
} else {
uni.$u.toast('璇峰～鍐欏畬鏁村師鍙戜俊鎭�')
}
+ }else{
+ //鏁伴噺
+ form.numDtoList = this.coalDetailsData.tmTaskCoalList.map(item=>{
+ let obj = {
+ tmId:item.id,
+ num:Number(item.productQuantity)
+ }
+ return obj;
+ });
+ //鍒犻櫎鐨瘺鍑�
+ delete form.clean;
+ delete form.hair;
+ delete form.skin;
+ if (this.coalContactClean && this
+ .originInfoForm
+ .contactPicture) {
+ this.submitOriginInfoLoading = true;
+ console.log(form,'form')
+ this.$reqPost('appSaveContact', form, 'json').then(res => {
+ if (res.code === 0) {
+ this.$u.toast('鎻愪氦鎴愬姛')
+ this.submitOriginInfoLoading = false
+ } else {
+ this.submitOriginInfoLoading = false
+ this.$u.toast(res.msg ? res.msg : '鎻愪氦澶辫触')
+ }
+ }).then(()=>{
+ setTimeout(() => {
+ this.getTakeCoal()
+ }, 1000);
+ })
+ } else {
+ uni.$u.toast('璇峰～鍐欏畬鏁村師鍙戜俊鎭�')
+ }
+ }
+
},
streamView() {
uni.navigateTo({
@@ -1138,7 +1242,7 @@
this.guideLineshow = true;
this.swiperList = [];
this.activeText = '';
- this.activeObj.affiliationId = this.coalDetailsData.filedId; //榛樿鏌ョ叅鍦�
+ this.activeObj.affiliationId = this.coalDetailsData.filedId;
this.getguideFun();
},
@@ -1146,12 +1250,12 @@
this.guideLineshow = false;
},
radioChange(item){
- console.log(item);
- if(item == '鐓ゅ満'){
+ console.log(111,item,this.coalDetailsData,this.wareList);
+ if(item == '鍦哄湴'){
this.activeObj.affiliationId = this.coalDetailsData.filedId;
this.activeObj.type = 2
}else{
- this.activeObj.affiliationId = this.coalDetailsData.deptId;
+ this.activeObj.affiliationId = this.wareList.length>0?this.wareList[item]:this.coalDetailsData.deptId;
this.activeObj.type = 1
}
this.getguideFun();
@@ -1413,7 +1517,7 @@
.sub-table{
width: 690rpx;
min-height: 300rpx;
- margin: vww(20) vww(15) vww(13);
+ margin: vww(40) vww(15) vww(13);
background: #ffffff;
box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
border-radius: 20rpx;
@@ -1426,9 +1530,12 @@
align-items: flex-start;
/deep/ .uni-table{
min-width: 0!important;
- }
-
+
}
+ .uni-table::-webkit-scrollbar {
+ display: none;
+ }
+ }
.origin-info {
width: 690rpx;
--
Gitblit v1.9.1