称重页面判断逻辑修改

qingyiay

2023-07-02 b034b3ca571447861a2c594c537eba59089fefcd

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

@@ -71,19 +71,19 @@
            <view class="main-information">
               <view class="prefix">皮重:</view>
               <view class="suffix">
                  {{temporaryWeighObj.skin?temporaryWeighObj.skin:showWeigh.skin?showWeigh.skin:''}}
                  {{temporaryWeighObj.skin||''}}
               </view>
            </view>
            <view class="main-information">
               <view class="prefix">毛重:</view>
               <view class="suffix">
                  {{temporaryWeighObj.hair?temporaryWeighObj.hair:showWeigh.hair?showWeigh.hair:''}}
                  {{temporaryWeighObj.hair?temporaryWeighObj.hair:showWeigh.skin?(showWeigh.skin||''):(showWeigh.hair||'')}}
               </view>
            </view>
            <view class="main-information">
               <view class="prefix">净重:</view>
               <view class="suffix">
                  {{ temporaryWeighObj.clean?temporaryWeighObj.clean:showWeigh.clean?showWeigh.clean:'' }}
                  {{ temporaryWeighObj.clean||''}}
               </view>
            </view>
            <view class="main-information">
@@ -253,7 +253,7 @@
         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;
@@ -263,13 +263,13 @@
               }
            } 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.temporaryWeighObj.clean = (this.showWeigh.skin - newV).toFixed(2);
                  this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this.temporaryWeighObj
                     .clean < 0 || this.showWeigh.skin < newV;
                     .clean < 0 || this.showWeigh.skin < newV && this.showWeigh.skin > 0;
               }
            }
         },
@@ -316,10 +316,6 @@
            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 : []
         }
@@ -341,8 +337,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;