From 0edf09ced95ebdb06bec33dca061c51520d8d364 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 14 六月 2024 17:24:24 +0800
Subject: [PATCH] feat:司机称重页面增加产品信息
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 699 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 477 insertions(+), 222 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 744ec99..8a25435 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
@@ -1,11 +1,10 @@
<template>
<view class="weighingDevice">
<view class="one"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/weighbanner.png') no-repeat;
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/weighbanner.png') no-repeat;
background-size: cover;">
<view class="top">
<view class="top_left">
- <!-- <text>{{ realTimeWeigh }}</text> -->
<text>{{ globalweigh }}</text>
</view>
<view class="top_right">
@@ -26,73 +25,25 @@
<view class="bottom"><text>TIP:褰撳墠鐘舵�佷负姝ｅ父鏃跺彲浠ョО閲�</text></view>
</view>
<view class="middle-block"
- v-if="firstHairCustomernameShow || sideline">
- <view class="block-main"
- v-if="firstHairCustomernameShow">
- <view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
- <view class="second-line">
- <view class="label-text"
- :class="{ focusClass: isfocus1 }">鐨噸</view>
- <view class="input-container"
- :class="{ inputClass: isfocus1, disabledClass: haveInputOrigin }">
- <u--input placeholder="璇疯緭鍏ョ毊閲�"
- border="surround"
- v-model="weighData.coalContactSkin"
- @focus="inputFocus(1)"
- @blur="inputBlur"
- @change="inputChange"
- :disabled="haveInputOrigin"></u--input>
- </view>
- <view class="unit"
- :class="{ focusClass: isfocus1 }">鍚�</view>
- </view>
- <view class="second-line">
- <view class="label-text"
- :class="{ focusClass: isfocus2 }">姣涢噸</view>
- <view class="input-container"
- :class="{ inputClass: isfocus2, disabledClass: haveInputOrigin }">
- <u--input placeholder="璇疯緭鍏ユ瘺閲�"
- border="surround"
- v-model="weighData.coalContactHair"
- @focus="inputFocus(2)"
- @blur="inputBlur"
- @change="inputChange"
- :disabled="haveInputOrigin"></u--input>
- </view>
- <view class="unit"
- :class="{ focusClass: isfocus2 }">鍚�</view>
- </view>
- <view class="second-line">
- <view class="label-text">鍑�閲�</view>
- <view class="input-container"
- :class="{ disabledClass: haveInputOrigin }">
- <u--input placeholder="鍑�閲�"
- border="surround"
- v-model="coalContactClean"
- :disabled="haveInputOrigin"></u--input>
- </view>
- <view class="unit">鍚�</view>
- </view>
- </view>
- <view class="block-sideline"
- v-if="sideline">
+ v-if="sideline">
+ <view class="block-sideline">
<view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
<view class="weigh-item">
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
鐨�</view>
<view class="num">{{ weighList.skinTwo }}</view>
</view>
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
姣�</view>
<view class="num">{{ weighList.hairTwo }}</view>
</view>
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
鍑�</view>
<view class="num">{{ weighList.cleanTwo }}</view>
</view>
@@ -101,6 +52,50 @@
</view>
<view v-else
style="width: 100%;height: 40rpx;"></view>
+ <view class="history-utils">
+ <view class="history-utils_item">
+ <text>骞冲潎鐨噸:{{avgSkin}}</text>
+ <text style="color: #ff6363;font-weight: bold;font-size: 26rpx;"
+ class="error-tip"
+ v-if="errorTipShow">* 寮傚父</text>
+ </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.productName||"" }}
+ </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"
@@ -138,28 +133,70 @@
</view>
<view class="main-information">
<view class="prefix">鐓ょ鍚嶇О:</view>
- <view class="suffix">{{ weighList.coalName || '' }}</view>
+ <view class="suffix">{{ weighList.productName || '' }}</view>
</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 ? weightObj.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 ? weightObj.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 ? weightObj.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>
+ <text style="color: #ff6363;font-weight: bold;font-size: 26rpx;"
+ class="error-tip"
+ v-show="orderSurplusLess&&!isSpecial">* 璁㈠崟浣欓噺涓嶈冻</text>
</view>
</view>
+ </view>
+ <!-- 浜у搧淇℃伅 -->
+ <view class="chanpin">
+ <view class="sub-table">
+ <view class="first-line"><combined-title title="浜у搧淇℃伅"></combined-title></view>
+ <view class="table">
+ <uni-table border
+ id="table-box"
+ emptyText="鏆傛棤鏇村鏁版嵁">
+ <uni-tr>
+ <uni-th align="center" >浜у搧</uni-th>
+ <uni-th align="center">鐨噸</uni-th>
+ <uni-th align="center">姣涢噸</uni-th>
+ <uni-th align="center">鍑�閲�</uni-th>
+ <!-- <uni-th align="center">浠撳簱</uni-th> -->
+ </uni-tr>
+ <uni-tr v-for="(subItem, index) in productList" :key="index">
+ <uni-td align="center">
+ <view class="name">{{ subItem.productName }}</view></uni-td>
+ <uni-td align='right'>
+ <view v-if="subItem.skin">{{ Number( subItem.skin).toFixed(2) || ''}}</view>
+ </uni-td>
+ <uni-td align='right'>
+ <view class="name" v-if="subItem.hair">{{ Number(subItem.hair) .toFixed(2) || '' }}</view>
+ </uni-td>
+ <uni-td align='right'>
+ <view class="name" v-if="subItem.clean">{{ Number( subItem.clean).toFixed(2) || '' }}</view>
+ </uni-td>
+<!--
+ 聽 <uni-td align="center">
+ <view>{{ subItem.bunkerName }}</view></uni-td> -->
+
+ </uni-tr>
+ </uni-table>
+ </view>
+ </view>
</view>
<view class="three">
<!-- 鏀剧┖ -->
@@ -168,45 +205,33 @@
plain
@click="evacuation"
throttleTime="500"
- :disabled="!isEvacuation"></u-button>
+ :loading="TwoEvacuationLoading"
+ v-if='weighList.skin||weighList.hair'></u-button>
<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button type="primary"
text="纭畾绉伴噸"
- :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || !isInputOrigin"
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||globalWarning||addAndSubtractCoalDisabled"
:loading="isConfirmWeighLoading"
loadingText="纭"
@click="confirmWeigh"
- v-show="!historyBtn"></u-button>
+ throttleTime="800"></u-button>
<u-button type="primary"
- text="杩斿洖鍔犲噺鍚�"
- :disabled="addAndSubtractCoalDisabled"
+ text="杩斿洖瑁呭嵏"
+ :disabled="addAndSubtractCoalDisabled||isConfirmWeighLoading"
@click="addAndSubtractCoal"
class="jiajian"
- v-if="outBuy"></u-button>
+ v-if="outBuy&&!isSkinWeigh"
+ :loading="addAndSubtractCoalLoading"></u-button>
</view>
- <view style="width: 200rpx;margin: auto;position: relative;"
- v-if="!historyBtn"><u-button type="primary"
- text="鏄剧ず鍘嗗彶鐨噸"
- @click.stop="displayHistory"></u-button></view>
- <Transition name="slide-fade">
- <view class="history-skin"
- v-if="historyShow">
- <view class="history-skin_item"
- v-for="item in tmTaskCoalList">
- <view class="createTime">
- 鏃ユ湡:{{item.createTime.slice(0,10)}}
- </view>
- <view class="skin">
- <view class="">
- 鐨噸:
- </view>
- <view class="">
- {{item.skin}}
- </view>
- </view>
- </view>
- </view>
- </Transition>
+ <view v-show="isExceedOrigin"
+ style="color: #ff6363;width: auto;margin: 0 auto;">
+ <text v-if="weighList.orderType == '澶栬喘'">瓒呭嚭鍘熷彂{{avgFalse ? '鐨噸' :'姣涢噸'}} ,纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text>
+ <text v-else>瓒呭嚭鏈�澶� {{avgFalse ? '鐨噸' :'姣涢噸'}},纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text>
+ </view>
+ <view v-show="afterEvacuationStatus"
+ style="color: #ff6363;width: auto;margin: 0 auto;">
+ <text>{{afterEvacuationText}}</text>
+ </view>
<!-- 鏀剧┖寮圭獥 -->
<view class="evacuationModal">
<u-modal :show="evacuationModalShow"
@@ -220,18 +245,19 @@
<view class="">
<u-modal :show="abnormalModalShow"
title="寮傚父鍘熷洜"
- :showCancelButton="true"
+ :showCancelButton="false"
@confirm="abnormalConfirm"
- @cancel="abnormalCancel"
confirmText="鎻愪氦">
<view class="slot-content">
- <u--form labelPosition="top">
+ <u--form labelPosition="top"
+ :model='abnormalForm'
+ :rules="rules"
+ ref="uForm">
<u-form-item>
- <u-textarea v-model="abnormalContent"
+ <u-textarea v-model="abnormalForm.abnormalContent"
confirmType="done"
- placeholder="璇疯緭鍏ュ紓甯稿師鍥�"
- height='140'
- count
+ placeholder="璇疯緭鍏ュ紓甯稿師鍥�(瀛楁暟涓嶅皯浜�5涓瓧)"
+ :height='200'
border="surround"
autoHeight></u-textarea>
</u-form-item>
@@ -239,14 +265,22 @@
</view>
</u-modal>
</view>
+ <!-- 纭鍚庣О閲嶆彁绀哄脊绐� -->
+ <view class="">
+ <u-modal :show="confirmWeighVisiable"
+ title="鎻愮ず"
+ :content="confirmWeighContent"
+ @confirm="confirmWeighConfirm"></u-modal>
+ </view>
</view>
</template>
<script>
- let socket = null;
import { webSocketUrl } from '@/api/request.js';
import { mapState, mapMutations } from 'vuex';
+ import { BaseUrl } from '@/api/publicInterface.js'
import combinedTitle from '@/components/combined-title/combined-title.vue';
+ import BigNumber from "bignumber.js"
export default {
onLoad(params) {
this.takeCoalId = params.takeCoalId;
@@ -257,17 +291,44 @@
this.weighHouseCode = params.weighHouseCode;
this.primarySkin = params.primarySkin;
this.primaryHair = params.primaryHair;
+ this.deptId = params.deptId;
this.primaryClean = params.primaryClean;
- if (params.overTmWaixiao) {
+ if (params.overTmWaixiao !== 'null') {
this.weighData.overTmWaixiao = 1
}
this.changeweighHouseCode(params.weighHouseCode);
+ this.init();
+ this.getDept();
+ this.changeWeigh('')
+ this.realTimeWeigh = 0
+ },
+ onShow() {
+ if (this.timer) {
+ clearTimeout(this.timer)
+ }
+ this.timer = setTimeout(() => {
+ if (!this.globalweigh) {
+ console.log('绉伴噸鏃惰嚜鍔ㄩ噸杩�');
+ this.socketTask.close();
+ this.changesocketTask(null);
+ this.changereconnectNum({ connectNum: 1, isWeigh: true })
+ this.$store.dispatch('websocketInit');
+ }
+ }, 3000)
+ },
+ onHide() {
+ clearTimeout(this.timer)
+ },
+ onUnload() {
+ clearTimeout(this.timer)
},
components: {
combinedTitle
},
data() {
return {
+ avgFalse:false, // 鏄惁鐨噸寮傚父
+ productList:[], // 浜у搧鏁扮粍
weighData: {
//纭绉伴噸鎺ュ彛鍙傛暟
deptId: '',
@@ -276,27 +337,29 @@
carNo: '',
gateCameraId: '',
equipmentCode: '',
+ avgSkin:'',
weigh: 0,
tmCode: '',
sceneInOut: '',
coalContactClean: 0,
coalContactHair: 0,
- coalContactSkin: 0
+ coalContactSkin: 0,
+ isMerge: '0', //1鏄� 0涓嶆槸 榛樿0 鏄惁鍚堝崱 宸叉棤鐢�
+ isBackground: '0',
+ abnormalText: ''
},
- // 鏄惁濉啓鍘熷彂淇℃伅
- isInputOrigin: false,
- haveInputOrigin: false,
-
takeCoalId: null,
+ deptId:'',
+ weightReal:0, // 绉伴噸娴姩鏁版嵁
weighHouseCode: '',
isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
realTimeWeigh: 0,
weighList: {},
// 涓存椂绉伴噸瀵硅薄
temporaryWeighObj: {
- skin: 0,
- hair: 0,
- clean: 0
+ skin: 0, //鐨�
+ hair: 0, //姣�
+ clean: 0 //鍑�閲�
},
infraredStatus: false, // 绾㈠鐘舵�侊紝
// 鏀剧┖鎺у埗
@@ -309,28 +372,57 @@
primaryClean: null,
// 鍒ゆ柇绉伴噸鎸夐挳鏄惁鍙敤
isweigh: false,
+ orderSurplusLess: false,
// 澶栬喘绫诲瀷绉伴噸濉啓姣涳紝鐨紝
firstHairCustomernameShow: false,
- coalContactHair: '',
- coalContactSkin: '',
- // 鑱氱劍鏃舵敼鍙樻牱寮�
- isfocus1: false,
- isfocus2: false,
// 澶栬喘绗竴娆＄О姣涢噸涓嶉渶瑕佸姞鍑忓惃
outBuy: true,
// 鐨噸寮傚父鐩稿叧
- abnormalContent: '',
- avgSkin: null, // 骞冲潎鐨噸
+ abnormalForm: {
+ abnormalContent: '',
+ },
+ avgSkin: '', // 骞冲潎鐨噸
+ isAbnormalAvgSkin: true, //骞冲潎鐨噸鏄惁寮傚父
tmTaskCoalList: [],
abnormalModalShow: false,
historyBtn: false,
- historyShow: false
+ historyShow: false,
+ // 鏄惁鍦ㄧО鐨噸锛岀偣鍑荤‘瀹氱О閲嶅垽鏂槸鍚﹀紓甯�
+ isSkinWeigh: false,
+ errorTipShow: false,
+ rules: {
+ abnormalContent: [{
+ required: false,
+ message: "璇峰～鍐欏紓甯稿師鍥�",
+ trigger: ['blur', 'change'],
+ type: 'string'
+ },
+ {
+ validator: (rule, value, callback) => {
+ if (value.length < 5) {
+ callback(new Error('鍘熷洜涓嶅彲灏戜簬5涓瓧'))
+ } else {
+ callback()
+ }
+ }
+ },
+ ]
+ },
+ mergeState: true, //鍚堝崱鐘舵��
+ // mergeStateShow: false, //鍚堝崱寮圭獥
+ checkboxValue1: [],
+
+ isExceedOrigin: false, //鏄惁瓒呭嚭姣涢噸
+ refreshLoading: false,
+ timer: null,
+ afterEvacuationStatus: null, //鏀剧┖鍚庢彁鐓ゅ崟鐘舵�佺姸鎬佷负21鏃舵彁绀衡�樼瓑寰呯鎴跨‘璁も��
+ afterEvacuationText: '',
+ TwoEvacuationLoading: false,
+ addAndSubtractCoalLoading: false,
+ isSpecial: null //1 鏄壒娈� 0涓嶆槸鐗规畩
};
},
watch: {
- realTimeWeigh(newV, oldV) {
-
- },
// 鐩戝惉閲嶉噺鍙樺寲
globalweigh: {
deep: true,
@@ -340,53 +432,57 @@
.orderType ==
'杞嚭') {
if (this.weighList.skin == 0) {
+ this.isSkinWeigh = true //绉扮毊娌℃湁杩斿洖瑁呭嵏
this.temporaryWeighObj.skin = newV;
- this.getAverageSkin()
- if (this.avgSkin < newV) {
- this.abnormalModalShow = true
- this.historyBtn = true
- }
+ let xx = new BigNumber(this.avgSkin)
+ let yy = new BigNumber(newV)
+ this.errorTipShow = (xx.minus(yy).toNumber() < -this.weightReal || xx.minus(yy).toNumber() > this.weightReal) &&
+ this.avgSkin !== 0
} 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
+ let x = new BigNumber(this.temporaryWeighObj.hair)
+ let y = new BigNumber(this.weightObj.skin)
+ this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
+ this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
.temporaryWeighObj
- .clean < 0;
+ .clean < 0) && !this.isSpecial && !this.weighList.source
+ this.orderSurplusLess = (this.temporaryWeighObj.clean > this.weighList.orderSurplus) && !
+ this.weighList.source
}
} 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.getAverageSkin()
- if (this.avgSkin < newV) {
- this.abnormalModalShow = true
- this.historyBtn = true
- }
- this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
- 2);
- this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
+ let xx = new BigNumber(this.avgSkin)
+ let yy = new BigNumber(newV)
+ this.errorTipShow = (xx.minus(yy).toNumber() < -this.weightReal || xx.minus(yy).toNumber() > this.weightReal) &&
+ this.avgSkin !== 0;
+ let x = new BigNumber(this.weightObj.hair)
+ let y = new BigNumber(this.temporaryWeighObj.skin)
+ this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
+ this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
.temporaryWeighObj
- .clean < 0;
+ .clean < 0) && !this.isSpecial && !this.weighList.source
+ this.orderSurplusLess = (this.temporaryWeighObj.clean > this.weighList.orderSurplus) && !
+ this.weighList.source
}
}
}
- }
- },
- onShow() {
- this.init();
- this.changeisLogin(true)
- this.realTimeWeigh = 0
- },
- onHide() {
-
+ },
},
computed: {
- ...mapState(['globalweigh', 'globalinfraredStatus']),
+ ...mapState(['globalweigh', 'globalinfraredStatus', 'globalisconnect', 'globalisUploadimg', 'globalisLogin',
+ 'is_open_socket', 'socketTask', 'confirmWeighVisiable', 'confirmWeighContent', 'globalWarning'
+ ]),
coalContactClean() {
- return (Number(this.weighData.coalContactHair) - Number(this.weighData.coalContactSkin)).toFixed(2);
+ let xx = BigNumber(this.weighData.coalContactHair)
+ let yy = BigNumber(this.weighData.coalContactSkin)
+ return xx.minus(yy).toNumber().toFixed(2)
},
token() {
return uni.getStorageSync('token');
@@ -399,21 +495,39 @@
isEvacuation() {
if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType ==
'杞嚭') {
- return (this.weighList.skin === 0 ? this.temporaryWeighObj.skin : this.weighList.skin) == this
- .temporaryWeighObj.hair;
+ return this.weightObj.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.weightObj.hair == this.temporaryWeighObj.skin;
}
+ },
+ weightObj(){
+ const index = this.weighList.tmTaskCoalList.length - 1;//涓嬫爣浣� 锛岃鍙栫鍑犵粍鐨勭毊姣涘噣锛�,榛樿鏈�鍚庝竴缁�;
+ const tempArr = this.weighList.tmTaskCoalList.filter(item=> item.isWeight === 1);
+ const result =tempArr.find(item=>!item.skin || !item.hair || !item.clean);
+ console.log(result,'result')
+ if(result){
+ return result
+ }else{
+ return tempArr[index];
+ }
+
+
+
},
sideline() {
return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆';
+ },
+ isNeedOrigin() {
+ return uni.getStorageSync('isNeedOrigin')
}
},
+
methods: {
- ...mapMutations(['changeweighHouseCode', 'changeisLogin']),
+ ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh', 'changeconfirmWeighVisiable',
+ 'changesocketTask', 'changereconnectNum'
+ ]),
init() {
uni.showLoading({
title: "鍔犺浇涓�"
@@ -424,6 +538,7 @@
if (res.code == 0) {
uni.hideLoading()
this.weighList = res.data;
+ this.isSpecial = res.data.isSpecial
this.weighData.deptId = res.data.deptId;
this.weighData.tmId = res.data.id;
this.weighData.carNo = res.data.carNo;
@@ -431,45 +546,50 @@
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.weighList.source = res.data.source //0鎵嬪姩 1涓嶆槸 鏄�0鍒ゆ柇浣欓噺涓嶈冻
+ this.outBuy = !(this.weighList.orderType === '澶栬喘' || this.weighList.orderType ===
+ '鍐呰喘' ||
+ this.weighList.orderType === '杞叆')
+ this.productList = res.data.tmTaskCoalList;
+ console.log(this.outBuy);
+
} else {
uni.hideLoading()
this.$u.toast('鍔犺浇澶辫触')
}
- });
+ }).then(() => {
+ this.getAverageSkin()
+ })
},
/**
* @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
*/
confirmWeigh() {
- 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();
- } else {
- this.$u.toast('姣涢噸涓嶈兘灏忎簬鐨噸');
- this.isConfirmWeighLoading = false;
- }
- } else {
+ this.isConfirmWeighLoading = true;
+ if (this.weighData.weigh != 0) {
+ // 濡傛灉姝ｅ湪绉扮毊
+ if (this.isSkinWeigh) {
+ // 濡傛灉骞冲潎鐨噸涓�0
+ if (this.isAbnormalAvgSkin) {
+ this.abnormalModalShow = false
this.saveWeigh();
+ } else {
+ let xx = new BigNumber(this.avgSkin)
+ let yy = new BigNumber(this.globalweigh)
+ if (xx.minus(yy).toNumber() < -this.weightReal || xx.minus(yy).toNumber() > this.weightReal) {
+ this.abnormalModalShow = true
+ this.skinAbnormal()
+ } else {
+ this.saveWeigh();
+ }
}
} else {
- this.$u.toast('鏈兘鑾峰彇鍦扮閲嶉噺');
- this.isConfirmWeighLoading = false;
+ this.saveWeigh();
}
+
+ } else {
+ this.$u.toast('鏈兘鑾峰彇鍦扮閲嶉噺');
+ this.isConfirmWeighLoading = false;
}
},
// 纭绉伴噸鎺ュ彛
@@ -479,15 +599,25 @@
.then(res => {
console.log(res, '绉伴噸鎺ュ彛');
if (res.code == 0) {
- this.$u.toast('绉伴噸鎴愬姛');
+ this.$u.toast('绉伴噸鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
setTimeout(() => {
uni.navigateBack({
delta: 1
});
this.isConfirmWeighLoading = false;
}, 1000);
+ } else if (res.code === 3) {
+ if(/鐨噸/.test(res.msg)){
+ this.avgFalse = true;
+ this.isExceedOrigin = true;
+ }else{
+ this.avgFalse = false;
+ this.isExceedOrigin = true;
+ }
+
} else {
- this.$u.toast('绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
+ this.$u.toast(res.msg ? res.msg : '绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
+ this.isConfirmWeighLoading = false
}
})
.catch(err => {
@@ -497,14 +627,18 @@
},
// 鍔犲噺鐓�
addAndSubtractCoal() {
+ this.addAndSubtractCoalLoading = true
this.$reqPost('addAndSubtractCoal', {
deptId: this.weighData.deptId,
sceneId: this.weighData.sceneId,
carNo: this.weighData.carNo,
tmId: this.weighData.tmId,
- filedId: this.weighData.filedId
+ filedId: this.weighData.filedId,
+ equipmentCode: this.weighData.equipmentCode,
+ weigh: this.weighData.weigh
}, 'json').then(res => {
if (res.code == 0) {
+ this.addAndSubtractCoalLoading = false
this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
setTimeout(() => {
uni.navigateBack({
@@ -512,7 +646,8 @@
});
this.isConfirmWeighLoading = false;
}, 1000);
- console.log(res, '鍔犲噺鐓�');
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触');
}
});
},
@@ -522,14 +657,24 @@
},
// 鏀剧┖寮圭獥纭
evacuationConfirm() {
+ this.TwoEvacuationLoading = true;
this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
console.log(res, '绗簩娆℃斁绌�');
- if (res.code == 0) {
- this.$u.toast('鎿嶄綔鎴愬姛');
+ if (res.msg.length > 4) { //澶т簬4鏄瓑寰呭悗鍙扮‘璁�
+ this.TwoEvacuationLoading = true;
this.evacuationModalShow = false;
- } else {
- this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触');
- this.evacuationModalShow = true;
+ this.afterEvacuationStatus = res.data.status === 21 || res.data.status === 22
+ this.afterEvacuationText = res.msg
+
+ } else { //灏忎簬4鎴愬姛
+ this.TwoEvacuationLoading = false;
+ this.evacuationModalShow = false;
+ this.$u.toast('鎿嶄綔鎴愬姛,鍗冲皢杩斿洖涓婁竴椤�');
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ });
+ }, 1000);
}
});
},
@@ -559,11 +704,17 @@
uni.showLoading({
title: "鍔犺浇涓�"
})
- this.$reqGet('getAvgSkin').then(res => {
+ this.$reqGet('getAvgSkin', { xsUserId1: this.weighList.xsUserId1 }).then(res => {
if (res.code === 0) {
uni.hideLoading()
- this.avgSkin = res.data.avgSkin
+ this.avgSkin = res.data.avgSkin;
+ this.weighData.avgSkin = res.data.avgSkin;
this.tmTaskCoalList = res.data.tmTaskCoalList
+ /**
+ * @description true鐨勮瘽鏄涓�娆＄О, false灏变笉鏄�,娌℃湁鍘嗗彶锛屽钩鍧囩毊閲嶄负0鏄涓�娆′篃鏄甯� */
+ // this.isAbnormalAvgSkin = (Array.isArray(this.tmTaskCoalList) && this
+ // .tmTaskCoalList.length === 0 || !this.tmTaskCoalList) && this.avgSkin == 0
+ this.isAbnormalAvgSkin = this.avgSkin == 0
} else {
uni.hideLoading()
this.$u.toast('鍔犺浇澶辫触')
@@ -572,28 +723,42 @@
},
abnormalCancel() {
this.abnormalModalShow = false
+ this.isConfirmWeighLoading = false;
+ this.$u.toast('鍙告満鍙栨秷鎻愪氦')
},
+ // 鎻愪氦寮傚父鍘熷洜
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
- } else {
- uni.hideLoading()
- this.$u.toast('鎻愪氦澶辫触')
- this.abnormalModalShow = true
- }
- })
+ this.weighData.abnormalText = this.abnormalForm.abnormalContent
+ this.saveWeigh()
+ this.abnormalModalShow = false
},
- displayHistory() {
- this.historyShow = true
-
+ skinAbnormal() {
+ this.$reqPost('skinAbnormal', { sceneId: this.weighData.sceneId, tmId: this.weighData.tmId }, 'params')
+ },
+ confirmWeighConfirm() {
+ this.changeconfirmWeighVisiable(false)
+ this.isConfirmWeighLoading = false
+ this.TwoEvacuationLoading = false;
+ setTimeout(() => {
+ this.$u.toast('鍗冲皢杩斿洖涓婁竴椤�'),
+ uni.navigateBack({
+ delta: 1
+ })
+ }, 800)
+ },
+ //鑾峰彇閲嶉噺闃堝��
+ getDept(){
+ uni.request({
+ url: `${BaseUrl}/admin/dept/${this.deptId}`,
+ method: 'GET',
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success: (res) => {
+ console.log(res.data.data,'res.datra')
+ res.data.data.skinSafeValue ? this.weightReal = res.data.data.skinSafeValue : this.weightReal = '';
+ }
+ })
}
}
};
@@ -606,7 +771,14 @@
justify-content: space-between;
align-items: center;
}
-
+ .chanpin{
+ width: calc(100% - 60rpx);
+ height: 300rpx;
+ margin: 0 30rpx 30rpx 30rpx;
+ /deep/ .uni-table{
+ min-width: 0!important;
+ }
+ }
::v-deep.weighingDevice {
width: 100%;
height: 100%;
@@ -615,7 +787,33 @@
.slot-content {
width: 96%;
- border: 1rpx solid rgb(220, 223, 230);
+ height: 210rpx;
+ border-bottom: 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 {
@@ -774,7 +972,7 @@
width: calc(100% - 60rpx);
box-sizing: border-box;
height: 630rpx;
- margin: 0 vww(15) vww(45) vww(15);
+ margin: 0 vww(15) vww(15) vww(15);
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;
@@ -801,6 +999,7 @@
@include flex;
justify-content: flex-start;
overflow: hidden;
+ position: relative;
.prefix {
min-width: vww(60);
@@ -811,17 +1010,50 @@
margin-left: vww(12);
text-align: left;
}
+
+ .error-tip {
+ position: absolute;
+ right: 200rpx;
+ }
}
}
}
- .three {
- margin: 0 auto vww(20);
- flex: 0.7;
+ .mergeState {
+ width: 100%;
+ margin: vww(4) 0;
+ margin-bottom: vww(10);
display: flex;
+ justify-content: center;
+ font-size: vww(16);
+ overflow: hidden;
+
+ .merge-wrap {
+ width: vww(200);
+ height: vww(30);
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
+ .merge-checkbox {
+ margin-top: vww(10);
+ }
+ }
+
+ }
+
+ .three {
+ width: 60%;
+ height: vww(60);
+ margin: vww(20) auto;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
color: #939393;
.u-button {
+ letter-spacing: vww(4);
+
&:nth-of-type(2) {
margin-left: vww(10);
}
@@ -833,32 +1065,56 @@
}
.four {
- width: 100%;
- margin-top: vww(5);
- text-align: center;
+ width: vww(80);
+ margin: 0 auto;
}
.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%;
+
+ .error-tip {
+ display: inline-block;
+ margin-left: 34rpx;
+ }
+ }
+
+ .btn {
+ width: 180rpx;
+ }
+ }
+
.history-skin {
width: 96%;
height: vww(300);
- margin: vww(50) auto;
+ 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: 80%;
+ width: 96%;
height: vww(30);
@include flex;
- margin: vww(10) auto;
+ margin: vww(40) auto;
+
+ .item {
+ width: 33.3%;
+ text-align: center;
+ }
.createTime {
color: rgb(60, 156, 255);
@@ -866,7 +1122,6 @@
.skin {
color: #f81414;
- @include flex;
width: 180rpx;
height: vww(30);
}
@@ -885,4 +1140,4 @@
justify-content: space-between;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1