From 2d742116c8cdc3a3f646e20340a185455f18cd5a Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期四, 29 六月 2023 09:56:56 +0800
Subject: [PATCH] 称重页面问题修改
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 96 +++++++++++++++++++++++++++++++----------------
1 files changed, 63 insertions(+), 33 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index 739eb25..36b3c6a 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -25,7 +25,7 @@
</view>
<view class="bottom"><text>TIP:褰撳墠鐘舵�佷负姝ｅ父鏃跺彲浠ョО閲�</text></view>
</view>
- <view class="middle-block"
+ <!-- <view class="middle-block"
v-if="firstHairCustomernameShow || sideline">
<view class="block-main"
v-if="firstHairCustomernameShow">
@@ -100,7 +100,7 @@
</view>
</view>
<view v-else
- style="width: 100%;height: 40rpx;"></view>
+ style="width: 100%;height: 40rpx;"></view> -->
<view class="bottom-block">
<view class="block-main">
<view class="main-information"
@@ -141,6 +141,10 @@
<view class="suffix">{{ weighList.coalName || '' }}</view>
</view>
<view class="main-information">
+ <view class="prefix">璁㈠崟绫诲瀷:</view>
+ <view class="suffix">{{ weighList.orderType || '' }}</view>
+ </view>
+ <view class="main-information">
<view class="prefix">鐨噸:</view>
<view class="suffix">{{ showWeigh.skin||"" }}
</view>
@@ -172,7 +176,7 @@
<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button type="primary"
text="纭畾绉伴噸"
- :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || !isInputOrigin"
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh "
:loading="isConfirmWeighLoading"
loadingText="纭"
@click="confirmWeigh"></u-button>
@@ -181,7 +185,11 @@
:disabled="addAndSubtractCoalDisabled"
@click="addAndSubtractCoal"
class="jiajian"
- v-if="outBuy"></u-button>
+ v-if="outsourcing"></u-button>
+ <u-button type="primary"
+ text="缁х画鍗歌揣"
+ @click="UnloadingAgainHandle"
+ v-if='outBuy'></u-button>
</view>
<!-- <view class="four" v-if="weighList.orderType !== '澶栬喘'">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view> -->
<!-- 鏀剧┖寮圭獥 -->
@@ -233,9 +241,9 @@
weigh: 0,
tmCode: '',
sceneInOut: '',
- coalContactClean: 0,
- coalContactHair: 0,
- coalContactSkin: 0
+ // coalContactClean: 0,
+ // coalContactHair: 0,
+ // coalContactSkin: 0
},
// 鏄惁濉啓鍘熷彂淇℃伅
isInputOrigin: false,
@@ -270,8 +278,10 @@
// 鑱氱劍鏃舵敼鍙樻牱寮�
isfocus1: false,
isfocus2: false,
- // 澶栬喘绗竴娆＄О姣涢噸涓嶉渶瑕佸姞鍑忓惃
- outBuy: true
+ // 澶栬喘绫诲瀷
+ outBuy: true,
+ // 澶栭攢绫诲瀷
+ outsourcing: true
};
},
watch: {
@@ -279,11 +289,9 @@
if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType ==
'杞嚭') {
if (this.weighList.skin == 0) {
- // this.temporaryWeighObj.skin = this.realTimeWeigh;
this.temporaryWeighObj.skin = newV;
this.isweigh = this.temporaryWeighObj.skin > this.weighList.orderSurplus;
} else {
- // this.temporaryWeighObj.hair = this.realTimeWeigh;
this.temporaryWeighObj.hair = newV;
this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(2);
this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this.temporaryWeighObj
@@ -292,11 +300,9 @@
} else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
.orderType == '杞叆') {
if (this.weighList.hair == 0) {
- // this.temporaryWeighObj.hair = this.realTimeWeigh;
this.temporaryWeighObj.hair = newV;
this.isweigh = this.temporaryWeighObj.hair > this.weighList.orderSurplus;
} else {
- // this.temporaryWeighObj.skin = this.realTimeWeigh;
this.temporaryWeighObj.skin = newV;
this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(2);
this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this.temporaryWeighObj
@@ -315,14 +321,11 @@
this.changeisLogin(true)
this.realTimeWeigh = 0
},
- onHide() {
-
- },
computed: {
...mapState(['globalweigh', 'globalinfraredStatus']),
- coalContactClean() {
- return (Number(this.weighData.coalContactHair) - Number(this.weighData.coalContactSkin)).toFixed(2);
- },
+ // coalContactClean() {
+ // return (Number(this.weighData.coalContactHair) - Number(this.weighData.coalContactSkin)).toFixed(2);
+ // },
token() {
return uni.getStorageSync('token');
},
@@ -370,18 +373,19 @@
this.weighData.filedId = res.data.filedId;
this.weighData.coalContactHair = res.data.hairTwo ? res.data.hairTwo : 0;
this.weighData.coalContactSkin = res.data.skinTwo ? res.data.skinTwo : 0;
- if (this.weighList.orderType == '澶栬喘') {
- this.firstHairCustomernameShow = true;
- if (this.weighList.hair > 0) {
- this.haveInputOrigin = true;
- this.isInputOrigin = true;
- }
- if (this.weighList.hair == 0) {
- this.outBuy = false;
- }
- } else {
- this.isInputOrigin = true;
- }
+ this.outBuy = this.weighList.orderType == '澶栬喘' && this.weighList.hair > 0;
+ this.outsourcing = this.weighList.orderType == '澶栭攢' && this.weighList.hair > 0;
+ // if (this.weighList.orderType == '澶栬喘') {
+ // if (this.weighList.hair > 0) {
+ // this.outBuy = true
+ // this.outsourcing = false;
+ // }
+ // } else if (this.weighList.orderType == '澶栭攢') {
+ // if (this.weighList.hair > 0) {
+ // this.outsourcing = true;
+ // this.outBuy = false
+ // }
+ // }
}
});
},
@@ -410,7 +414,7 @@
},
// 纭绉伴噸鎺ュ彛
saveWeigh() {
- this.weighData.coalContactClean = this.coalContactClean;
+ // this.weighData.coalContactClean = this.coalContactClean;
this.$reqPost('saveWeigh', this.weighData, 'json')
.then(res => {
console.log(res, '绉伴噸鎺ュ彛');
@@ -439,7 +443,11 @@
carNo: this.weighData.carNo,
tmId: this.weighData.tmId,
filedId: this.weighData.filedId,
- weigh: this.realTimeWeigh
+ tmId: this.weighData.tmId,
+ gateCameraId: this.weighData.gateCameraId,
+ equipmentCode: this.weighData.equipmentCode,
+ tmCode: this.weighData.tmCode,
+ sceneInOut: this.weighData.sceneInOut
}, 'json').then(res => {
if (res.code == 0) {
this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
@@ -455,6 +463,28 @@
}
});
},
+ // 缁х画鍗歌揣
+ UnloadingAgainHandle() {
+ this.$reqPost('continueWeigh', {
+ deptId: this.weighData.deptId,
+ sceneId: this.weighData.sceneId,
+ carNo: this.weighData.carNo,
+ tmId: this.weighData.tmId,
+ filedId: this.weighData.filedId,
+ tmId: this.weighData.tmId,
+ gateCameraId: this.weighData.gateCameraId,
+ equipmentCode: this.weighData.equipmentCode,
+ tmCode: this.weighData.tmCode,
+ sceneInOut: this.weighData.sceneInOut
+ }, 'json').then(res => {
+ if (res.code == 0) {
+ this.$u.toast('鎿嶄綔鎴愬姛');
+
+ } else {
+ this.$u.toast('鎿嶄綔澶辫触锛岃绋嶅�欓噸璇�');
+ }
+ })
+ },
// 鏀剧┖
evacuation() {
this.evacuationModalShow = true;
--
Gitblit v1.9.1