修改合卡

qingyiay

2023-09-18 40ce9965257472d715d072647796ac91c3932d73

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

@@ -211,6 +211,25 @@
            </view>
         </view>
      </view>
      <view class="mergeState"
         v-show="mergeStateShow">
         <view class="merge-wrap">
            <view>是否确认合并</view>
            <view class="merge-checkbox">
               <u-checkbox-group v-model="checkboxValue1"
                  placement="column"
                  @change="mergeStateChange">
                  <u-checkbox :customStyle="{marginBottom: '8px'}"
                     :label="mergeState?'确认':'取消'"
                     name="confirm"
                     label-size="30"
                     size="30"
                     activeColor="#48a2ff">
                  </u-checkbox>
               </u-checkbox-group>
            </view>
         </view>
      </view>
      <view class="three">
         <!-- 放空 -->
         <u-button type="primary"
@@ -269,14 +288,6 @@
               </u--form>
            </view>
         </u-modal>
      </view>
      <view class="mergeState">
         <u-modal :show="mergeStateShow"
            title="合卡确认"
            content="是否确认合卡"
            :showCancelButton="true"
            @confirm="mergeConfirm"
            @cancel="mergeCancel"></u-modal>
      </view>
   </view>
</template>
@@ -396,6 +407,7 @@
            },
            mergeState: true, //合卡状态 
            mergeStateShow: false, //合卡弹窗
            checkboxValue1: []
         };
      },
      watch: {
@@ -412,7 +424,8 @@
                     this.temporaryWeighObj.skin = newV;
                     let xx = new BigNumber(this.avgSkin)
                     let yy = new BigNumber(newV)
                     this.errorTipShow = xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2
                     this.errorTipShow = (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) &&
                        this.avgSkin !== 0
                  } else {
                     this.isSkinWeigh = false;
                     this.temporaryWeighObj.hair = newV;
@@ -434,7 +447,8 @@
                     this.temporaryWeighObj.skin = newV;
                     let xx = new BigNumber(this.avgSkin)
                     let yy = new BigNumber(newV)
                     this.errorTipShow = xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2
                     this.errorTipShow = (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) &&
                        this.avgSkin !== 0;
                     this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
                        2);
                     this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
@@ -675,19 +689,18 @@
               this.abnormalModalShow = false
            })
         },
         mergeConfirm() {
            this.mergeStateShow = false
         mergeStateChange(e) {
            if (e.length !== 0) {
            this.weighData.isMerge = 1
            this.MergeState = true
            this.isweigh = false
            this.orderSurplusLess = false
         },
         mergeCancel() {
            this.mergeStateShow = false
            } else {
            this.weighData.isMerge = 0
            this.MergeState = false
            this.isweigh = true
            this.orderSurplusLess = true
            }
         },
      }
   };
@@ -893,7 +906,7 @@
         width: calc(100% - 60rpx);
         box-sizing: border-box;
         height: 630rpx;
         margin: 0 vww(15) vww(45) vww(15);
         margin: 0 vww(15) vww(15) 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;
@@ -940,6 +953,29 @@
         }
      }

      .mergeState {
         width: 100%;
         margin: vww(4) 0;
         margin-bottom: vww(10);
         display: flex;
         justify-content: center;
         font-size: vww(16);
         overflow: hidden;

         .merge-wrap {
            width: vww(200);
            height: vww(30);
            display: flex;
            justify-content: space-between;
            align-items: center;

            .merge-checkbox {
               margin-top: vww(10);
            }
         }

      }

      .three {
         margin: 0 auto vww(30);
         flex: 0.7;