修改转发 增加磅单打印样式 增加自主配送 修改部分页面跳转逻辑

qingyiay

2023-10-27 ab6404eb9a63f990d1e734dbfc38eb5910dee681

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

@@ -158,11 +158,11 @@
               <view class="suffix">{{ weighList.orderSurplus ||""  }}</view>
               <text style="color: #ff6363;font-weight: bold;font-size: 26rpx;"
                  class="error-tip"
                  v-show="orderSurplusLess">* 订单余量不足</text>
                  v-show="orderSurplusLess&&!isSpecial">* 订单余量不足</text>
            </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,
@@ -393,7 +393,8 @@
            afterEvacuationStatus: null, //放空后提煤单状态状态为21时提示‘等待磅房确认’
            afterEvacuationText: '',
            TwoEvacuationLoading: false,
            addAndSubtractCoalLoading: false
            addAndSubtractCoalLoading: false,
            isSpecial: null //1 是特殊 0不是特殊
         };
      },
      watch: {
@@ -422,11 +423,11 @@
                     this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
                     // this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(
                     //    2);
                     this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
                     this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
                        .temporaryWeighObj
                        .clean < 0;
                        .clean < 0) && !this.isSpecial
                     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 == '转入') {
@@ -447,11 +448,11 @@
                     this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
                     // this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
                     //    2);
                     this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
                     this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
                        .temporaryWeighObj
                        .clean < 0;
                        .clean < 0) && !this.isSpecial
                     this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus
                     this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
                     // this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
                  }
               }
            }
@@ -486,6 +487,9 @@
         },
         sideline() {
            return this.weighList.orderType == '内购' || this.weighList.orderType == '转入';
         },
         isNeedOrigin() {
            return uni.getStorageSync('isNeedOrigin')
         }
      },

@@ -503,6 +507,7 @@
               if (res.code == 0) {
                  uni.hideLoading()
                  this.weighList = res.data;
                  this.isSpecial = res.data.isSpecial
                  this.weighData.deptId = res.data.deptId;
                  this.weighData.tmId = res.data.id;
                  this.weighData.carNo = res.data.carNo;
@@ -698,19 +703,6 @@
         },
         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
            }
         },
         confirmWeighConfirm() {
            this.changeconfirmWeighVisiable(false)