From 5a46eb96564990957f393854e198bcee910c2e54 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期日, 25 六月 2023 10:53:31 +0800
Subject: [PATCH] 返回加减吨增加字段
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 1135 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 626 insertions(+), 509 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 5ddce20..82831e7 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,106 +1,138 @@
<template>
<view class="weighingDevice">
- <view
- class="one"
+ <view class="one"
style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/weighbanner.png') no-repeat;
- background-size: cover;"
- >
+ background-size: cover;">
<view class="top">
<view class="top_left">
<text>{{ realTimeWeigh }}</text>
+ <!-- <text>{{ globalweigh }}</text> -->
</view>
<view class="top_right">
<view class="">
绉伴噸:
- <u--text :type="realTimeWeigh == 0 ? 'error' : 'success'" :text="realTimeWeigh == 0 ? '寮傚父' : '姝ｅ父'" size="34"></u--text>
+ <u--text :type="realTimeWeigh == 0 ? 'error' : 'success'"
+ :text="realTimeWeigh == 0 ? '寮傚父' : '姝ｅ父'"
+ size="34"></u--text>
</view>
<view class="">
绾㈠:
- <u--text :type="globalinfraredStatus ? 'error' : 'success'" :text="globalinfraredStatus ? '寮傚父' : '姝ｅ父'" size="34"></u--text>
+ <u--text :type="globalinfraredStatus ? 'error' : 'success'"
+ :text="globalinfraredStatus ? '寮傚父' : '姝ｅ父'"
+ size="34"></u--text>
</view>
</view>
</view>
- <view class="bottom" v-if="weighList.orderType == '鍐呰喘' || weighList.orderType == '杞叆'">
- <view>
- <view style="font-weight: 600;">鍘熷彂淇℃伅</view>
-
- <text>姣涢噸:{{ primaryHair || '' }}鐨噸:{{ primarySkin || '' }}鍑�閲�:{{ primaryClean || '' }}</text>
- </view>
- </view>
- <!-- <view class="bottom" v-else-if="weighList.orderType == '澶栬喘' && weighList.hair == 0">
- <text>
- 姣涢噸:{{ coalContactHair || '' }}鐨噸:{{ coalContactSkin || '' }}鍑�閲�:{{ (Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2) || '' }}
- </text>
- </view> -->
<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="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: isInputOrigin }">
- <u--input
- placeholder="璇疯緭鍏ョ毊閲�"
+ <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"
- :disabled="isInputOrigin"
- ></u--input>
+ @change="inputChange"
+ :disabled="haveInputOrigin"></u--input>
</view>
- <view class="unit" :class="{ focusClass: isfocus1 }">鍚�</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: isInputOrigin }">
- <u--input
- placeholder="璇疯緭鍏ユ瘺閲�"
+ <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"
- :disabled="isInputOrigin"
- ></u--input>
+ @change="inputChange"
+ :disabled="haveInputOrigin"></u--input>
</view>
- <view class="unit" :class="{ focusClass: isfocus2 }">鍚�</view>
+ <view class="unit"
+ :class="{ focusClass: isfocus2 }">鍚�</view>
</view>
<view class="second-line">
<view class="label-text">鍑�閲�</view>
- <view class="input-container"><u--input placeholder="鍑�閲�" border="surround" v-model="coalContactClean" :disabled="isInputOrigin"></u--input></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">
+ <view class="block-sideline"
+ v-if="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;">鐨�</view>
- <view class="num">{{ weighList.skin }}</view>
+ <view class="concrete"
+ style="background: url('https://mx.jzeg.cn:9095/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;">姣�</view>
- <view class="num">{{ weighList.hair }}</view>
+ <view class="concrete"
+ style="background: url('https://mx.jzeg.cn:9095/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;">鍑�</view>
- <view class="num">{{ weighList.clean }}</view>
+ <view class="concrete"
+ style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
+ 鍑�</view>
+ <view class="num">{{ weighList.cleanTwo }}</view>
</view>
</view>
</view>
</view>
- <view v-else style="width: 100%;height: 40rpx;"></view>
+ <view v-else
+ style="width: 100%;height: 40rpx;"></view>
<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>
@@ -110,15 +142,18 @@
</view>
<view class="main-information">
<view class="prefix">鐨噸:</view>
- <view class="suffix">{{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}</view>
+ <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>
+ <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>
+ <view class="suffix">{{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean }}
+ </view>
</view>
<view class="main-information">
<view class="prefix">璁㈠崟浣欓噺:</view>
@@ -128,510 +163,592 @@
</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"
+ <u-button type="primary"
text="纭畾绉伴噸"
- :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || isInputOrigin"
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || !isInputOrigin"
:loading="isConfirmWeighLoading"
loadingText="纭"
- @click="confirmWeigh"
- ></u-button>
- <u-button type="primary" text="杩斿洖鍔犲噺鍚�" :disabled="addAndSubtractCoalDisabled" @click="addAndSubtractCoal" class="jiajian" v-if="outBuy"></u-button>
+ @click="confirmWeigh"></u-button>
+ <u-button type="primary"
+ text="杩斿洖鍔犲噺鍚�"
+ :disabled="addAndSubtractCoalDisabled"
+ @click="addAndSubtractCoal"
+ class="jiajian"
+ v-if="outBuy"></u-button>
</view>
<!-- <view class="four" v-if="weighList.orderType !== '澶栬喘'">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view> -->
<!-- 鏀剧┖寮圭獥 -->
<view class="evacuationModal">
- <u-modal
- :show="evacuationModalShow"
+ <u-modal :show="evacuationModalShow"
:title="evacuationTitle"
:content="evacuationContent"
:showCancelButton="true"
@confirm="evacuationConfirm"
- @cancel="evacuationCancel"
- ></u-modal>
+ @cancel="evacuationCancel"></u-modal>
</view>
</view>
</template>
<script>
-let socket = null;
-import { webSocketUrl } from '@/api/request.js';
-import { mapState, mapMutations } from 'vuex';
-import combinedTitle from '@/components/combined-title/combined-title.vue';
-export default {
- onLoad(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);
- },
- components: {
- combinedTitle
- },
- data() {
- return {
- weighData: {
- //纭绉伴噸鎺ュ彛鍙傛暟
- deptId: '',
- tmId: '',
- sceneId: '',
- carNo: '',
- gateCameraId: '',
- equipmentCode: '',
- weigh: 0,
- tmCode: '',
- sceneInOut: '',
- coalContactClean: 0,
- coalContactHair: 0,
- coalContactSkin: 0
- },
- // 鏄惁濉啓鍘熷彂淇℃伅
- isInputOrigin: false,
- takeCoalId: null,
- weighHouseCode: '',
- isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
- realTimeWeigh: 0,
- weighList: {},
- // 涓存椂绉伴噸瀵硅薄
- temporaryWeighObj: {
- skin: 0,
- hair: 0,
- clean: 0
- },
- infraredStatus: false, // 绾㈠鐘舵�侊紝
- // 鏀剧┖鎺у埗
- evacuationModalShow: false,
- evacuationTitle: '鏀剧┖纭',
- evacuationContent: '鏄惁纭鏀剧┖',
- // 鑾峰彇鍘熷彂淇℃伅
- primarySkin: null,
- primaryHair: null,
- primaryClean: null,
- // 鍒ゆ柇绉伴噸鎸夐挳鏄惁鍙敤
- isweigh: false,
- // 澶栬喘绫诲瀷绉伴噸濉啓姣涳紝鐨紝
- firstHairCustomernameShow: false,
- coalContactHair: '',
- coalContactSkin: '',
- // 鑱氱劍鏃舵敼鍙樻牱寮�
- isfocus1: false,
- isfocus2: false,
- // 澶栬喘绗竴娆＄О姣涢噸涓嶉渶瑕佸姞鍑忓惃
- outBuy: true
- };
- },
- 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;
- }
- } 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;
- }
+ let socket = null;
+ import { webSocketUrl } from '@/api/request.js';
+ import { mapState, mapMutations } from 'vuex';
+ import combinedTitle from '@/components/combined-title/combined-title.vue';
+ export default {
+ onLoad(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;
+ if (params.overTmWaixiao) {
+ this.weighData.overTmWaixiao = 1
}
+ this.changeweighHouseCode(params.weighHouseCode);
},
- // 鐩戝惉閲嶉噺鍙樺寲
- globalweigh: {
- handler(v) {
- this.weighData.weigh = this.realTimeWeigh = v;
+ components: {
+ combinedTitle
+ },
+ data() {
+ return {
+ weighData: {
+ //纭绉伴噸鎺ュ彛鍙傛暟
+ deptId: '',
+ tmId: '',
+ sceneId: '',
+ carNo: '',
+ gateCameraId: '',
+ equipmentCode: '',
+ weigh: 0,
+ tmCode: '',
+ sceneInOut: '',
+ coalContactClean: 0,
+ coalContactHair: 0,
+ coalContactSkin: 0
+ },
+ // 鏄惁濉啓鍘熷彂淇℃伅
+ isInputOrigin: false,
+ haveInputOrigin: false,
+
+ takeCoalId: null,
+ weighHouseCode: '',
+ isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
+ realTimeWeigh: 0,
+ weighList: {},
+ // 涓存椂绉伴噸瀵硅薄
+ temporaryWeighObj: {
+ skin: 0,
+ hair: 0,
+ clean: 0
+ },
+ infraredStatus: false, // 绾㈠鐘舵�侊紝
+ // 鏀剧┖鎺у埗
+ evacuationModalShow: false,
+ evacuationTitle: '鏀剧┖纭',
+ evacuationContent: '鏄惁纭鏀剧┖',
+ // 鑾峰彇鍘熷彂淇℃伅
+ primarySkin: null,
+ primaryHair: null,
+ primaryClean: null,
+ // 鍒ゆ柇绉伴噸鎸夐挳鏄惁鍙敤
+ isweigh: false,
+ // 澶栬喘绫诲瀷绉伴噸濉啓姣涳紝鐨紝
+ firstHairCustomernameShow: false,
+ coalContactHair: '',
+ coalContactSkin: '',
+ // 鑱氱劍鏃舵敼鍙樻牱寮�
+ isfocus1: false,
+ isfocus2: false,
+ // 澶栬喘绗竴娆＄О姣涢噸涓嶉渶瑕佸姞鍑忓惃
+ outBuy: true
+ };
+ },
+ 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, '鐪熷疄閲嶉噺鏀瑰彉浜�');
+ }
+ },
+ onShow() {
+ this.init();
+ this.changeisLogin(true)
+ this.realTimeWeigh = 0
+ },
+ onHide() {
+
+ },
+ computed: {
+ ...mapState(['globalweigh', 'globalinfraredStatus']),
+ coalContactClean() {
+ return (Number(this.weighData.coalContactHair) - Number(this.weighData.coalContactSkin)).toFixed(2);
},
- deep: true,
- immediate: true
- }
- },
- onShow() {
- this.init();
- this.realTimeWeigh = 0;
- // this.initWebSocket();
- },
- computed: {
- ...mapState(['globalweigh', 'globalinfraredStatus']),
- 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() {
- 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;
+ 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() {
+ 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.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 == '杞叆';
}
},
- sideline() {
- return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞嚭';
- }
- },
- methods: {
- ...mapMutations(['changeweighHouseCode']),
- init() {
- // 鑾峰彇绉伴噸淇℃伅
- this.$reqGet('weighList', { id: this.takeCoalId }).then(res => {
- console.log(res, '鑾峰彇绉伴噸淇℃伅');
- if (res.code == 0) {
- this.weighList = res.data;
- this.weighData.deptId = res.data.deptId;
- this.weighData.tmId = res.data.id;
- this.weighData.carNo = res.data.carNo;
- this.weighData.tmCode = res.data.code;
- 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.outBuy = false;
+ methods: {
+ ...mapMutations(['changeweighHouseCode', 'changeisLogin']),
+ init() {
+ // 鑾峰彇绉伴噸淇℃伅
+ this.$reqGet('weighList', { id: this.takeCoalId }).then(res => {
+ console.log(res, '鑾峰彇绉伴噸淇℃伅');
+ if (res.code == 0) {
+ this.weighList = res.data;
+ this.weighData.deptId = res.data.deptId;
+ this.weighData.tmId = res.data.id;
+ this.weighData.carNo = res.data.carNo;
+ this.weighData.tmCode = res.data.code;
+ 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;
}
}
- if (this.weighData.coalContactHair > 0 && this.weighData.coalContactSkin > 0) {
- this.isInputOrigin = true;
- }
- }
- });
- },
- /**
- * @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
- */
- 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();
+ });
+ },
+ /**
+ * @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
+ */
+ 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.$u.toast('姣涢噸涓嶈兘灏忎簬鐨噸');
- this.isConfirmWeighLoading = false;
+ this.saveWeigh();
}
} else {
- this.saveWeigh();
+ this.$u.toast('鏈兘鑾峰彇鍦扮閲嶉噺');
+ this.isConfirmWeighLoading = false;
}
- } else {
- this.$u.toast('鏈兘鑾峰彇鍦扮閲嶉噺');
- this.isConfirmWeighLoading = false;
}
- }
- },
- // 纭绉伴噸鎺ュ彛
- saveWeigh() {
- this.weighData.coalContactClean = this.coalContactClean;
- this.$reqPost('saveWeigh', this.weighData, 'json')
- .then(res => {
- console.log(res, '绉伴噸鎺ュ彛');
+ },
+ // 纭绉伴噸鎺ュ彛
+ saveWeigh() {
+ this.weighData.coalContactClean = this.coalContactClean;
+ this.$reqPost('saveWeigh', this.weighData, 'json')
+ .then(res => {
+ console.log(res, '绉伴噸鎺ュ彛');
+ if (res.code == 0) {
+ this.$u.toast('绉伴噸鎴愬姛');
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ });
+ this.isConfirmWeighLoading = false;
+ }, 1000);
+ } else {
+ this.$u.toast('绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
+ }
+ })
+ .catch(err => {
+ this.isConfirmWeighLoading = false;
+ console.log(err);
+ });
+ },
+ // 鍔犲噺鐓�
+ addAndSubtractCoal() {
+ this.$reqPost('addAndSubtractCoal', {
+ deptId: this.weighData.deptId,
+ sceneId: this.weighData.sceneId,
+ carNo: this.weighData.carNo,
+ tmId: this.weighData.tmId,
+ filedId: this.weighData.filedId
+ }, 'json').then(res => {
if (res.code == 0) {
- this.$u.toast('绉伴噸鎴愬姛');
+ this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
setTimeout(() => {
uni.navigateBack({
delta: 1
});
this.isConfirmWeighLoading = false;
}, 1000);
- } else {
- this.$u.toast('绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
+ console.log(res, '鍔犲噺鐓�');
}
- })
- .catch(err => {
- this.isConfirmWeighLoading = false;
- console.log(err);
});
- },
- // 鍔犲噺鐓�
- addAndSubtractCoal() {
- this.$reqPost('addAndSubtractCoal', { deptId: this.weighData.deptId, sceneId: this.weighData.sceneId, carNo: this.weighData.carNo }, 'json').then(res => {
- if (res.code == 0) {
- this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
- setTimeout(() => {
- uni.navigateBack({
- delta: 1
- });
- this.isConfirmWeighLoading = false;
- }, 1000);
- console.log(res, '鍔犲噺鐓�');
- }
- });
- },
- // 鏀剧┖
- evacuation() {
- this.evacuationModalShow = true;
- },
- // 鏀剧┖寮圭獥纭
- evacuationConfirm() {
- this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
- console.log(res, '绗簩娆℃斁绌�');
- if (res.code == 0) {
- this.$u.toast('鎿嶄綔鎴愬姛');
- this.evacuationModalShow = false;
+ },
+ // 鏀剧┖
+ evacuation() {
+ this.evacuationModalShow = true;
+ },
+ // 鏀剧┖寮圭獥纭
+ evacuationConfirm() {
+ this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
+ console.log(res, '绗簩娆℃斁绌�');
+ if (res.code == 0) {
+ this.$u.toast('鎿嶄綔鎴愬姛');
+ this.evacuationModalShow = false;
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触');
+ this.evacuationModalShow = true;
+ }
+ });
+ },
+ // 鏀剧┖寮圭獥鍙栨秷
+ evacuationCancel() {
+ this.evacuationModalShow = false;
+ },
+ // input鑱氱劍
+ inputFocus(v) {
+ if (v == 1) {
+ this.isfocus1 = true;
} else {
- this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触');
- this.evacuationModalShow = true;
+ this.isfocus2 = true;
}
- });
- },
- // 鏀剧┖寮圭獥鍙栨秷
- evacuationCancel() {
- this.evacuationModalShow = false;
- },
- // input鑱氱劍
- inputFocus(v) {
- if (v == 1) {
- this.isfocus1 = true;
- } else {
- this.isfocus2 = true;
+ },
+ // input澶辩劍
+ inputBlur() {
+ this.isfocus1 = false;
+ this.isfocus2 = false;
+ },
+ inputChange() {
+ if (this.weighData.coalContactHair > 0 && this.weighData.coalContactSkin > 0) {
+ this.isInputOrigin = true;
+ }
}
- },
- // input澶辩劍
- inputBlur() {
- this.isfocus1 = false;
- this.isfocus2 = false;
}
- }
-};
+ };
</script>
-<style lang="scss" scoped>
-@mixin flex {
- display: flex;
- justify-content: space-between;
- align-items: center;
-}
-::v-deep.weighingDevice {
- width: 100%;
- height: 100vh;
- display: flex;
- flex-direction: column;
- .one {
- // flex: 3;
- height: 290rpx;
- margin: vww(20) vww(20) 0 vww(20);
- border-radius: vww(15);
- .top {
- height: 75%;
- display: flex;
- .top_left {
- flex: 3;
- font-size: vww(50);
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 74rpx;
- font-weight: 400;
- color: #ffffff;
- line-height: 69rpx;
- text-shadow: 0rpx 3rpx 14rpx rgba(0, 0, 0, 0.33);
- text {
- font-family: weighting;
- }
- }
- .top_right {
- display: flex;
- flex-direction: column;
- justify-content: center;
- flex: 2;
- font-size: 31rpx;
- font-weight: 300;
- color: #ffffff;
- view {
- display: flex;
- align-items: center;
- }
- }
- }
- .bottom {
- text-align: center;
- height: 25%;
- display: flex;
- justify-content: space-between;
- align-items: center;
- flex-direction: column;
- font-size: 28rpx;
- font-weight: 300;
- color: #d9e1fe;
- }
- }
- .middle-block {
- width: 690rpx;
- height: 386rpx;
- margin: vww(20) vww(15) vww(13);
- 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;
- @include flex;
- justify-content: center;
- overflow: hidden;
- .block-main {
- width: 650rpx;
- height: 350rpx;
- @include flex;
- flex-direction: column;
- margin-bottom: vww(20);
- position: relative;
- .first-line,
- .second-line {
- width: 90%;
- height: vww(44);
- .focusClass {
- color: #5b95fd;
- }
- .inputClass {
- border: 1px solid rgba(73, 95, 252, 0.6) !important;
- box-shadow: 0rpx 5rpx 13rpx 0rpx rgba(73, 95, 252, 0.6) !important;
- border-radius: 12rpx !important;
- }
- .isInputOrigin {
- background-color: #f4f4fc;
- }
- .input-container {
- border: 2px solid #c5c5c5;
- box-shadow: 0rpx 5rpx 13rpx 0rpx #c5c5c5;
- border-radius: 12rpx;
- }
- }
- .first-line {
- @include flex;
- position: relative;
- top: vww(8);
- }
- .second-line {
- @include flex;
- }
- }
- .block-sideline {
- width: 94%;
- height: vww(100);
- @include flex flex-direction: column;
- align-items: flex-start;
- .first-line {
- width: 100%;
- }
- .weigh-item {
- width: 100%;
- height: vww(36);
- @include flex justify-content: space-around;
- .item {
- min-width: vww(50);
- height: vww(45);
- font-size: 21rpx;
- font-weight: 400;
- color: #ffffff;
- text-align: center;
- line-height: vww(30);
- @include flex;
- .concrete {
- width: vww(36);
- height: vww(36);
- }
- .num {
- font-size: 40rpx;
- font-weight: 300;
- color: #303030;
- }
- }
- }
- }
- }
- .bottom-block {
- width: 690rpx;
- height: 630rpx;
- margin: 0 vww(15) vww(45) 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;
- @include flex;
- justify-content: center;
- .block-main {
- width: 94%;
- height: 565rpx;
- margin-top: vww(10);
- @include flex;
- justify-content: space-around;
- align-items: flex-start;
- flex-direction: column;
- .main-information {
- width: 100%;
- height: 28rpx;
- font-size: 28rpx;
- font-weight: 300;
- color: #303030;
- @include flex;
- justify-content: flex-start;
- .prefix {
- min-width: vww(60);
- }
- .suffix {
- flex: 1;
- margin-left: vww(12);
- text-align: left;
- }
- }
- }
- }
- .three {
- margin: 0 auto vww(20);
- flex: 0.7;
- display: flex;
- color: #939393;
- .u-button {
- &:nth-of-type(2) {
- margin-left: vww(10);
- }
- &:nth-of-type(3) {
- margin-left: vww(10);
- }
- }
- }
- .four {
- width: 100%;
- margin-top: vww(5);
- text-align: center;
- }
-}
-.secondary-confirmation__main {
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- align-items: center;
- .secondary-child {
+<style lang="scss"
+ scoped>
+ @mixin flex {
display: flex;
justify-content: space-between;
+ align-items: center;
}
-}
-</style>
+
+ ::v-deep.weighingDevice {
+ width: 100%;
+ height: 100vh;
+ display: flex;
+ flex-direction: column;
+
+ .one {
+ // flex: 3;
+ height: 290rpx;
+ margin: vww(20) vww(20) 0 vww(20);
+ border-radius: vww(15);
+
+ .top {
+ height: 75%;
+ display: flex;
+
+ .top_left {
+ flex: 3;
+ font-size: vww(50);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 74rpx;
+ font-weight: 400;
+ color: #ffffff;
+ line-height: 69rpx;
+ text-shadow: 0rpx 3rpx 14rpx rgba(0, 0, 0, 0.33);
+
+ text {
+ font-family: weighting;
+ }
+ }
+
+ .top_right {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ flex: 2;
+ font-size: 31rpx;
+ font-weight: 300;
+ color: #ffffff;
+
+ view {
+ display: flex;
+ align-items: center;
+ }
+ }
+ }
+
+ .bottom {
+ text-align: center;
+ height: 25%;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ flex-direction: column;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #d9e1fe;
+ }
+ }
+
+ .middle-block {
+ width: 690rpx;
+ height: 386rpx;
+ margin: vww(20) vww(15) vww(13);
+ 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;
+ @include flex;
+ justify-content: center;
+ overflow: hidden;
+
+ .block-main {
+ width: 650rpx;
+ height: 350rpx;
+ @include flex;
+ flex-direction: column;
+ margin-bottom: vww(20);
+ position: relative;
+
+ .first-line,
+ .second-line {
+ width: 90%;
+ height: vww(44);
+
+ .focusClass {
+ color: #5b95fd;
+ }
+
+ .inputClass {
+ border: 1px solid rgba(73, 95, 252, 0.6) !important;
+ box-shadow: 0rpx 5rpx 13rpx 0rpx rgba(73, 95, 252, 0.6) !important;
+ border-radius: 12rpx !important;
+ }
+
+ .isInputOrigin {
+ background-color: #f4f4fc;
+ }
+
+ .input-container {
+ border: 2px solid #c5c5c5;
+ box-shadow: 0rpx 5rpx 13rpx 0rpx #c5c5c5;
+ border-radius: 12rpx;
+ }
+ }
+
+ .first-line {
+ @include flex;
+ position: relative;
+ top: vww(8);
+ }
+
+ .second-line {
+ @include flex;
+ }
+ }
+
+ .block-sideline {
+ width: 94%;
+ height: vww(100);
+ @include flex flex-direction: column;
+ align-items: flex-start;
+
+ .first-line {
+ width: 100%;
+ }
+
+ .weigh-item {
+ width: 100%;
+ height: vww(36);
+ @include flex justify-content: space-around;
+
+ .item {
+ min-width: vww(50);
+ height: vww(45);
+ font-size: 21rpx;
+ font-weight: 400;
+ color: #ffffff;
+ text-align: center;
+ line-height: vww(30);
+ @include flex;
+
+ .concrete {
+ width: vww(36);
+ height: vww(36);
+ }
+
+ .num {
+ font-size: 40rpx;
+ font-weight: 300;
+ color: #303030;
+ }
+ }
+ }
+ }
+ }
+
+ .bottom-block {
+ width: calc(100% - 60rpx);
+ box-sizing: border-box;
+ height: 630rpx;
+ margin: 0 vww(15) vww(45) 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;
+ @include flex;
+ justify-content: center;
+ overflow: hidden;
+
+ .block-main {
+ width: 94%;
+ height: 565rpx;
+ margin-top: vww(10);
+ @include flex;
+ justify-content: space-around;
+ align-items: flex-start;
+ flex-direction: column;
+ overflow: hidden;
+
+ .main-information {
+ width: 100%;
+ height: 28rpx;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #303030;
+ @include flex;
+ justify-content: flex-start;
+ overflow: hidden;
+
+ .prefix {
+ min-width: vww(60);
+ }
+
+ .suffix {
+ flex: 1;
+ margin-left: vww(12);
+ text-align: left;
+ }
+ }
+ }
+ }
+
+ .three {
+ margin: 0 auto vww(20);
+ flex: 0.7;
+ display: flex;
+ color: #939393;
+
+ .u-button {
+ &:nth-of-type(2) {
+ margin-left: vww(10);
+ }
+
+ &:nth-of-type(3) {
+ margin-left: vww(10);
+ }
+ }
+ }
+
+ .four {
+ width: 100%;
+ margin-top: vww(5);
+ text-align: center;
+ }
+ }
+
+ .secondary-confirmation__main {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: center;
+
+ .secondary-child {
+ display: flex;
+ justify-content: space-between;
+ }
+ }
+</style>
\ No newline at end of file
--
Gitblit v1.9.1