大部分按钮增加loading 放空操作逻辑修改

qingyiay

2023-10-13 eec82b55813387e20087989536cd32810b59cd48

 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||isExceedOrigin"
            :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||!mergeState||globalWarning"
            :loading="isConfirmWeighLoading"
            loadingText="确认"
            @click="confirmWeigh"
@@ -204,20 +204,18 @@
            :disabled="addAndSubtractCoalDisabled"
            @click="addAndSubtractCoal"
            class="jiajian"
            v-if="outBuy||!isSkinWeigh"></u-button>
            v-if="outBuy||!isSkinWeigh"
            :loading="addAndSubtractCoalLoading"></u-button>
      </view>
      <view v-show="isConfirmWeighLoading"
      <view v-show="isExceedOrigin"
         style="color: #ff6363;width: auto;margin: 0 auto;">
         超出毛重,磅房人员确认中,请勿离开此页面
         <text v-if="weighList.orderType == '外购'">超出原发毛重,磅房人员确认中,请勿离开此页面</text>
         <text v-else>超出最大毛重,磅房人员确认中,请勿离开此页面</text>
      </view>
      <!-- <view class="four">
         <u-button type="primary"
            text="刷新"
            @click.stop="RefreshHandle"
            icon="reload"
            throttle-time="800"
            :loading="refreshLoading"></u-button>
      </view> -->
      <view v-show="afterEvacuationStatus"
         style="color: #ff6363;width: auto;margin: 0 auto;">
         <text>{{afterEvacuationText}}</text>
      </view>
      <!-- 放空弹窗 -->
      <view class="evacuationModal">
         <u-modal :show="evacuationModalShow"
@@ -231,7 +229,7 @@
      <view class="">
         <u-modal :show="abnormalModalShow"
            title="异常原因"
            :showCancelButton="true"
            :showCancelButton="false"
            @confirm="abnormalConfirm"
            confirmText="提交">
            <view class="slot-content">
@@ -287,6 +285,9 @@
         this.realTimeWeigh = 0
      },
      onShow() {
         if (this.timer) {
            clearTimeout(this.timer)
         }
         this.timer = setTimeout(() => {
            if (!this.globalweigh) {
               console.log('称重时自动重连');
@@ -386,9 +387,13 @@
            mergeState: true, //合卡状态 
            mergeStateShow: false, //合卡弹窗
            checkboxValue1: [],
            isExceedOrigin: false, //是否超出原发毛重
            isExceedOrigin: false, //是否超出毛重
            refreshLoading: false,
            timer: null
            timer: null,
            afterEvacuationStatus: null, //放空后提煤单状态状态为21时提示‘等待磅房确认’
            afterEvacuationText: '',
            TwoEvacuationLoading: false,
            addAndSubtractCoalLoading: false
         };
      },
      watch: {
@@ -426,15 +431,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 //称皮没有返回装卸
@@ -454,15 +450,10 @@
               }
            }
         },
         confirmWeighVisiable(v) {
            if (v) {
               uni.hideLoading()
            }
         }
      },
      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)
@@ -496,18 +487,6 @@
         ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh', 'changeconfirmWeighVisiable',
            'changesocketTask', 'changereconnectNum'
         ]),
         RefreshHandle() {
            if (this.globalisconnect) return this.$u.toast('已连接，无需刷新')
            this.refreshLoading = true
            if (!this.globalisconnect && !this.globalisUploadimg && this.globalisLogin) {
               if (!this.is_open_socket) {
                  this.$store.dispatch('websocketInit')
                  this.changeisconnect(true);
                  this.refreshLoading = false
                  this.$u.toast('刷新成功')
               }
            }
         },
         init() {
            uni.showLoading({
               title: "加载中"
@@ -586,17 +565,15 @@
               .then(res => {
                  console.log(res, '称重接口');
                  if (res.code == 0) {
                     this.$u.toast('称重成功');
                     this.$u.toast('称重成功，即将返回上一页');
                     this.isConfirmWeighLoading = false;
                     setTimeout(() => {
                        uni.navigateBack({
                           delta: 1
                        });
                        this.isConfirmWeighLoading = false;
                     }, 1000);
                  } else if (res.code === 3) {
                     uni.showLoading({
                        title: '磅房人员确认中',
                     })
                     this.isExceedOrigin = true
                  } else {
                     this.$u.toast(res.msg ? res.msg : '称重失败，请稍后重试');
                     this.isConfirmWeighLoading = false
@@ -609,6 +586,7 @@
         },
         // 加减煤
         addAndSubtractCoal() {
            this.addAndSubtractCoalLoading = true
            this.$reqPost('addAndSubtractCoal', {
               deptId: this.weighData.deptId,
               sceneId: this.weighData.sceneId,
@@ -619,6 +597,7 @@
               weigh: this.weighData.weigh
            }, 'json').then(res => {
               if (res.code == 0) {
                  this.addAndSubtractCoalLoading = false
                  this.$u.toast('操作成功，即将返回上一页');
                  setTimeout(() => {
                     uni.navigateBack({
@@ -626,7 +605,8 @@
                     });
                     this.isConfirmWeighLoading = false;
                  }, 1000);
                  console.log(res, '加减煤');
               } else {
                  this.$u.toast(res.msg ? res.msg : '操作失败');
               }
            });
         },
@@ -636,19 +616,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;
               }
            });
         },
@@ -724,6 +709,7 @@
         confirmWeighConfirm() {
            this.changeconfirmWeighVisiable(false)
            this.isConfirmWeighLoading = false
            this.TwoEvacuationLoading = false;
            setTimeout(() => {
               this.$u.toast('即将返回上一页'),
                  uni.navigateBack({