放空逻辑修改 提煤单状态显示字段修改

qingyiay

2023-10-12 f2aa6f75d70cc7df54bfd0cf33af46fe96401856

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

@@ -189,7 +189,6 @@
            plain
            @click="evacuation"
            throttleTime="500"
            :disabled="!isEvacuation"
            v-if='weighList.skin||weighList.hair'></u-button>
         <!-- 外销订单称皮时，返回加减吨按钮置灰。称毛时可用.外购订单，不出现返回加减吨的按钮 -->
         <u-button type="primary"
@@ -210,6 +209,10 @@
         style="color: #ff6363;width: auto;margin: 0 auto;">
         <text v-if="weighList.orderType == '外购'">超出原发毛重,磅房人员确认中,请勿离开此页面</text>
         <text v-else>超出最大毛重,磅房人员确认中,请勿离开此页面</text>
      </view>
      <view v-show="afterEvacuationStatus"
         style="color: #ff6363;width: auto;margin: 0 auto;">
         <text>{{afterEvacuationText}}</text>
      </view>
      <!-- 放空弹窗 -->
      <view class="evacuationModal">
@@ -384,7 +387,9 @@
            checkboxValue1: [],
            isExceedOrigin: false, //是否超出毛重
            refreshLoading: false,
            timer: null
            timer: null,
            afterEvacuationStatus: null, //放空后提煤单状态状态为21时提示‘等待磅房确认’
            afterEvacuationText: ''
         };
      },
      watch: {
@@ -422,15 +427,6 @@
                     this.isSkinWeigh = false;
                     this.outBuy = true;
                     this.temporaryWeighObj.hair = newV;
                     // if (this.weighList.orderType == '外购') {
                     //    let xx = new BigNumber(newV)
                     //    let yy = new BigNumber(this.weighList.hairTwo)
                     //    if (xx.minus(yy) > 0.3) {
                     //       this.$u.toast('超出原发信息毛重,请等待管理人员处理')
                     //       this.isExceedOrigin = true
                     //       this.saveWeigh()
                     //    }
                     // }
                  } else {
                     this.isSkinWeigh = true; //称皮没有返回装卸
                     this.outBuy = false //称皮没有返回装卸
@@ -616,13 +612,16 @@
            this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
               console.log(res, '第二次放空');
               if (res.code == 0) {
                  this.$u.toast('操作成功，即将返回上一页');
                  setTimeout(() => {
                     uni.navigateBack({
                        delta: 1
                     });
                  }, 1000);
                  this.$u.toast('操作成功');
                  // setTimeout(() => {
                  //    uni.navigateBack({
                  //       delta: 1
                  //    });
                  // }, 1000);
                  this.evacuationModalShow = false;
                  this.afterEvacuationStatus = res.data.status === 21 || res.data.status === 22
                  this.afterEvacuationText = res.msg

               } else {
                  this.$u.toast(res.msg ? res.msg : '操作失败');
                  this.evacuationModalShow = true;