删除无用代码 修改部分逻辑 调整部分样式

qingyiay

2023-10-17 2adce788c1a411959b81f08d5569d92861c7f300

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

@@ -189,12 +189,12 @@
            plain
            @click="evacuation"
            throttleTime="500"
            :disabled="!isEvacuation"
            :loading="TwoEvacuationLoading"
            v-if='weighList.skin||weighList.hair'></u-button>
         <!-- 外销订单称皮时，返回加减吨按钮置灰。称毛时可用.外购订单，不出现返回加减吨的按钮 -->
         <u-button type="primary"
            text="确定称重"
            :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||!mergeState"
            :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||!mergeState||globalWarning"
            :loading="isConfirmWeighLoading"
            loadingText="确认"
            @click="confirmWeigh"
@@ -204,11 +204,17 @@
            :disabled="addAndSubtractCoalDisabled"
            @click="addAndSubtractCoal"
            class="jiajian"
            v-if="outBuy||!isSkinWeigh"></u-button>
            v-if="outBuy||!isSkinWeigh"
            :loading="addAndSubtractCoalLoading"></u-button>
      </view>
      <view v-show="isExceedOrigin"
         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">
@@ -383,7 +389,11 @@
            checkboxValue1: [],
            isExceedOrigin: false, //是否超出毛重
            refreshLoading: false,
            timer: null
            timer: null,
            afterEvacuationStatus: null, //放空后提煤单状态状态为21时提示‘等待磅房确认’
            afterEvacuationText: '',
            TwoEvacuationLoading: false,
            addAndSubtractCoalLoading: false
         };
      },
      watch: {
@@ -407,8 +417,11 @@
                     this.isSkinWeigh = false;
                     this.outBuy = true;
                     this.temporaryWeighObj.hair = newV;
                     this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(
                        2);
                     let x = new BigNumber(this.temporaryWeighObj.hair)
                     let y = new BigNumber(this.weighList.skin)
                     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
                        .temporaryWeighObj
                        .clean < 0;
@@ -421,15 +434,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 //称皮没有返回装卸
@@ -438,8 +442,11 @@
                     let yy = new BigNumber(newV)
                     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);
                     let x = new BigNumber(this.weighList.hair)
                     let y = new BigNumber(this.temporaryWeighObj.skin)
                     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
                        .temporaryWeighObj
                        .clean < 0;
@@ -452,7 +459,7 @@
      },
      computed: {
         ...mapState(['globalweigh', 'globalinfraredStatus', 'globalisconnect', 'globalisUploadimg', 'globalisLogin',
            'is_open_socket', 'socketTask', 'confirmWeighVisiable', 'confirmWeighContent'
            'is_open_socket', 'socketTask', 'confirmWeighVisiable', 'confirmWeighContent', 'globalWarning'
         ]),
         coalContactClean() {
            let xx = BigNumber(this.weighData.coalContactHair)
@@ -585,6 +592,7 @@
         },
         // 加减煤
         addAndSubtractCoal() {
            this.addAndSubtractCoalLoading = true
            this.$reqPost('addAndSubtractCoal', {
               deptId: this.weighData.deptId,
               sceneId: this.weighData.sceneId,
@@ -595,6 +603,7 @@
               weigh: this.weighData.weigh
            }, 'json').then(res => {
               if (res.code == 0) {
                  this.addAndSubtractCoalLoading = false
                  this.$u.toast('操作成功，即将返回上一页');
                  setTimeout(() => {
                     uni.navigateBack({
@@ -602,7 +611,8 @@
                     });
                     this.isConfirmWeighLoading = false;
                  }, 1000);
                  console.log(res, '加减煤');
               } else {
                  this.$u.toast(res.msg ? res.msg : '操作失败');
               }
            });
         },
@@ -612,19 +622,24 @@
         },
         // 放空弹窗确认
         evacuationConfirm() {
            this.TwoEvacuationLoading = true;
            this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
               console.log(res, '第二次放空');
               if (res.code == 0) {
                  this.$u.toast('操作成功，即将返回上一页');
               if (res.msg.length > 4) { //大于4是等待后台确认
                  this.TwoEvacuationLoading = true;
                  this.evacuationModalShow = false;
                  this.afterEvacuationStatus = res.data.status === 21 || res.data.status === 22
                  this.afterEvacuationText = res.msg

               } else { //小于4成功
                  this.TwoEvacuationLoading = false;
                  this.evacuationModalShow = false;
                  this.$u.toast('操作成功,即将返回上一页');
                  setTimeout(() => {
                     uni.navigateBack({
                        delta: 1
                     });
                  }, 1000);
                  this.evacuationModalShow = false;
               } else {
                  this.$u.toast(res.msg ? res.msg : '操作失败');
                  this.evacuationModalShow = true;
               }
            });
         },
@@ -700,6 +715,7 @@
         confirmWeighConfirm() {
            this.changeconfirmWeighVisiable(false)
            this.isConfirmWeighLoading = false
            this.TwoEvacuationLoading = false;
            setTimeout(() => {
               this.$u.toast('即将返回上一页'),
                  uni.navigateBack({