From 22bf89749751bf2204ca1d1d30bda9ce7fde3e5b Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 22 三月 2024 10:20:47 +0800
Subject: [PATCH] fix：皮重阈值删除等于
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 11 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 e2a8418..7bb0318 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
@@ -38,6 +38,12 @@
<view class="order-code"
v-if="!isSpecial">
璁㈠崟缂栧彿: {{ coalDetailsData.orderCode || '' }}</view>
+ <view class="stream-view"
+ style="color: #475bfd;"
+ @click="streamView"
+ v-show="timeLineStatus===9">
+ 鏌ョ湅瑁呰浇鎯呭喌
+ </view>
<view class="weigh-item">
<view class="item">
<view class="concrete"
@@ -199,7 +205,8 @@
@click="cengZhongClick"
type="primary"
shape="circle"
- :disabled="haveInputOrigin&&!isSpecial"></u-button>
+ :disabled="haveInputOrigin&&!isSpecial"
+ :loading="weighHouseLoading"></u-button>
</view>
<view class="weigh-button"
v-show='ablePrintInduction&&!(coalDetailsData.skin&&coalDetailsData.hair)'>
@@ -280,10 +287,10 @@
this.orderPlanId = value.orderPlanId;
this.yyId = value.yyId;
this.originInfoVisible = value.orderType === '澶栬喘'
- if (value.overTmWaixiao) {
- this.overTmWaixiao = value.overTmWaixiao
- this.getWeightHouseObj.overTmWaixiao = value.overTmWaixiao
- }
+ // if (value.overTmWaixiao) {
+ // this.overTmWaixiao = value.overTmWaixiao
+ // this.getWeightHouseObj.overTmWaixiao = value.overTmWaixiao
+ // }
this.fileList1 = []
this.changeglobalIsFirstWeighing(1)
if (this.globalIsFirstWeighing === 1) {
@@ -406,11 +413,13 @@
timeout: '0',
wsgShow: false,
timeLineStatus: null,
+ timeLineEqCode: '',
originInfoNotice: '濉啓鍘熷彂淇℃伅鍚庡彲涓婄璁￠噺',
submitOriginInfoLoading: false,
ischeckedDefault: 0,
isSpecial: null, //1 鏄壒娈� 0涓嶆槸鐗规畩
printerType: '', //鍒ゆ柇鎵撳嵃鐨勬槸鍑洪棬璇佽繕鏄叆闂ㄨ瘉
+ weighHouseLoading: false
};
},
watch: {
@@ -475,6 +484,7 @@
this.$reqGet('coalDayPage', { id: this.orderPlanId, timeout: this.timeout }).then(res => {
if (res.code == 0) {
this.timeLineStatus = res.data[0].taskStatus
+ this.timeLineEqCode = res.data[0].eqCode
this.dayRZ = res.data.map(v => {
let slicedate = v.taskStatusDes.slice(0, 10);
if (slicedate == this.currentDate) {
@@ -568,15 +578,24 @@
}
}).then(() => {
// 鍒ゆ柇褰撳墠鏃堕棿鏄惁瓒呭嚭棰勭害鏃堕棿
- setTimeout(() => {
+ ;
+ if([1, 2, 13].includes(this.coalDetailsData.status) ){
+ setTimeout(() => {
let endTime = this.coalDetailsData.yuYueSection.slice(0, 10) + ' ' + this
.coalDetailsData
.yuYueSection.slice(-5);
- if (dayjs(this.currentTime).isAfter(endTime) && this.coalDetailsData.status <= 1) {
+ // 鏈�澶х害鏉熸椂闂� maxRestrainTime
+ const maxRestrainTime = dayjs().subtract(this.coalDetailsData.flexibleTime,
+ 'minute')
+ .format('YYYY-MM-DD HH:mm:ss');
+ console.log(maxRestrainTime, this.correctStatus);
+ if (dayjs(maxRestrainTime).isAfter(endTime) && this.correctStatus <= 1) {
// this.$u.toast('宸茶秴鍑洪绾︽椂闂�,鍙偣鍑诲叆鍦虹敵璇烽噸鏂板叆鍦�')
this.timeout = '1'
}
}, 1000)
+ }
+
})
},
// 鏃ュ織鏌ヨ
@@ -585,6 +604,7 @@
this.$reqGet('coalDayPage', { id: this.orderPlanId, timeout: this.timeout }).then(res => {
if (res.code == 0) {
this.timeLineStatus = res.data[0].taskStatus
+ this.timeLineEqCode = res.data[0].eqCode
this.dayRZ = res.data.map(v => {
let slicedate = v.taskStatusDes.slice(0, 10);
if (slicedate == this.currentDate) {
@@ -688,8 +708,10 @@
// 绉伴噸
cengZhongClick() {
this.changeglobalIsFirstWeighing(2)
+ this.weighHouseLoading = true
this.$reqGet('getWeighHouse', this.getWeightHouseObj).then(res => {
console.log(res, '鑾峰彇纾呮埧');
+ this.weighHouseLoading = false
if (res.code == 0) {
this.weighData.sceneId = res.data.id;
this.weighData.gateCameraId = res.data.lastEquipmentId;
@@ -708,12 +730,14 @@
res.data.id
}&gateCameraId=${res.data.lastEquipmentId}&gateCameraCode=${res.data.lastEquipmentCode}&weighHouseCode=${res.data.code}&primarySkin=${
this.primarySkin
- }&primaryHair=${this.primaryHair}&primaryClean=${this.primaryClean}&sceneInOut=${res.data.sceneInOut}&overTmWaixiao=${this.overTmWaixiao}`
+ }&primaryHair=${this.primaryHair}&primaryClean=${this.primaryClean}&sceneInOut=${res.data.sceneInOut}&overTmWaixiao=${this.overTmWaixiao}&deptId=${this.getWeightHouseObj.deptId }`
});
} else {
this.$u.toast(res.msg ? res.msg : '鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�');
}
- });
+ }).catch(() => {
+ this.weighHouseLoading = false
+ })
},
// 鏀剧┖
evacuation() {
@@ -950,6 +974,11 @@
} else {
uni.$u.toast('璇峰～鍐欏畬鏁村師鍙戜俊鎭�')
}
+ },
+ streamView() {
+ uni.navigateTo({
+ url: `/pages/public-page/driverStream/driverStream?eqCode=${this.timeLineEqCode}`
+ })
}
}
};
@@ -992,7 +1021,8 @@
width: 94%;
margin: 0 auto;
height: vww(52);
- @include flex position: relative;
+ @include flex;
+ position: relative;
flex-direction: column;
justify-content: space-between;
align-items: flex-start;
@@ -1036,7 +1066,8 @@
overflow: hidden;
.block-main {
- @include flex width: 94%;
+ @include flex ;
+ width: 94%;
height: 336rpx;
margin: vww(18) vww(7) vww(11) vww(17);
flex-direction: column;
@@ -1110,6 +1141,12 @@
color: #7d7d7d;
}
+ .stream-view {
+ height: vww(18);
+ margin: vww(8);
+ margin-left: 0;
+ }
+
.weigh-item {
width: 100%;
height: vww(36);
--
Gitblit v1.9.1