qingyiay
2023-10-23 5c2decc75ac02ba4409375efc4f793b02c505296
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -162,7 +162,7 @@
            </view>
         </view>
      </view>
      <view v-show="mergeStateShow">
      <!-- <view v-show="mergeStateShow">
         <view class="mergeState">
            <view class="merge-wrap">
               <view>是否确认合并</view>
@@ -181,7 +181,7 @@
               </view>
            </view>
         </view>
      </view>
      </view> -->
      <view class="three">
         <!-- 放空 -->
         <u-button type="primary"
@@ -194,7 +194,7 @@
         <!-- 外销订单称皮时,返回加减吨按钮置灰。称毛时可用.外购订单,不出现返回加减吨的按钮 -->
         <u-button type="primary"
            text="确定称重"
            :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||!mergeState||globalWarning"
            :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||globalWarning"
            :loading="isConfirmWeighLoading"
            loadingText="确认"
            @click="confirmWeigh"
@@ -385,7 +385,7 @@
               ]
            },
            mergeState: true, //合卡状态 
            mergeStateShow: false, //合卡弹窗
            // mergeStateShow: false, //合卡弹窗
            checkboxValue1: [],
            isExceedOrigin: false, //是否超出毛重
            refreshLoading: false,
@@ -426,7 +426,7 @@
                        .temporaryWeighObj
                        .clean < 0;
                     this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus
                     this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
                     // this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
                  }
               } else if (this.weighList.orderType == '外购' || this.weighList.orderType == '内购' || this.weighList
                  .orderType == '转入') {
@@ -451,7 +451,7 @@
                        .temporaryWeighObj
                        .clean < 0;
                     this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus
                     this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
                     // this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
                  }
               }
            }
@@ -699,19 +699,19 @@
         skinAbnormal() {
            this.$reqPost('skinAbnormal', { sceneId: this.weighData.sceneId, tmId: this.weighData.tmId }, 'params')
         },
         mergeStateChange(e) {
            if (e.length !== 0) {
               this.weighData.isMerge = 1
               this.MergeState = true
               this.isweigh = false
               this.orderSurplusLess = false
            } else {
               this.weighData.isMerge = 0
               this.MergeState = false
               this.isweigh = true
               this.orderSurplusLess = true
            }
         },
         // mergeStateChange(e) {
         //    if (e.length !== 0) {
         //       this.weighData.isMerge = 1
         //       this.MergeState = true
         //       this.isweigh = false
         //       this.orderSurplusLess = false
         //    } else {
         //       this.weighData.isMerge = 0
         //       this.MergeState = false
         //       this.isweigh = true
         //       this.orderSurplusLess = true
         //    }
         // },
         confirmWeighConfirm() {
            this.changeconfirmWeighVisiable(false)
            this.isConfirmWeighLoading = false