验质计算净重bug

yangan

2023-10-25 e9f4e729b9b19e068781a08bc52fdd4a0798ca7e

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

@@ -29,7 +29,7 @@
            <view class="main-information"
               v-if="weighList.orderType=='转入'||weighList.orderType=='转出'">
               <view class="prefix">
                  发货地煤场:
                  发货地基地:
               </view>
               <view class="suffix">
                  {{ weighList.filedName || '' }}
@@ -38,7 +38,7 @@
            <view class="main-information"
               v-if="weighList.orderType=='转入'||weighList.orderType=='转出'">
               <view class="prefix">
                  收货地煤场:
                  收货地基地:
               </view>
               <view class="suffix">
                  {{ weighList.toFiledName || '' }}
@@ -60,7 +60,7 @@
               <view class="suffix">{{ weighList.filedName || '' }}</view>
            </view>
            <!-- <view class="main-information">
               <view class="prefix">煤种名称:</view>
               <view class="prefix">物料名称:</view>
               <view class="suffix">{{ weighList.coalName || '' }}</view>
            </view> -->
            <view class="main-information">
@@ -85,23 +85,16 @@
                  {{ currentClean}}
               </view>
            </view>
            <view class="main-information">
            <!-- <view class="main-information">
               <view class="prefix">订单余量:</view>
               <view class="suffix">{{ weighList.orderSurplus || 0 }}</view>
            </view>
            </view> -->
         </view>
      </view>
      <!--  称重历史-->
      <weigh-item :list="weighHistory"></weigh-item>
      <view class="three">
         <!-- 放空 -->
         <u-button type="primary"
            text="放空"
            plain
            @click="evacuation"
            throttleTime="500"
            :disabled="!isEvacuation"></u-button>
         <!-- 外销订单称皮时，返回加减吨按钮置灰。称毛时可用.外购订单，不出现返回加减吨的按钮 -->
         <!-- .外购订单，不出现返回加减吨的按钮 -->
         <u-button type="primary"
            text="确定称重"
            :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||globalWarning"
@@ -121,6 +114,14 @@
            loadingText="确认"
            :disabled="isweigh||realTimeWeigh == 0"
            v-if='canUnload'></u-button>
         <!-- 放空 -->
         <u-button type="primary"
            text="放空"
            plain
            @click="evacuation"
            throttleTime="500"
            :disabled="!isEvacuation"></u-button>

      </view>
      <!-- 放空弹窗 -->
      <view class="evacuationModal">
@@ -233,8 +234,7 @@
                     this.temporaryWeighObj.skin = newV;
                  } else {
                     this.temporaryWeighObj.hair = newV;
                     this.isweigh = Number(this.currentClean) > this.weighList.orderSurplus || Number(this
                        .currentClean) < 0;
                     this.isweigh = Number(this.currentClean) < 0;
                  }
               } else if (this.weighList.orderType == '外购' || this.weighList.orderType == '内购' || this.weighList
                  .orderType == '转入') {
@@ -251,12 +251,26 @@
            deep: true
         }
      },
      onPullDownRefresh() {
         if (!this.globalisconnect && !this.globalisUploadimg && this.globalisLogin) {
            if (!this.is_open_socket) {
               this.$store.dispatch('websocketInit')
               this.changeisconnect(false);
               console.log('称重的ws');
               uni.stopPullDownRefresh();
            } else {
               uni.stopPullDownRefresh();
            }
         }
      },
      onShow() {
         this.init();
         // this.realTimeWeigh = 0
      },
      computed: {
         ...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning']),
         ...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning', 'globalisconnect', 'globalisUploadimg',
            'globalisLogin', 'is_open_socket'
         ]),
         token() {
            return uni.getStorageSync('token');
         },
@@ -287,11 +301,15 @@
            return this.weighList.tmTaskCoalItems ? this.weighList.tmTaskCoalItems : []
         },
         currentHair() {
            if (this.weighList.orderType == '外销' || this.weighList.orderType == '内销' || this.weighList.orderType ==
               '转出') {
               return this.temporaryWeighObj.hair ? this.temporaryWeighObj.hair : ''
            }
            return this.temporaryWeighObj.hair ? this.temporaryWeighObj.hair : this.showWeigh.skin ? (this.showWeigh
               .skin || '') : (this.showWeigh.hair || '')
         },
         currentSkin() {
            return this.temporaryWeighObj.skin || ''
            return this.temporaryWeighObj.skin ? this.temporaryWeighObj.skin : (this.showWeigh.skin || '')
         },
         currentClean() {
            if (!this.currentSkin) return ''
@@ -299,7 +317,8 @@
               .orderType == '转入') {
               return (this.currentHair - this.currentSkin).toFixed(2)
            } else {
               return !this.showWeigh.skin ? this.currentSkin : (this.currentHair - this.currentSkin).toFixed(2)
               return !this.showWeigh.skin ? this.currentSkin : (this.currentHair - this.currentSkin) > 0 ? (this
                  .currentHair - this.currentSkin).toFixed(2) : ''
            }

         }
@@ -744,15 +763,16 @@

      .three {
         margin: 0 auto vww(5);
         margin-bottom: vww(60);
         width: 96%;
         display: grid;
         grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
         grid-template-columns: repeat(auto-fit, minmax(140rpx, 1fr));
         justify-content: center;
         gap: vww(10);
         color: #939393;

         .u-button {
            width: vww(90);
            width: vww(70);
         }
      }