From 76c41f4669a36b0d4cb5b82906419408a6b7de96 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 14 八月 2023 08:24:41 +0800
Subject: [PATCH] 称重页面修改称重历史默认隐藏，提煤单详情页面修改
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 398 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 321 insertions(+), 77 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 064437c..86c51bc 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
@@ -5,8 +5,8 @@
background-size: cover;">
<view class="top">
<view class="top_left">
- <text>{{ realTimeWeigh }}</text>
- <!-- <text>{{ globalweigh }}</text> -->
+ <!-- <text>{{ realTimeWeigh }}</text> -->
+ <text>{{ globalweigh }}</text>
</view>
<view class="top_right">
<view class="">
@@ -101,17 +101,79 @@
</view>
<view v-else
style="width: 100%;height: 40rpx;"></view>
+ <view class="history-utils">
+ <view class="history-utils_item">
+ 骞冲潎鐨噸:{{avgSkin}}
+ </view>
+ <view class="history-utils_item btn">
+ <u-button plain
+ type="primary"
+ :text="historyShow?'闅愯棌鍘嗗彶绉伴噸':'鏄剧ず鍘嗗彶绉伴噸'"
+ @click="historyShow=!historyShow"></u-button>
+ </view>
+ </view>
+ <Transition name="slide-fade">
+ <view class="history-skin"
+ v-show="historyShow">
+ <view class="table-title">
+ <view class="table-title_item time">
+ 绉伴噸鏃堕棿
+ </view>
+ <view class="table-title_item coal-name">
+ 鐓ょ鍚嶇О
+ </view>
+ <view class="table-title_item skin">
+ 鐨噸閲嶉噺
+ </view>
+ </view>
+ <view class="history-skin_item"
+ v-for="item in tmTaskCoalList">
+ <view class="item createTime">
+ {{item.createTime||"" }}
+ </view>
+ <view class="item">
+ {{item.coalName||"" }}
+ </view>
+ <view class="item skin">
+ <view class="">
+ {{item.skin||"" }}
+ </view>
+ </view>
+ </view>
+ </view>
+ </Transition>
<view class="bottom-block">
<view class="block-main">
- <view class="main-information">
+ <view class="main-information"
+ v-if="weighList.orderType=='杞叆'||weighList.orderType=='杞嚭'">
+ <view class="prefix">
+ 鍙戣揣鍦扮叅鍦�:
+ </view>
+ <view class="suffix">
+ {{ weighList.filedName || '' }}
+ </view>
+ </view>
+ <view class="main-information"
+ v-if="weighList.orderType=='杞叆'||weighList.orderType=='杞嚭'">
+ <view class="prefix">
+ 鏀惰揣鍦扮叅鍦�:
+ </view>
+ <view class="suffix">
+ {{ weighList.toFiledName || '' }}
+ </view>
+ </view>
+ <view class="main-information"
+ v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
<view class="prefix">瀹㈡埛:</view>
<view class="suffix">{{ weighList.customerName }}</view>
</view>
- <view class="main-information">
- <view class="prefix">鐭垮満锛�</view>
+ <view class="main-information"
+ v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
+ <view class="prefix">鐭垮満:</view>
<view class="suffix">{{ weighList.deptName || '' }}</view>
</view>
- <view class="main-information">
+ <view class="main-information"
+ v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
<view class="prefix">鐓ゅ満:</view>
<view class="suffix">{{ weighList.filedName || '' }}</view>
</view>
@@ -121,22 +183,25 @@
</view>
<view class="main-information">
<view class="prefix">鐨噸:</view>
- <view class="suffix">{{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}
+ <view class="suffix">
+ {{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin||"" }}
</view>
</view>
<view class="main-information">
<view class="prefix">姣涢噸:</view>
- <view class="suffix">{{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair }}
+ <view class="suffix">
+ {{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair||"" }}
</view>
</view>
<view class="main-information">
<view class="prefix">鍑�閲�:</view>
- <view class="suffix">{{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean }}
+ <view class="suffix">
+ {{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean ||"" }}
</view>
</view>
<view class="main-information">
<view class="prefix">璁㈠崟浣欓噺:</view>
- <view class="suffix">{{ weighList.orderSurplus || 0 }}</view>
+ <view class="suffix">{{ weighList.orderSurplus ||"" }}</view>
</view>
</view>
</view>
@@ -162,7 +227,6 @@
class="jiajian"
v-if="outBuy"></u-button>
</view>
- <!-- <view class="four" v-if="weighList.orderType !== '澶栬喘'">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view> -->
<!-- 鏀剧┖寮圭獥 -->
<view class="evacuationModal">
<u-modal :show="evacuationModalShow"
@@ -172,6 +236,29 @@
@confirm="evacuationConfirm"
@cancel="evacuationCancel"></u-modal>
</view>
+ <!-- 绉伴噸寮傚父寮圭獥 -->
+ <view class="">
+ <u-modal :show="abnormalModalShow"
+ title="寮傚父鍘熷洜"
+ :showCancelButton="true"
+ @confirm="abnormalConfirm"
+ @cancel="abnormalCancel"
+ confirmText="鎻愪氦">
+ <view class="slot-content">
+ <u--form labelPosition="top">
+ <u-form-item>
+ <u-textarea v-model="abnormalContent"
+ confirmType="done"
+ placeholder="璇疯緭鍏ュ紓甯稿師鍥�"
+ height='140'
+ count
+ border="surround"
+ autoHeight></u-textarea>
+ </u-form-item>
+ </u--form>
+ </view>
+ </u-modal>
+ </view>
</view>
</template>
@@ -180,6 +267,7 @@
import { webSocketUrl } from '@/api/request.js';
import { mapState, mapMutations } from 'vuex';
import combinedTitle from '@/components/combined-title/combined-title.vue';
+ import BigNumber from "bignumber.js"
export default {
onLoad(params) {
this.takeCoalId = params.takeCoalId;
@@ -195,6 +283,9 @@
this.weighData.overTmWaixiao = 1
}
this.changeweighHouseCode(params.weighHouseCode);
+ this.init();
+ this.changeWeigh('')
+ this.realTimeWeigh = 0
},
components: {
combinedTitle
@@ -250,59 +341,59 @@
isfocus1: false,
isfocus2: false,
// 澶栬喘绗竴娆＄О姣涢噸涓嶉渶瑕佸姞鍑忓惃
- outBuy: true
+ outBuy: true,
+ // 鐨噸寮傚父鐩稿叧
+ abnormalContent: '',
+ avgSkin: '', // 骞冲潎鐨噸
+ tmTaskCoalList: [],
+ abnormalModalShow: false,
+ historyBtn: false,
+ historyShow: false,
+ // 鏄惁鍦ㄧО鐨噸锛岀偣鍑荤‘瀹氱О閲嶅垽鏂槸鍚﹀紓甯�
+ isSkinWeigh: false
};
},
watch: {
realTimeWeigh(newV, oldV) {
- 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
- .clean < 0;
- }
- } 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
- .clean < 0;
- }
- }
+
},
// 鐩戝惉閲嶉噺鍙樺寲
- // 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, '鐪熷疄閲嶉噺鏀瑰彉浜�');
+ globalweigh: {
+ deep: true,
+ handler: function(newV) {
+ this.weighData.weigh = this.realTimeWeigh = newV;
+ if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList
+ .orderType ==
+ '杞嚭') {
+ if (this.weighList.skin == 0) {
+ this.isSkinWeigh = true
+ this.temporaryWeighObj.skin = newV;
+ } else {
+ this.isSkinWeigh = false;
+ 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
+ .clean < 0;
+ }
+ } else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
+ .orderType == '杞叆') {
+ if (this.weighList.hair == 0) {
+ this.isSkinWeigh = false;
+ this.temporaryWeighObj.hair = newV;
+ } else {
+ this.isSkinWeigh = true;
+ 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
+ .clean < 0;
+ }
+ }
+ }
}
- },
- onShow() {
- this.init();
- this.changeisLogin(true)
- this.realTimeWeigh = 0
- },
- onHide() {
-
},
computed: {
...mapState(['globalweigh', 'globalinfraredStatus']),
@@ -315,24 +406,17 @@
// 鍔犲噺鐓ゆ寜閽鐢ㄤ笌鍚�
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() {
if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType ==
'杞嚭') {
- return this.weighList.skin == this.temporaryWeighObj.hair || this.temporaryWeighObj.skin == this
+ return (this.weighList.skin === 0 ? this.temporaryWeighObj.skin : this.weighList.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
+ return (this.weighList.hair === 0 ? this.temporaryWeighObj.skin : this.weighList.hair) == this
.temporaryWeighObj.hair;
}
},
@@ -341,12 +425,16 @@
}
},
methods: {
- ...mapMutations(['changeweighHouseCode', 'changeisLogin']),
+ ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh']),
init() {
+ uni.showLoading({
+ title: "鍔犺浇涓�"
+ })
// 鑾峰彇绉伴噸淇℃伅
this.$reqGet('weighList', { id: this.takeCoalId }).then(res => {
console.log(res, '鑾峰彇绉伴噸淇℃伅');
if (res.code == 0) {
+ uni.hideLoading()
this.weighList = res.data;
this.weighData.deptId = res.data.deptId;
this.weighData.tmId = res.data.id;
@@ -367,8 +455,13 @@
} else {
this.isInputOrigin = true;
}
+ } else {
+ uni.hideLoading()
+ this.$u.toast('鍔犺浇澶辫触')
}
- });
+ }).then(() => {
+ this.getAverageSkin()
+ })
},
/**
* @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
@@ -377,16 +470,28 @@
if (this.isConfirmWeighLoading == false) {
this.isConfirmWeighLoading = true;
if (this.weighData.weigh != 0) {
- if (this.weighList.orderType == '澶栭攢') {
- if (this.weighList.skin ? (this.weighList.skin < this.realTimeWeigh ? true : false) : true) {
- this.saveWeigh();
+ if (this.isSkinWeigh) {
+ let xx = new BigNumber(this.avgSkin)
+ let yy = new BigNumber(this.globalweigh)
+ if (xx.minus(yy).toNumber() > 0.2) {
+ this.abnormalModalShow = true
} else {
- this.$u.toast('姣涢噸涓嶈兘灏忎簬鐨噸');
- this.isConfirmWeighLoading = false;
+ this.abnormalModalShow = false
+ this.saveWeigh();
}
} else {
this.saveWeigh();
}
+ // if (this.weighList.orderType == '澶栭攢') {
+ // if (this.weighList.skin ? (this.weighList.skin < this.realTimeWeigh ? true : false) : true) {
+ // this.saveWeigh();
+ // } else {
+ // this.$u.toast('姣涢噸涓嶈兘灏忎簬鐨噸');
+ // this.isConfirmWeighLoading = false;
+ // }
+ // } else {
+ // this.saveWeigh();
+ // }
} else {
this.$u.toast('鏈兘鑾峰彇鍦扮閲嶉噺');
this.isConfirmWeighLoading = false;
@@ -421,7 +526,9 @@
this.$reqPost('addAndSubtractCoal', {
deptId: this.weighData.deptId,
sceneId: this.weighData.sceneId,
- carNo: this.weighData.carNo
+ carNo: this.weighData.carNo,
+ tmId: this.weighData.tmId,
+ filedId: this.weighData.filedId
}, 'json').then(res => {
if (res.code == 0) {
this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
@@ -473,7 +580,60 @@
if (this.weighData.coalContactHair > 0 && this.weighData.coalContactSkin > 0) {
this.isInputOrigin = true;
}
- }
+ },
+ getAverageSkin() {
+ uni.showLoading({
+ title: "鍔犺浇涓�"
+ })
+ this.$reqGet('getAvgSkin', { xsUserId1: this.weighList.xsUserId1 }).then(res => {
+ if (res.code === 0) {
+ uni.hideLoading()
+ this.avgSkin = res.data.avgSkin
+ this.tmTaskCoalList = res.data.tmTaskCoalList
+ // let xx = new BigNumber(this.avgSkin)
+ // let yy = new BigNumber(weigh)
+ // console.log(weigh, this.avgSkin, yy.minus(xx).toNumber());
+ // if (xx.minus(yy).toNumber() <= 0.2) {
+ // this.abnormalModalShow = true
+ // this.historyBtn = true
+ // }
+ } else {
+ uni.hideLoading()
+ this.$u.toast('鍔犺浇澶辫触')
+ }
+ })
+ },
+ abnormalCancel() {
+ this.abnormalModalShow = false
+ this.isConfirmWeighLoading = false;
+ },
+ // 鎻愪氦寮傚父鍘熷洜
+ abnormalConfirm() {
+ uni.showLoading({
+ title: "鎻愪氦涓�"
+ })
+ this.$reqPost('tmAbnormalTextAdd', { tmId: this.weighData.tmId, abnormalText: this.abnormalContent },
+ 'params').then(
+ res => {
+ if (res.code == 0) {
+ uni.hideLoading()
+ this.$u.toast('鎻愪氦鎴愬姛')
+ this.abnormalModalShow = false
+ this.isConfirmWeighLoading = false
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ });
+ }, 1000);
+
+ } else {
+ uni.hideLoading()
+ this.$u.toast('鎻愪氦澶辫触')
+ this.abnormalModalShow = true
+ this.isConfirmWeighLoading = false
+ }
+ })
+ },
}
};
</script>
@@ -488,9 +648,39 @@
::v-deep.weighingDevice {
width: 100%;
- height: 100vh;
+ height: 100%;
display: flex;
flex-direction: column;
+
+ .slot-content {
+ width: 96%;
+ border: 1rpx solid rgb(220, 223, 230);
+ }
+
+ .table-title {
+ width: 96%;
+ @include flex;
+ position: absolute;
+ top: 8rpx;
+ color: #9e9399;
+
+ &_item {
+ width: 33.3%;
+ text-align: center;
+ }
+
+ .time {
+ padding-left: 20rpx;
+ }
+
+ .coal-name {
+ padding-left: 70rpx;
+ }
+
+ .skin {
+ padding-left: 10rpx;
+ }
+ }
.one {
// flex: 3;
@@ -690,7 +880,7 @@
}
.three {
- margin: 0 auto vww(20);
+ margin: 0 auto vww(30);
flex: 0.7;
display: flex;
color: #939393;
@@ -711,6 +901,60 @@
margin-top: vww(5);
text-align: center;
}
+
+ .slide-fade-enter-active {
+ transition: all 0.3s ease-out;
+ }
+
+ .history-utils {
+ width: 96%;
+ margin: vww(10) auto;
+ @include flex;
+ justify-content: space-around;
+
+ &_item {
+ width: 50%;
+ }
+
+ .btn {
+ width: 180rpx;
+ }
+ }
+
+ .history-skin {
+ width: 96%;
+ height: vww(300);
+ margin: auto;
+ margin-top: vww(10);
+ background: #ffffff;
+ box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+ border-radius: 20rpx;
+ overflow: scroll;
+ color: #000;
+ position: relative;
+
+ .history-skin_item {
+ width: 96%;
+ height: vww(30);
+ @include flex;
+ margin: vww(40) auto;
+
+ .item {
+ width: 33.3%;
+ text-align: center;
+ }
+
+ .createTime {
+ color: rgb(60, 156, 255);
+ }
+
+ .skin {
+ color: #f81414;
+ width: 180rpx;
+ height: vww(30);
+ }
+ }
+ }
}
.secondary-confirmation__main {
--
Gitblit v1.9.1