修改称重连点问题 增加司机注册字段

qingyiay

2023-12-25 aef949a659d073443e81f22686b44bd440a69a0e

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

@@ -162,26 +162,6 @@
            </view>
         </view>
      </view>
      <!-- <view v-show="mergeStateShow">
         <view class="mergeState">
            <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> -->
      <view class="three">
         <!-- 放空 -->
         <u-button type="primary"
@@ -204,7 +184,7 @@
            :disabled="addAndSubtractCoalDisabled"
            @click="addAndSubtractCoal"
            class="jiajian"
            v-if="outBuy||!isSkinWeigh"
            v-if="outBuy&&!isSkinWeigh"
            :loading="addAndSubtractCoalLoading"></u-button>
      </view>
      <view v-show="isExceedOrigin"
@@ -408,7 +388,6 @@
                  '转出') {
                  if (this.weighList.skin == 0) {
                     this.isSkinWeigh = true //称皮没有返回装卸
                     this.outBuy = false //称皮没有返回装卸
                     this.temporaryWeighObj.skin = newV;
                     let xx = new BigNumber(this.avgSkin)
                     let yy = new BigNumber(newV)
@@ -416,14 +395,13 @@
                        this.avgSkin !== 0
                  } else {
                     this.isSkinWeigh = false;
                     this.outBuy = true;
                     this.temporaryWeighObj.hair = newV;
                     let x = new BigNumber(this.temporaryWeighObj.hair)
                     let y = new BigNumber(this.weighList.skin)
                     this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
                     this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
                        .temporaryWeighObj
                        .clean < 0) && !this.isSpecial
                        .clean < 0) && !this.isSpecial && !this.weighList.source
                     this.orderSurplusLess = (this.temporaryWeighObj.clean > this.weighList.orderSurplus) && !
                        this.weighList.source
                  }
@@ -431,11 +409,9 @@
                  .orderType == '转入') {
                  if (this.weighList.hair == 0) {
                     this.isSkinWeigh = false;
                     this.outBuy = true;
                     this.temporaryWeighObj.hair = newV;
                  } else {
                     this.isSkinWeigh = true; //称皮没有返回装卸
                     this.outBuy = false //称皮没有返回装卸
                     this.temporaryWeighObj.skin = newV;
                     let xx = new BigNumber(this.avgSkin)
                     let yy = new BigNumber(newV)
@@ -446,7 +422,7 @@
                     this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
                     this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
                        .temporaryWeighObj
                        .clean < 0) && !this.isSpecial
                        .clean < 0) && !this.isSpecial && !this.weighList.source
                     this.orderSurplusLess = (this.temporaryWeighObj.clean > this.weighList.orderSurplus) && !
                        this.weighList.source
                  }
@@ -512,18 +488,9 @@
                  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 //0手动 1不是 是0判断余量不足
                  if (this.weighList.orderType == '外购') {
                     this.firstHairCustomernameShow = true;
                     if (this.weighList.hair > 0) {
                        this.haveInputOrigin = true;
                        this.isInputOrigin = true;
                     }
                     if (this.weighList.hair == 0) {
                        this.outBuy = false;
                     }
                  } else {
                     this.isInputOrigin = true;
                  }
                  this.outBuy = !(this.weighList.orderType === '外购' || this.weighList.orderType ===
                     '内购' ||
                     this.weighList.orderType === '转入')
               } else {
                  uni.hideLoading()
                  this.$u.toast('加载失败')
@@ -536,33 +503,31 @@
          * @确认称重等待后端提供实时称重接口，获取皮重，毛重
          */
         confirmWeigh() {
            if (this.isConfirmWeighLoading == false) {
               this.isConfirmWeighLoading = true;
               if (this.weighData.weigh != 0) {
                  // 如果正在称皮
                  if (this.isSkinWeigh) {
                     // 如果平均皮重为0
                     if (this.isAbnormalAvgSkin) {
                        this.abnormalModalShow = false
                        this.saveWeigh();
                     } else {
                        let xx = new BigNumber(this.avgSkin)
                        let yy = new BigNumber(this.globalweigh)
                        if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
                           this.abnormalModalShow = true
                           this.skinAbnormal()
                        } else {
                           this.saveWeigh();
                        }
                     }
                  } else {
            this.isConfirmWeighLoading = true;
            if (this.weighData.weigh != 0) {
               // 如果正在称皮
               if (this.isSkinWeigh) {
                  // 如果平均皮重为0
                  if (this.isAbnormalAvgSkin) {
                     this.abnormalModalShow = false
                     this.saveWeigh();
                  } else {
                     let xx = new BigNumber(this.avgSkin)
                     let yy = new BigNumber(this.globalweigh)
                     if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
                        this.abnormalModalShow = true
                        this.skinAbnormal()
                     } else {
                        this.saveWeigh();
                     }
                  }

               } else {
                  this.$u.toast('未能获取地磅重量');
                  this.isConfirmWeighLoading = false;
                  this.saveWeigh();
               }

            } else {
               this.$u.toast('未能获取地磅重量');
               this.isConfirmWeighLoading = false;
            }
         },
         // 确认称重接口
@@ -573,11 +538,11 @@
                  console.log(res, '称重接口');
                  if (res.code == 0) {
                     this.$u.toast('称重成功，即将返回上一页');
                     this.isConfirmWeighLoading = false;
                     setTimeout(() => {
                        uni.navigateBack({
                           delta: 1
                        });
                        this.isConfirmWeighLoading = false;
                     }, 1000);
                  } else if (res.code === 3) {
                     this.isExceedOrigin = true