From b119f9e139d8cabaa4d1a44227f76e691f84d761 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 28 六月 2023 18:18:28 +0800
Subject: [PATCH] 提煤单详情页面修改，其他逻辑修改
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 122 +++++++++++++++++++++++-----------------
1 files changed, 71 insertions(+), 51 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 75b1b71..b2ec273 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"
@@ -142,17 +142,17 @@
</view>
<view class="main-information">
<view class="prefix">鐨噸:</view>
- <view class="suffix">{{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}
+ <view class="suffix">{{ showWeigh.skin||"" }}
</view>
</view>
<view class="main-information">
<view class="prefix">姣涢噸:</view>
- <view class="suffix">{{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair }}
+ <view class="suffix">{{showWeigh.hair||""}}
</view>
</view>
<view class="main-information">
<view class="prefix">鍑�閲�:</view>
- <view class="suffix">{{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean }}
+ <view class="suffix">{{ showWeigh.clean||"" }}
</view>
</view>
<view class="main-information">
@@ -181,7 +181,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 +237,9 @@
weigh: 0,
tmCode: '',
sceneInOut: '',
- coalContactClean: 0,
- coalContactHair: 0,
- coalContactSkin: 0
+ // coalContactClean: 0,
+ // coalContactHair: 0,
+ // coalContactSkin: 0
},
// 鏄惁濉啓鍘熷彂淇℃伅
isInputOrigin: false,
@@ -270,8 +274,10 @@
// 鑱氱劍鏃舵敼鍙樻牱寮�
isfocus1: false,
isfocus2: false,
- // 澶栬喘绗竴娆＄О姣涢噸涓嶉渶瑕佸姞鍑忓惃
- outBuy: true
+ // 澶栬喘绫诲瀷
+ outBuy: true,
+ // 澶栭攢绫诲瀷
+ outsourcing: true
};
},
watch: {
@@ -279,11 +285,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 +296,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
@@ -305,13 +307,6 @@
}
},
// 鐩戝惉閲嶉噺鍙樺寲
- // globalweigh: {
- // handler(v) {
- // this.weighData.weigh = this.realTimeWeigh = v;
- // console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
- // },
- // deep: true
- // },
globalweigh(newV) {
this.weighData.weigh = this.realTimeWeigh = newV;
console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
@@ -322,27 +317,17 @@
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');
},
// 鍔犲噺鐓ゆ寜閽鐢ㄤ笌鍚�
addAndSubtractCoalDisabled() {
return this.realTimeWeigh == 0;
- // if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType == '杞嚭') {
- // if (this.weighList.hair == 0) {
- // return true;
- // } else if (this.weighList.hair != 0) {
- // return false;
- // }
- // }
},
// 鏄惁鏀剧┖鎸夐挳绂佺敤
isEvacuation() {
@@ -350,27 +335,31 @@
'杞嚭') {
return (this.weighList.skin === 0 ? this.temporaryWeighObj.skin : this.weighList.skin) == this
.temporaryWeighObj.hair;
- // 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 === 0 ? this.temporaryWeighObj.skin : this.weighList.hair) == this
.temporaryWeighObj.hair;
- // return this.weighList.hair == this.temporaryWeighObj.skin || this.temporaryWeighObj.skin == this
- // .temporaryWeighObj.hair;
}
},
sideline() {
return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆';
+ },
+ showWeigh() {
+ return this.weighList.tmTaskCoalItems ? (this.weighList.tmTaskCoalItems[0] ? this
+ .weighList.tmTaskCoalItems[0] : {}) : {}
}
},
methods: {
...mapMutations(['changeweighHouseCode', 'changeisLogin']),
init() {
+ uni.showLoading({
+ title: '鍔犺浇涓�'
+ })
// 鑾峰彇绉伴噸淇℃伅
this.$reqGet('weighList', { id: this.takeCoalId }).then(res => {
console.log(res, '鑾峰彇绉伴噸淇℃伅');
+ uni.hideLoading()
if (res.code == 0) {
this.weighList = res.data;
this.weighData.deptId = res.data.deptId;
@@ -381,16 +370,19 @@
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 = true
+ this.outsourcing = false;
+ // this.firstHairCustomernameShow = true;
+ // if (this.weighList.hair > 0) {
+ // this.haveInputOrigin = true;
+ // this.isInputOrigin = true;
+ // }
+ // if (this.weighList.hair == 0) {
+ // this.outBuy = false;
+ // }
+ } else if (this.weighList.orderType == '澶栭攢') {
+ this.outsourcing = true;
+ this.outBuy = false
}
}
});
@@ -420,7 +412,7 @@
},
// 纭绉伴噸鎺ュ彛
saveWeigh() {
- this.weighData.coalContactClean = this.coalContactClean;
+ // this.weighData.coalContactClean = this.coalContactClean;
this.$reqPost('saveWeigh', this.weighData, 'json')
.then(res => {
console.log(res, '绉伴噸鎺ュ彛');
@@ -449,7 +441,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('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
@@ -460,9 +456,33 @@
this.isConfirmWeighLoading = false;
}, 1000);
console.log(res, '鍔犲噺鐓�');
+ } else {
+ this.$u.toast('鎿嶄綔澶辫触锛岃绋嶅�欓噸璇�');
}
});
},
+ // 缁х画鍗歌揣
+ 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