称重逻辑简化，提高可读性

qingyiay

2023-07-02 8c4dd05b10fcaeb94c09613699aab923318a1c6d

 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue

@@ -1,8 +1,7 @@
<template>
   <view class="weighingDevice">
      <view class="one"
         style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/weighbanner.png') no-repeat;
      background-size: cover;">
         :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/weighbanner.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
         <view class="top">
            <view class="top_left">
               <text>{{ realTimeWeigh }}</text>
@@ -71,19 +70,19 @@
            <view class="main-information">
               <view class="prefix">皮重:</view>
               <view class="suffix">
                  {{temporaryWeighObj.skin?temporaryWeighObj.skin:showWeigh.skin?showWeigh.skin:''}}
                  {{currentSkin}}
               </view>
            </view>
            <view class="main-information">
               <view class="prefix">毛重:</view>
               <view class="suffix">
                  {{temporaryWeighObj.hair?temporaryWeighObj.hair:showWeigh.hair?showWeigh.hair:''}}
                  {{currentHair}}
               </view>
            </view>
            <view class="main-information">
               <view class="prefix">净重:</view>
               <view class="suffix">
                  {{ temporaryWeighObj.clean?temporaryWeighObj.clean:showWeigh.clean?showWeigh.clean:'' }}
                  {{ currentClean}}
               </view>
            </view>
            <view class="main-information">
@@ -107,19 +106,19 @@
                  <view class="item-block">
                     <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="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/skin.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
                           皮</view>
                        <view class="num">{{ item.skin }}</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="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/hair.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
                           毛</view>
                        <view class="num">{{ item.hair }}</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="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/clean.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
                           净</view>
                        <view class="num">{{ item.clean }}</view>
                     </view>
@@ -170,7 +169,7 @@

<script>
   let socket = null;
   import { webSocketUrl } from '@/api/request.js';
   import { webSocketUrl, onlineurl } from '@/api/request.js';
   import { mapState, mapMutations } from 'vuex';
   import combinedTitle from '@/components/combined-title/combined-title.vue';
   export default {
@@ -246,30 +245,29 @@
            outBuy: true,
            // 继续卸货按钮
            canUnload: false,
            UnloadingAgainLoading: false
            UnloadingAgainLoading: false,
            onlineurl,
         };
      },
      watch: {
         realTimeWeigh(newV, oldV) {
            if (this.weighList.orderType == '外销' || this.weighList.orderType == '内销' || this.weighList.orderType ==
               '转出') {
               if (this.showWeigh.skin == 0) {
               if (!this.showWeigh.skin) {
                  this.temporaryWeighObj.skin = newV;
               } else {
                  this.temporaryWeighObj.hair = newV;
                  this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.showWeigh.skin).toFixed(2);
                  this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this.temporaryWeighObj
                     .clean < 0;
                  this.isweigh = Number(this.currentClean) > this.weighList.orderSurplus || Number(this
                     .currentClean) < 0;
               }
            } else if (this.weighList.orderType == '外购' || this.weighList.orderType == '内购' || this.weighList
               .orderType == '转入') {
               if (this.showWeigh.hair == 0) {
               if (!this.showWeigh.hair) {
                  this.temporaryWeighObj.hair = newV;
               } else {
                  this.temporaryWeighObj.skin = newV;
                  this.temporaryWeighObj.clean = (this.showWeigh.hair - this.temporaryWeighObj.skin).toFixed(2);
                  this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this.temporaryWeighObj
                     .clean < 0 || this.showWeigh.skin < newV;
                  this.isweigh = Number(this.currentClean) < 0 || this.showWeigh.skin < newV && this.showWeigh
                     .skin > 0;
               }
            }
         },
@@ -286,9 +284,6 @@
      },
      computed: {
         ...mapState(['globalweigh', 'globalinfraredStatus']),
         // coalContactClean() {
         //    return (Number(this.weighData.coalContactHair) - Number(this.weighData.coalContactSkin)).toFixed(2);
         // },
         token() {
            return uni.getStorageSync('token');
         },
@@ -309,19 +304,24 @@
                  .temporaryWeighObj.hair;
            }
         },
         sideline() {
            return this.weighList.orderType == '内购' || this.weighList.orderType == '转入';
         },

         showWeigh() {
            return this.weighList.tmTaskCoalItems ? (this.weighList.tmTaskCoalItems[0] ? this
               .weighList.tmTaskCoalItems[0] : {}) : {}
         },
         nextShowWeigh() {
            return this.weighList.tmTaskCoalItems ? (this.weighList.tmTaskCoalItems[1] ? this
               .weighList.tmTaskCoalItems[1] : {}) : {}
         },
         // 称重历史
         weighHistory() {
            return this.weighList.tmTaskCoalItems ? this.weighList.tmTaskCoalItems : []
         },
         currentHair() {
            return this.temporaryWeighObj.hair ? this.temporaryWeighObj.hair : this.showWeigh.skin ? (this.showWeigh
               .skin || 0) : (this.showWeigh.hair || 0)
         },
         currentSkin() {
            return this.temporaryWeighObj.skin || 0
         },
         currentClean() {
            return (this.currentHair - this.currentSkin).toFixed(2)
         }
      },
      methods: {
@@ -341,8 +341,6 @@
                  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;
                  this.outBuy = (this.weighList.orderType.indexOf('销') !== -1) && this.showWeigh.skin > 0;
                  // 继续卸货只有外购类型第二次会有
                  this.canUnload = this.weighList.orderType === '外购' && this.showWeigh.hair > 0;