修改bug，称重页面增加历史和异常原因填写

qingyiay

2023-08-28 82a7eba143cc761b303b99889193f7aad2dc9d08

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

@@ -101,6 +101,47 @@
      </view>
      <view v-else
         style="width: 100%;height: 40rpx;"></view>
      <view class="history-utils">
         <view class="history-utils_item">
            平均皮重:{{avgSkin}}
         </view>
         <view class="history-utils_item btn">
            <u-button plain
               type="primary"
               :text="historyShow?'隐藏历史称重':'显示历史称重'"
               @click="historyShow=!historyShow"></u-button>
         </view>
      </view>
      <Transition name="slide-fade">
         <view class="history-skin"
            v-show="historyShow">
            <view class="table-title">
               <view class="table-title_item time">
                  称重时间
               </view>
               <view class="table-title_item coal-name">
                  煤种名称
               </view>
               <view class="table-title_item skin">
                  皮重重量
               </view>
            </view>
            <view class="history-skin_item"
               v-for="item in tmTaskCoalList">
               <view class="item createTime">
                  {{item.createTime||"" }}
               </view>
               <view class="item">
                  {{item.coalName||"" }}
               </view>
               <view class="item skin">
                  <view class="">
                     {{item.skin||"" }}
                  </view>
               </view>
            </view>
         </view>
      </Transition>
      <view class="bottom-block">
         <view class="block-main">
            <view class="main-information"
@@ -142,22 +183,25 @@
            </view>
            <view class="main-information">
               <view class="prefix">皮重:</view>
               <view class="suffix">{{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}
               <view class="suffix">
                  {{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin||""  }}
               </view>
            </view>
            <view class="main-information">
               <view class="prefix">毛重:</view>
               <view class="suffix">{{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair }}
               <view class="suffix">
                  {{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair||""  }}
               </view>
            </view>
            <view class="main-information">
               <view class="prefix">净重:</view>
               <view class="suffix">{{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean }}
               <view class="suffix">
                  {{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean ||"" }}
               </view>
            </view>
            <view class="main-information">
               <view class="prefix">订单余量:</view>
               <view class="suffix">{{ weighList.orderSurplus || 0 }}</view>
               <view class="suffix">{{ weighList.orderSurplus ||""  }}</view>
            </view>
         </view>
      </view>
@@ -176,7 +220,7 @@
            :loading="isConfirmWeighLoading"
            loadingText="确认"
            @click="confirmWeigh"
            v-show="historyBtn"></u-button>
            throttleTime="800"></u-button>
         <u-button type="primary"
            text="返回加减吨"
            :disabled="addAndSubtractCoalDisabled"
@@ -184,29 +228,6 @@
            class="jiajian"
            v-if="outBuy"></u-button>
      </view>
      <view style="width: 200rpx;margin: auto;position: relative;"
         v-if="!historyBtn"><u-button type="primary"
            text="显示历史皮重"
            @click.stop="displayHistory"></u-button></view>
      <Transition name="slide-fade">
         <view class="history-skin"
            v-if="historyShow">
            <view class="history-skin_item"
               v-for="item in tmTaskCoalList">
               <view class="createTime">
                  日期:{{item.createTime.slice(0,10)}}
               </view>
               <view class="skin">
                  <view class="">
                     皮重:
                  </view>
                  <view class="">
                     {{item.skin}}
                  </view>
               </view>
            </view>
         </view>
      </Transition>
      <!-- 放空弹窗 -->
      <view class="evacuationModal">
         <u-modal :show="evacuationModalShow"
@@ -247,6 +268,7 @@
   import { webSocketUrl } from '@/api/request.js';
   import { mapState, mapMutations } from 'vuex';
   import combinedTitle from '@/components/combined-title/combined-title.vue';
   import BigNumber from "bignumber.js"
   export default {
      onLoad(params) {
         this.takeCoalId = params.takeCoalId;
@@ -262,6 +284,9 @@
            this.weighData.overTmWaixiao = 1
         }
         this.changeweighHouseCode(params.weighHouseCode);
         this.init();
         this.changeWeigh('')
         this.realTimeWeigh = 0
      },
      components: {
         combinedTitle
@@ -320,11 +345,14 @@
            outBuy: true,
            // 皮重异常相关
            abnormalContent: '',
            avgSkin: null, // 平均皮重
            avgSkin: '', // 平均皮重
            isAbnormalAvgSkin: true, //平均皮重是否异常
            tmTaskCoalList: [],
            abnormalModalShow: false,
            historyBtn: false,
            historyShow: false
            historyShow: false,
            // 是否在称皮重，点击确定称重判断是否异常
            isSkinWeigh: false
         };
      },
      watch: {
@@ -340,13 +368,10 @@
                  .orderType ==
                  '转出') {
                  if (this.weighList.skin == 0) {
                     this.isSkinWeigh = true
                     this.temporaryWeighObj.skin = newV;
                     this.getAverageSkin()
                     if (this.avgSkin < newV) {
                        this.abnormalModalShow = true
                        this.historyBtn = true
                     }
                  } else {
                     this.isSkinWeigh = false;
                     this.temporaryWeighObj.hair = newV;
                     this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(
                        2);
@@ -357,14 +382,11 @@
               } else if (this.weighList.orderType == '外购' || this.weighList.orderType == '内购' || this.weighList
                  .orderType == '转入') {
                  if (this.weighList.hair == 0) {
                     this.isSkinWeigh = false;
                     this.temporaryWeighObj.hair = newV;
                  } else {
                     this.isSkinWeigh = true;
                     this.temporaryWeighObj.skin = newV;
                     this.getAverageSkin()
                     if (this.avgSkin < newV) {
                        this.abnormalModalShow = true
                        this.historyBtn = true
                     }
                     this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
                        2);
                     this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
@@ -374,14 +396,6 @@
               }
            }
         }
      },
      onShow() {
         this.init();
         this.changeisLogin(true)
         this.realTimeWeigh = 0
      },
      onHide() {

      },
      computed: {
         ...mapState(['globalweigh', 'globalinfraredStatus']),
@@ -413,7 +427,7 @@
         }
      },
      methods: {
         ...mapMutations(['changeweighHouseCode', 'changeisLogin']),
         ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh']),
         init() {
            uni.showLoading({
               title: "加载中"
@@ -447,7 +461,9 @@
                  uni.hideLoading()
                  this.$u.toast('加载失败')
               }
            });
            }).then(() => {
               this.getAverageSkin()
            })
         },
         /**
          * @确认称重等待后端提供实时称重接口，获取皮重，毛重
@@ -456,16 +472,25 @@
            if (this.isConfirmWeighLoading == false) {
               this.isConfirmWeighLoading = true;
               if (this.weighData.weigh != 0) {
                  if (this.weighList.orderType == '外销') {
                     if (this.weighList.skin ? (this.weighList.skin < this.realTimeWeigh ? true : false) : true) {
                  // 如果正在称皮
                  if (this.isSkinWeigh) {
                     // 如果第一次称重
                     if (this.isAbnormalAvgSkin) {
                        this.abnormalModalShow = false
                        this.saveWeigh();
                     } else {
                        this.$u.toast('毛重不能小于皮重');
                        this.isConfirmWeighLoading = false;
                        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
                        } else {
                           this.saveWeigh();
                        }
                     }
                  } else {
                     this.saveWeigh();
                  }

               } else {
                  this.$u.toast('未能获取地磅重量');
                  this.isConfirmWeighLoading = false;
@@ -488,6 +513,7 @@
                     }, 1000);
                  } else {
                     this.$u.toast('称重失败，请稍后重试');
                     this.isConfirmWeighLoading = false
                  }
               })
               .catch(err => {
@@ -502,7 +528,8 @@
               sceneId: this.weighData.sceneId,
               carNo: this.weighData.carNo,
               tmId: this.weighData.tmId,
               filedId: this.weighData.filedId
               filedId: this.weighData.filedId,
               equipmentCode: this.weighData.equipmentCode
            }, 'json').then(res => {
               if (res.code == 0) {
                  this.$u.toast('操作成功，即将返回上一页');
@@ -559,11 +586,15 @@
            uni.showLoading({
               title: "加载中"
            })
            this.$reqGet('getAvgSkin').then(res => {
            this.$reqGet('getAvgSkin', { xsUserId1: this.weighList.xsUserId1 }).then(res => {
               if (res.code === 0) {
                  uni.hideLoading()
                  this.avgSkin = res.data.avgSkin
                  this.tmTaskCoalList = res.data.tmTaskCoalList
                  /**
                   * @description true的话是不异常 false就是异常 没有历史，平均皮重为0是第一次正常 */
                  this.isAbnormalAvgSkin = (Array.isArray(this.tmTaskCoalList) && this
                     .tmTaskCoalList.length === 0 || !this.tmTaskCoalList) && this.avgSkin == 0
               } else {
                  uni.hideLoading()
                  this.$u.toast('加载失败')
@@ -572,29 +603,37 @@
         },
         abnormalCancel() {
            this.abnormalModalShow = false
            this.isConfirmWeighLoading = false;
         },
         // 提交异常原因
         abnormalConfirm() {
            uni.showLoading({
               title: "提交中"
            })
            this.$reqPost('tmAbnormalTextAdd', { tmId: this.weighData.tmId, abnormalText: this.abnormalContent },
               'params').then(
               res => {
                  if (res.code == 0) {
                     uni.hideLoading()
                     this.$u.toast('提交成功')
                     this.abnormalModalShow = false
                  } else {
                     uni.hideLoading()
                     this.$u.toast('提交失败')
                     this.abnormalModalShow = true
                  }
               })
         },
         displayHistory() {
            this.historyShow = true
            this.weighData.abnormalText = this.abnormalContent
            this.saveWeigh()
            // uni.showLoading({
            //    title: "提交中"
            // })
            // this.$reqPost('tmAbnormalTextAdd', { tmId: this.weighData.tmId, abnormalText: this.abnormalContent },
            //    'params').then(
            //    res => {
            //       if (res.code == 0) {
            //          uni.hideLoading()
            //          this.$u.toast('提交成功')
            //          this.abnormalModalShow = false
            //          this.isConfirmWeighLoading = false
            //          setTimeout(() => {
            //             uni.navigateBack({
            //                delta: 1
            //             });
            //          }, 1000);

         }
            //       } else {
            //          uni.hideLoading()
            //          this.$u.toast('提交失败')
            //          this.abnormalModalShow = true
            //          this.isConfirmWeighLoading = false
            //       }
            //    })
         },
      }
   };
</script>
@@ -616,6 +655,31 @@
      .slot-content {
         width: 96%;
         border: 1rpx solid rgb(220, 223, 230);
      }

      .table-title {
         width: 96%;
         @include flex;
         position: absolute;
         top: 8rpx;
         color: #9e9399;

         &_item {
            width: 33.3%;
            text-align: center;
         }

         .time {
            padding-left: 20rpx;
         }

         .coal-name {
            padding-left: 70rpx;
         }

         .skin {
            padding-left: 10rpx;
         }
      }

      .one {
@@ -816,7 +880,7 @@
      }

      .three {
         margin: 0 auto vww(20);
         margin: 0 auto vww(30);
         flex: 0.7;
         display: flex;
         color: #939393;
@@ -842,23 +906,43 @@
         transition: all 0.3s ease-out;
      }

      .history-utils {
         width: 96%;
         margin: vww(10) auto;
         @include flex;
         justify-content: space-around;

         &_item {
            width: 50%;
         }

         .btn {
            width: 180rpx;
         }
      }

      .history-skin {
         width: 96%;
         height: vww(300);
         margin: vww(50) auto;
         margin: auto;
         margin-top: vww(10);
         background: #ffffff;
         box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
         border-radius: 20rpx;
         overflow: scroll;
         color: #000;

         position: relative;

         .history-skin_item {
            width: 80%;
            width: 96%;
            height: vww(30);
            @include flex;
            margin: vww(10) auto;
            margin: vww(40) auto;

            .item {
               width: 33.3%;
               text-align: center;
            }

            .createTime {
               color: rgb(60, 156, 255);
@@ -866,7 +950,6 @@

            .skin {
               color: #f81414;
               @include flex;
               width: 180rpx;
               height: vww(30);
            }