修改合卡

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"
@@ -218,11 +237,12 @@
            plain
            @click="evacuation"
            throttleTime="500"
            :disabled="!isEvacuation"></u-button>
            :disabled="!isEvacuation"
            v-if='weighList.skin||weighList.hair'></u-button>
         <!-- 外销订单称皮时，返回加减吨按钮置灰。称毛时可用.外购订单，不出现返回加减吨的按钮 -->
         <u-button type="primary"
            text="确定称重"
            :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || !isInputOrigin"
            :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || !isInputOrigin||!mergeState"
            :loading="isConfirmWeighLoading"
            loadingText="确认"
            @click="confirmWeigh"
@@ -315,7 +335,8 @@
               sceneInOut: '',
               coalContactClean: 0,
               coalContactHair: 0,
               coalContactSkin: 0
               coalContactSkin: 0,
               isMerge: 0 //1是 0不是  默认0  是否合卡
            },
            // 是否填写原发信息
            isInputOrigin: false,
@@ -383,8 +404,10 @@
                     }
                  },
               ]
            }

            },
            mergeState: true, //合卡状态 
            mergeStateShow: false, //合卡弹窗
            checkboxValue1: []
         };
      },
      watch: {
@@ -401,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;
@@ -410,6 +434,8 @@
                     this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
                        .temporaryWeighObj
                        .clean < 0;
                     this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus
                     this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
                  }
               } else if (this.weighList.orderType == '外购' || this.weighList.orderType == '内购' || this.weighList
                  .orderType == '转入') {
@@ -421,13 +447,15 @@
                     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
                        .temporaryWeighObj
                        .clean < 0;
                     this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus
                     this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
                  }
               }
            }
@@ -451,13 +479,11 @@
         isEvacuation() {
            if (this.weighList.orderType == '外销' || this.weighList.orderType == '内销' || this.weighList.orderType ==
               '转出') {
               return (this.weighList.skin === 0 ? this.temporaryWeighObj.skin : this.weighList.skin) == this
                  .temporaryWeighObj.hair;
               return this.weighList.skin == this.temporaryWeighObj.hair;
            }
            if (this.weighList.orderType == '外购' || this.weighList.orderType == '内购' || this.weighList.orderType ==
               '转入') {
               return (this.weighList.hair === 0 ? this.temporaryWeighObj.skin : this.weighList.hair) == this
                  .temporaryWeighObj.hair;
               return this.weighList.hair == this.temporaryWeighObj.skin;
            }
         },
         sideline() {
@@ -483,6 +509,7 @@
                  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.weighList.source = res.data.source
                  if (this.weighList.orderType == '外购') {
                     this.firstHairCustomernameShow = true;
                     if (this.weighList.hair > 0) {
@@ -550,7 +577,7 @@
                        this.isConfirmWeighLoading = false;
                     }, 1000);
                  } else {
                     this.$u.toast('称重失败，请稍后重试');
                     this.$u.toast(res.msg ? res.msg : '称重失败，请稍后重试');
                     this.isConfirmWeighLoading = false
                  }
               })
@@ -661,7 +688,20 @@
            this.$reqPost('skinAbnormal', { sceneId: this.weighData.sceneId }, 'params').then(() => {
               this.abnormalModalShow = false
            })
         }
         },
         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
            }
         },
      }
   };
</script>
@@ -866,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;
@@ -913,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;