From 02f31fc889ea6ff00bb5237a1a50f712586b2aa3 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 20 六月 2024 10:24:33 +0800
Subject: [PATCH] Merge branch 'develop/steels' into steels
---
pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue | 93 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 84 insertions(+), 9 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
index 9a59a41..9d4a538 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
@@ -421,7 +421,9 @@
<u--image :showLoading="true"
:src="`${BaseUrl}${val}`"
width="80px"
- height="80px">
+ height="80px"
+ @click="imageClick(val)"
+ >
<view slot="error"
style="font-size: 24rpx;">鍔犺浇澶辫触</view>
</u--image>
@@ -440,7 +442,7 @@
height="150"
:previewFullImage="true">
</u-upload>
- </view>
+ </view>
<u--list
:height="0"
style=" margin-left: 50rpx;margin-top: 30rpx;"
@@ -583,6 +585,19 @@
@select="selectUnqualifiedClick"></u-action-sheet>
</view>
</view>
+ <!-- 鍘熷彂鍑哄満鏃堕棿 -->
+ <view v-if="roleType!==4">
+ <view>
+ <text>璐х墿鍙戣揣鍦板嚭鍦烘椂闂存垨鍙戣揣纾呭崟鏃堕棿锛�</text>
+ </view>
+ <view>
+ <uni-datetime-picker
+ v-model="outDate"
+ type="datetime"
+ @change="datechange"
+ />
+ </view>
+ </view>
<!-- 鏂板 楠岃川澶囨敞銆傞獙璐ㄨ鏄� -->
<view v-if=" isYanz()">
<view v-if="coalDetailsData.orderType == '澶栬喘'">
@@ -723,22 +738,40 @@
@close='unqualifiedClose'
@select="selectUnqualifiedClick"></u-action-sheet>
</view>
+
+
</view>
</view>
-
+ <!-- 鍥剧墖棰勮寮瑰嚭妗� -->
+ <view class="previewImage-container">
+ <u-popup :show="previewImageShow"
+ mode="center"
+ @close="previewImageClose"
+ @open="previewImageOpen">
+ <u--image :src="previewImageSrc != null ? BaseUrl + previewImageSrc : ''"
+ width="400px"
+ height="400px"></u--image>
+ </u-popup>
+ </view>
</view>
</template>
<script>
import BigNumber from "bignumber.js"
+ import formatDate from '@/utils/date'
import { BaseUrl } from '@/api/publicInterface.js';
import { onlineurl } from '@/api/request.js'
import { mapState, mapMutations } from "vuex"
export default {
data() {
return {
+ dateInpShow:false,
+ outDate:'',
+ dateValue:'',
+ previewImageShow:false,
qualityInstructions:"",
+ previewImageSrc: '',
penaltyType:[],
indexFlag:0, // 涓嬫爣鏍囧織浣�
remarks:'',
@@ -912,13 +945,24 @@
},
cleanWeight(){
return function(item){
- if(!item.weight){
+ // if(!item.weight){
+ // return ''
+ // }else if(item.weight && !item.unqualifiedWeight){
+ // return item.weight
+ // }else if(item.weight && item.unqualifiedWeight){
+ // return item.weight
+ // }
+ if(item.weight){
+ return item.weight
+ }else if(!item.clean){
return ''
- }else if(item.weight && !item.unqualifiedWeight){
- return item.weight
- }else if(item.weight && item.unqualifiedWeight){
- return item.weight
+
+ } else if(item.clean && !item.unqualifiedWeight){
+ return item.clean
+ }else if(item.clean && item.cinderWeight){
+ return new BigNumber(item.clean - 0).minus(item.cinderWeight - 0);
}
+ console.log(item,'clearnWeight')
}
},
//鍚堟牸鍑�閲�
@@ -934,7 +978,8 @@
let z = new BigNumber(znums.reduce((p,n)=>{
return (p - 0) + (n - 0)
},0))
- return (item.weight - z).toFixed(2);
+ let y = new BigNumber(item.cinderWeight)
+ return new BigNumber(item.clean - 0).minus(z).minus(y);
}
}
@@ -1027,6 +1072,8 @@
uni.hideLoading()
this.coalDetailsData = res.data;
this.remarks = res.data.remarks;
+ this.dateValue = res.data.startTime;
+ this.outDate = res.data.startTime;
this.qualityInstructions = res.data.qualityInstructions
this.orderCode = res.data.orderCode
this.showWeigh = this.coalDetailsData.tmTaskCoalItems ? this.coalDetailsData
@@ -1081,6 +1128,13 @@
})
})
},
+ previewImageClose() {
+ this.previewImageShow = false;
+ },
+ previewImageOpen() {
+ this.previewImageShow = true;
+ console.log('preview open');
+ },
GetOrderPlan() {
uni.showLoading({ title: '鍔犺浇涓�...' });
this.$reqGet('GetOrderPlan').then(res => {
@@ -1108,12 +1162,23 @@
}
})
},
+ imageClick(imgStr){
+ console.log(imgStr,'瑙﹀彂')
+ this.previewImageSrc = imgStr;
+
+ this.$nextTick(() => {
+ this.previewImageShow = true;
+ });
+
+
+ },
// 鐐瑰嚮纭
confirmInput() {
let flag = true;
let params = {},unqualifiedWeightAll;
params.qualityInstructions = this.qualityInstructions;
params.remarks = this.remarks;
+ params.startTime = this.dateValue;
console.log( this.showWeigh,' this.showWeigh')
this.showWeigh = this.showWeigh.map((v, i) => {
console.log(this.penaltyType,this.$refs.checkbox,'123')
@@ -1458,6 +1523,16 @@
// }
console.log(event,'event')
+ },
+ dateInpFoucs(){
+ console.log('鑱氱劍');
+ this.dateInpShow = true;
+ },
+ datechange(value){
+ console.log('dateChange',value,formatDate.formatDate(new Date(value)) );
+ this.dateValue = (formatDate.formatDate(new Date(value)) + ':' + '00');
+
+
}
},
}
--
Gitblit v1.9.1