From fb4fa76b4c1a93c833cd97f97f41b6158ab1aef7 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 21 四月 2023 17:24:44 +0800
Subject: [PATCH] 修改bug
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 235 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 165 insertions(+), 70 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 7363ee3..077c4e2 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
@@ -12,7 +12,7 @@
</view>
<view class="">
绾㈠:
- <u--text :type="infraredStatus ? 'error' : 'success'" :text="infraredStatus ? '寮傚父' : '姝ｅ父'" size="34"></u--text>
+ <u--text :type="globalinfraredStatus ? 'error' : 'success'" :text="globalinfraredStatus ? '寮傚父' : '姝ｅ父'" size="34"></u--text>
</view>
<!-- <view class="">
闆疯揪:
@@ -20,11 +20,20 @@
</view> -->
</view>
</view>
+ <view class="bottom" v-if="weighList.orderType == '澶栭攢' || weighList.orderType == '杞嚭' || weighList.orderType == '澶栬喘'">
+ <view>
+ <view style="font-weight: 600;">鍘熷彂淇℃伅</view>
+ <text v-if="weighList.orderType == '澶栬喘' && weighList.hair == 0">
+ 姣涢噸:{{ coalContactHair || '' }}鐨噸:{{ coalContactSkin || '' }}鍑�閲�:{{ (Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2) || '' }}
+ </text>
+ <text v-else>姣涢噸:{{ primaryHair || '' }}鐨噸:{{ primarySkin || '' }}鍑�閲�:{{ primaryClean || '' }}</text>
+ </view>
+ </view>
<view class="bottom"><text>TIP:褰撳墠鐘舵�佷负姝ｅ父鏃跺彲浠ョО閲�</text></view>
</view>
<view class="two">
<p>璁㈠崟缂栧彿锛歿{ weighList.code || '' }}</p>
- <p>璁㈠崟绫诲瀷锛歿{ weighList.orderTye || '' }}</p>
+ <p>璁㈠崟绫诲瀷锛歿{ weighList.orderType || '' }}</p>
<p>璁㈠崟浣欓噺锛歿{ weighList.orderSurplus || 0 }}</p>
<p>鐨噸锛歿{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}</p>
<p>姣涢噸锛歿{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair }}</p>
@@ -35,19 +44,19 @@
</view>
<view class="three">
<!-- 鏀剧┖ -->
- <u-button type="primary" text="鏀剧┖" plain @click="evacuation" throttleTime="500" :disabled="isEvacuation"></u-button>
+ <u-button type="primary" text="鏀剧┖" plain @click="evacuation" throttleTime="500" :disabled="!isEvacuation"></u-button>
<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button
type="primary"
text="纭畾绉伴噸"
- :disabled="realTimeWeigh == 0 || infraredStatus"
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh"
:loading="isConfirmWeighLoading"
- loadingText="鍔犺浇涓�"
+ loadingText="纭"
@click="confirmWeigh"
></u-button>
<u-button type="primary" text="杩斿洖鍔犲噺鍚�" :disabled="addAndSubtractCoalDisabled" @click="addAndSubtractCoal" class="jiajian"></u-button>
</view>
- <view class="four" v-if="weighList.orderTye !== '澶栬喘'">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view>
+ <view class="four" v-if="weighList.orderType !== '澶栬喘'">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view>
<!-- 鏀剧┖寮圭獥 -->
<view class="evacuationModal">
<u-modal
@@ -59,20 +68,46 @@
@cancel="evacuationCancel"
></u-modal>
</view>
+ <!-- 澶栬喘绫诲瀷鎵嬪姩杈撳叆寮圭獥 -->
+ <view class="">
+ <u-modal :show="firstHairCustomernameShow" title="濉啓鍘熷彂閲嶉噺" @confirm="OutsourcingConfirm">
+ <view class="">
+ <text>姣涢噸:</text>
+ <view class=""><u--input placeholder="璇疯緭鍏ユ瘺閲�" v-model="coalContactHair" type="digit"></u--input></view>
+ <text>鐨噸:</text>
+ <view class=""><u--input placeholder="璇疯緭鍏ョ毊閲�" v-model="coalContactSkin" type="digit"></u--input></view>
+ </view>
+ </u-modal>
+ </view>
+ <!-- 鎵嬪姩杈撳叆涔嬪悗鐨勪簩娆″脊绐� -->
+ <view class="secondary-confirmation">
+ <u-modal :show="secondConfirmShow" title="璇风‘璁ゅ師鍙戦噸閲�" :showCancelButton="true" @confirm="secondConfirm" @cancel="secondCancel">
+ <view class="secondary-confirmation__main">
+ <view class="secondary-child">姣涢噸:{{ coalContactHair }}</view>
+ <view class="secondary-child">鐨噸:{{ coalContactSkin }}</view>
+ <view class="secondary-child">鍑�閲�:{{ (Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2) }}</view>
+ </view>
+ </u-modal>
+ </view>
</view>
</template>
<script>
let socket = null;
import { webSocketUrl } from '@/api/request.js';
+import { mapState, mapMutations } from 'vuex';
export default {
onLoad(params) {
- console.log(params, '绗簩娆℃斁绌哄弬鏁�');
this.takeCoalId = params.takeCoalId;
this.weighData.sceneId = params.sceneId;
this.weighData.gateCameraId = params.gateCameraId;
this.weighData.equipmentCode = params.gateCameraCode;
+ this.weighData.sceneInOut = params.sceneInOut;
this.weighHouseCode = params.weighHouseCode;
+ this.primarySkin = params.primarySkin;
+ this.primaryHair = params.primaryHair;
+ this.primaryClean = params.primaryClean;
+ this.changeweighHouseCode(params.weighHouseCode);
},
data() {
return {
@@ -85,24 +120,17 @@
gateCameraId: '',
equipmentCode: '',
weigh: 0,
- tmCode: ''
+ tmCode: '',
+ sceneInOut: '',
+ coalContactClean: 0,
+ coalContactHair: 0,
+ coalContactSkin: 0
},
takeCoalId: null,
weighHouseCode: '',
isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
realTimeWeigh: '',
weighList: {},
- webSocket: null, // webSocket瀹炰緥
- // lockReconnect: false, // 閲嶈繛閿侊紝閬垮厤澶氭閲嶈繛
- // maxReconnect: 6, // 鏈�澶ч噸杩炴鏁帮紝 -1 鏍囪瘑鏃犻檺閲嶈繛
- // reconnectTime: 0, // 閲嶈繛灏濊瘯娆℃暟
- // heartbeat: {
- // interval: 30 * 1000, // 蹇冭烦闂撮殧鏃堕棿
- // timeout: 10 * 1000, // 鍝嶅簲瓒呮椂鏃堕棿
- // pingTimeoutObj: null, // 寤舵椂鍙戦�佸績璺崇殑瀹氭椂鍣�
- // pongTimeoutObj: null, // 鎺ユ敹蹇冭烦鍝嶅簲鐨勫畾鏃跺櫒
- // pingMessage: JSON.stringify({ type: 'ping' }) // 蹇冭烦璇锋眰淇℃伅
- // }
// 涓存椂绉伴噸瀵硅薄
temporaryWeighObj: {
skin: 0,
@@ -113,12 +141,24 @@
// 鏀剧┖鎺у埗
evacuationModalShow: false,
evacuationTitle: '鏀剧┖纭',
- evacuationContent: '鏄惁纭鏀剧┖'
+ evacuationContent: '鏄惁纭鏀剧┖',
+ // 鑾峰彇鍘熷彂淇℃伅
+ primarySkin: null,
+ primaryHair: null,
+ primaryClean: null,
+ // 鍒ゆ柇绉伴噸鎸夐挳鏄惁鍙敤
+ isweigh: false,
+ // 澶栬喘绫诲瀷绉伴噸鍑虹幇寮圭獥濉啓姣涳紝鐨紝
+ firstHairCustomernameShow: false,
+ coalContactHair: '',
+ coalContactSkin: '',
+ // 浜屾纭
+ secondConfirmShow: false
};
},
watch: {
realTimeWeigh(newV, oldV) {
- if (this.weighList.orderTye == '澶栭攢' || this.weighList.orderTye == '鍐呴攢') {
+ if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType == '杞嚭') {
if (this.weighList.skin == 0) {
// this.temporaryWeighObj.skin = this.realTimeWeigh;
this.temporaryWeighObj.skin = newV;
@@ -126,8 +166,9 @@
// 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;
}
- } else if (this.weighList.orderTye == '澶栬喘' || this.weighList.orderTye == '杞嚭') {
+ } 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;
@@ -135,21 +176,31 @@
// 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;
}
}
+ },
+ // 鐩戝惉閲嶉噺鍙樺寲
+ globalweigh: {
+ handler(v) {
+ this.weighData.weigh = this.realTimeWeigh = v;
+ console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
+ },
+ deep: true
}
},
onShow() {
this.init();
- this.initWebSocket();
+ // this.initWebSocket();
},
computed: {
+ ...mapState(['globalweigh', 'globalinfraredStatus']),
token() {
return uni.getStorageSync('token');
},
// 鍔犲噺鐓ゆ寜閽鐢ㄤ笌鍚�
addAndSubtractCoalDisabled() {
- if (this.weighList.orderTye == '澶栭攢' || this.weighList.orderTye == '鍐呴攢' || this.weighList.orderTye == '杞嚭') {
+ if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType == '杞嚭') {
if (this.weighList.hair == 0) {
return true;
} else if (this.weighList.hair != 0) {
@@ -159,14 +210,16 @@
},
// 鏄惁鏀剧┖鎸夐挳绂佺敤
isEvacuation() {
- if (this.weighList.hair == this.weighList.skin || this.temporaryWeighObj.skin == this.temporaryWeighObj.hair) {
- return false;
- } else {
- return true;
+ if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType == '杞嚭') {
+ return this.weighList.skin == this.temporaryWeighObj.hair || this.temporaryWeighObj.skin == this.temporaryWeighObj.hair;
+ }
+ if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆') {
+ return this.weighList.hair == this.temporaryWeighObj.skin || this.temporaryWeighObj.skin == this.temporaryWeighObj.hair;
}
}
},
methods: {
+ ...mapMutations(['changeweighHouseCode']),
init() {
// 鑾峰彇绉伴噸淇℃伅
this.$reqGet('weighList', { id: this.takeCoalId }).then(res => {
@@ -177,8 +230,31 @@
this.weighData.tmId = res.data.id;
this.weighData.carNo = res.data.carNo;
this.weighData.tmCode = res.data.code;
+ if (this.weighList.orderType == '澶栬喘' && this.weighList.hair == 0) {
+ this.firstHairCustomernameShow = true;
+ }
}
});
+ },
+ // 澶栬喘绫诲瀷杈撳叆鐐瑰嚮纭涔嬪悗浜屾纭
+ OutsourcingConfirm() {
+ this.weighData.coalContactSkin = Number(this.coalContactSkin);
+ this.weighData.coalContactHair = Number(this.coalContactHair);
+ this.weighData.coalContactClean = Number((Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2));
+ if (Number(this.coalContactSkin) == 0 || Number(this.coalContactHair) == 0) {
+ this.$u.toast('閲嶉噺涓嶈兘涓�0,璇烽噸鏂板～鍐�');
+ } else {
+ this.secondConfirmShow = true;
+ }
+ },
+ // 浜屾纭寮圭獥 鐐瑰嚮纭畾
+ secondConfirm() {
+ this.secondConfirmShow = false;
+ this.firstHairCustomernameShow = false;
+ },
+ // 浜屾寮圭獥鐐瑰嚮鍙栨秷
+ secondCancel() {
+ this.secondConfirmShow = false;
},
/**
* @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
@@ -187,7 +263,7 @@
if (this.isConfirmWeighLoading == false) {
this.isConfirmWeighLoading = true;
if (this.weighData.weigh != 0) {
- if (this.weighList.orderTye == '澶栭攢') {
+ if (this.weighList.orderType == '澶栭攢') {
if (this.weighList.skin ? (this.weighList.skin < this.realTimeWeigh ? true : false) : true) {
this.saveWeigh();
} else {
@@ -207,6 +283,7 @@
saveWeigh() {
this.$reqPost('saveWeigh', this.weighData, 'json')
.then(res => {
+ console.log(res, '绉伴噸鎺ュ彛');
if (res.code == 0) {
this.$u.toast('绉伴噸鎴愬姛');
setTimeout(() => {
@@ -215,6 +292,8 @@
});
this.isConfirmWeighLoading = false;
}, 1000);
+ } else {
+ this.$u.toast('绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
}
})
.catch(err => {
@@ -240,46 +319,44 @@
/**
* 鍒濆鍖� weoSocket
*/
- initWebSocket() {
- let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`;
- let socket = uni.connectSocket({
- url: wsUrl,
- header: {
- CLIENT_TOC: 'Y'
- },
- complete: res => {
- console.log(res, 'socket缁撴灉');
- }
- });
- socket.onOpen(() => {
- console.log('onOpen');
- });
- // 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
- socket.onMessage(res => {
- console.log('socketWeigh', res);
- let nowWeighObj = JSON.parse(res.data.slice(7));
- console.log(nowWeighObj);
- // 涓�寮�濮嬫槸weighHouseCode
- if (nowWeighObj.eqCode == this.weighData.equipmentCode) {
- if (nowWeighObj.eqInfraredStatus) {
- this.infraredStatus = true;
- this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
- } else {
- this.infraredStatus = false;
- this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
- }
- }
- });
- socket.onClose(() => {
- uni.closeSocket();
- console.log('webSocketClose');
- this.$u.toast('纾呮埧宸插叧闂�');
- });
- socket.onError(err => {
- console.log('socket鎶ラ敊', err);
- this.$u.toast('纾呮埧鏆傛椂涓嶈兘浣跨敤锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
- });
- },
+ // initWebSocket() {
+ // let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`;
+ // let socket = uni.connectSocket({
+ // url: wsUrl,
+ // header: {
+ // CLIENT_TOC: 'Y'
+ // },
+ // complete: res => {
+ // console.log(res, 'socket缁撴灉');
+ // }
+ // });
+ // socket.onOpen(() => {
+ // console.log('onOpen');
+ // });
+ // // 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
+ // socket.onMessage(res => {
+ // console.log('socketWeigh', res);
+ // let nowWeighObj = JSON.parse(res.data.slice(7));
+ // if (nowWeighObj.eqCode == this.weighHouseCode) {
+ // if (nowWeighObj.eqInfraredStatus) {
+ // this.infraredStatus = true;
+ // this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
+ // } else {
+ // this.infraredStatus = false;
+ // this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
+ // }
+ // }
+ // });
+ // socket.onClose(() => {
+ // uni.closeSocket();
+ // console.log('webSocketClose');
+ // this.$u.toast('纾呮埧宸插叧闂�');
+ // });
+ // socket.onError(err => {
+ // console.log('socket鎶ラ敊', err);
+ // this.$u.toast('纾呮埧鏆傛椂涓嶈兘浣跨敤锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
+ // });
+ // },
// 鏀剧┖
evacuation() {
this.evacuationModalShow = true;
@@ -288,7 +365,13 @@
evacuationConfirm() {
this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
console.log(res, '绗簩娆℃斁绌�');
- this.evacuationModalShow = false;
+ if (res.code == 0) {
+ this.$u.toast('鎿嶄綔鎴愬姛');
+ this.evacuationModalShow = false;
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触');
+ this.evacuationModalShow = true;
+ }
});
},
// 鏀剧┖寮圭獥鍙栨秷
@@ -332,6 +415,8 @@
}
.bottom {
text-align: center;
+ position: relative;
+ top: vww(-30);
}
}
.two {
@@ -366,4 +451,14 @@
flex: 0.5;
}
}
+.secondary-confirmation__main {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: center;
+ .secondary-child {
+ display: flex;
+ justify-content: space-between;
+ }
+}
</style>
--
Gitblit v1.9.1