From 6a232ec3d1d75af66b5afb475895d585a494cbaf Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期六, 29 六月 2024 16:24:35 +0800
Subject: [PATCH] feat:小程序修改问题若干
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 142 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 123 insertions(+), 19 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..d9f67c7 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>
@@ -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">
@@ -99,7 +100,9 @@
聽 <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,7 +188,47 @@
</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>鍘熷彂纾呭崟
@@ -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"
@@ -419,7 +462,7 @@
return {
swiperList:[],
orderPlanId: null,
- radioValue:'鐓ゅ満',
+ radioValue:'鍦哄湴',
tmTaskCoalList:[],
currentNum:0,
guideLineshow:false,
@@ -430,6 +473,7 @@
affiliationId:'',
type:2,
},
+ wareList:[],
coalDetailsData: {
tmTaskCoalList:[]
}, // 鎻愮叅鍗曡鎯�
@@ -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();
@@ -664,6 +724,7 @@
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;
@@ -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;
@@ -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();
--
Gitblit v1.9.1