修改部分错误，增加新功能

qingyiay

2023-05-17 af436aa050f76584cd5cb88e413e45cd08c15d50

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

@@ -34,26 +34,44 @@
         </view> -->
         <view class="bottom"><text>TIP:当前状态为正常时可以称重</text></view>
      </view>
      <view class="middle-block">
      <view class="middle-block" v-if="firstHairCustomernameShow || sideline">
         <view class="block-main" v-if="firstHairCustomernameShow">
            <view class="first-line"><combined-title title="原发信息"></combined-title></view>
            <view class="second-line">
               <view class="label-text">皮重</view>
               <view class="input-container"><u--input placeholder="请输入皮重" border="surround" v-model="weighData.coalContactSkin"></u--input></view>
               <view class="unit">吨</view>
               <view class="label-text" :class="{ focusClass: isfocus1 }">皮重</view>
               <view class="input-container" :class="{ inputClass: isfocus1, disabledClass: isInputOrigin }">
                  <u--input
                     placeholder="请输入皮重"
                     border="surround"
                     v-model="weighData.coalContactSkin"
                     @focus="inputFocus(1)"
                     @blur="inputBlur"
                     :disabled="isInputOrigin"
                  ></u--input>
               </view>
               <view class="unit" :class="{ focusClass: isfocus1 }">吨</view>
            </view>
            <view class="second-line">
               <view class="label-text">毛重</view>
               <view class="input-container"><u--input placeholder="请输入毛重" border="surround" v-model="weighData.coalContactHair"></u--input></view>
               <view class="unit">吨</view>
               <view class="label-text" :class="{ focusClass: isfocus2 }">毛重</view>
               <view class="input-container" :class="{ inputClass: isfocus2, disabledClass: isInputOrigin }">
                  <u--input
                     placeholder="请输入毛重"
                     border="surround"
                     v-model="weighData.coalContactHair"
                     @focus="inputFocus(2)"
                     @blur="inputBlur"
                     :disabled="isInputOrigin"
                  ></u--input>
               </view>
               <view class="unit" :class="{ focusClass: isfocus2 }">吨</view>
            </view>
            <view class="second-line">
               <view class="label-text">净重</view>
               <view class="input-container"><u--input placeholder="请输入净重" border="surround" v-model="coalContactClean"></u--input></view>
               <view class="input-container"><u--input placeholder="净重" border="surround" v-model="coalContactClean" :disabled="isInputOrigin"></u--input></view>
               <view class="unit">吨</view>
            </view>
         </view>
         <view class="block-sideline" v-else>
         <view class="block-sideline" v-if="sideline">
            <view class="first-line"><combined-title title="原发信息"></combined-title></view>
            <view class="weigh-item">
               <view class="item">
@@ -71,6 +89,7 @@
            </view>
         </view>
      </view>
      <view v-else style="width: 100%;height: 40rpx;"></view>
      <view class="bottom-block">
         <view class="block-main">
            <view class="main-information">
@@ -114,14 +133,14 @@
         <u-button
            type="primary"
            text="确定称重"
            :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh"
            :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || isInputOrigin"
            :loading="isConfirmWeighLoading"
            loadingText="确认"
            @click="confirmWeigh"
         ></u-button>
         <u-button type="primary" text="返回加减吨" :disabled="addAndSubtractCoalDisabled" @click="addAndSubtractCoal" class="jiajian"></u-button>
         <u-button type="primary" text="返回加减吨" :disabled="addAndSubtractCoalDisabled" @click="addAndSubtractCoal" class="jiajian" v-if="outBuy"></u-button>
      </view>
      <view class="four" v-if="weighList.orderType !== '外购'">如您需要调整装载货品吨数，请点击返回加减吨</view>
      <!-- <view class="four" v-if="weighList.orderType !== '外购'">如您需要调整装载货品吨数，请点击返回加减吨</view> -->
      <!-- 放空弹窗 -->
      <view class="evacuationModal">
         <u-modal
@@ -174,6 +193,8 @@
            coalContactHair: 0,
            coalContactSkin: 0
         },
         // 是否填写原发信息
         isInputOrigin: false,
         takeCoalId: null,
         weighHouseCode: '',
         isConfirmWeighLoading: false, //确定称重按钮
@@ -199,8 +220,12 @@
         // 外购类型称重填写毛，皮，
         firstHairCustomernameShow: false,
         coalContactHair: '',
         coalContactSkin: ''
         // 二次确认
         coalContactSkin: '',
         // 聚焦时改变样式
         isfocus1: false,
         isfocus2: false,
         // 外购第一次称毛重不需要加减吨
         outBuy: true
      };
   },
   watch: {
@@ -254,13 +279,14 @@
      },
      // 加减煤按钮禁用与否
      addAndSubtractCoalDisabled() {
         if (this.weighList.orderType == '外销' || this.weighList.orderType == '内销' || this.weighList.orderType == '转出') {
            if (this.weighList.hair == 0) {
               return true;
            } else if (this.weighList.hair != 0) {
               return false;
            }
         }
         return this.realTimeWeigh == 0;
         // if (this.weighList.orderType == '外销' || this.weighList.orderType == '内销' || this.weighList.orderType == '转出') {
         //    if (this.weighList.hair == 0) {
         //       return true;
         //    } else if (this.weighList.hair != 0) {
         //       return false;
         //    }
         // }
      },
      // 是否放空按钮禁用
      isEvacuation() {
@@ -270,6 +296,9 @@
         if (this.weighList.orderType == '外购' || this.weighList.orderType == '内购' || this.weighList.orderType == '转入') {
            return this.weighList.hair == this.temporaryWeighObj.skin || this.temporaryWeighObj.skin == this.temporaryWeighObj.hair;
         }
      },
      sideline() {
         return this.weighList.orderType == '内购' || this.weighList.orderType == '转入';
      }
   },
   methods: {
@@ -284,8 +313,20 @@
               this.weighData.tmId = res.data.id;
               this.weighData.carNo = res.data.carNo;
               this.weighData.tmCode = res.data.code;
               if (this.weighList.orderType == '外购' && this.weighList.hair == 0) {
               this.weighData.filedId = res.data.filedId;
               this.weighData.coalContactHair = res.data.hairTwo ? res.data.hairTwo : 0;
               this.weighData.coalContactSkin = res.data.skinTwo ? res.data.skinTwo : 0;
               if (this.weighList.orderType == '外购') {
                  this.firstHairCustomernameShow = true;
                  if (this.weighList.hair == 0) {
                     this.outBuy = false;
                  }
               }
               if (this.weighData.coalContactHair > 0 && this.weighData.coalContactSkin > 0) {
                  this.isInputOrigin = true;
                  if (this.isInputOrigin) {
                     this.$u.toast('信息已填写');
                  }
               }
            }
         });
@@ -351,47 +392,6 @@
            }
         });
      },
      /**
       * 初始化 weoSocket
       */
      // initWebSocket() {
      //    let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`;
      //    let socket = uni.connectSocket({
      //       url: wsUrl,
      //       header: {
      //          CLIENT_TOC: 'Y'
      //       },
      //       complete: res => {
      //          console.log(res, 'socket结果');
      //       }
      //    });
      //    socket.onOpen(() => {
      //       console.log('onOpen');
      //    });
      //    // 获取服务器传来的数据，做相应处理
      //    socket.onMessage(res => {
      //       console.log('socketWeigh', res);
      //       let nowWeighObj = JSON.parse(res.data.slice(7));
      //       if (nowWeighObj.eqCode == this.weighHouseCode) {
      //          if (nowWeighObj.eqInfraredStatus) {
      //             this.infraredStatus = true;
      //             this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
      //          } else {
      //             this.infraredStatus = false;
      //             this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
      //          }
      //       }
      //    });
      //    socket.onClose(() => {
      //       uni.closeSocket();
      //       console.log('webSocketClose');
      //       this.$u.toast('磅房已关闭');
      //    });
      //    socket.onError(err => {
      //       console.log('socket报错', err);
      //       this.$u.toast('磅房暂时不能使用，请重新进入该页面，重试！！');
      //    });
      // },
      // 放空
      evacuation() {
         this.evacuationModalShow = true;
@@ -412,6 +412,19 @@
      // 放空弹窗取消
      evacuationCancel() {
         this.evacuationModalShow = false;
      },
      // input聚焦
      inputFocus(v) {
         if (v == 1) {
            this.isfocus1 = true;
         } else {
            this.isfocus2 = true;
         }
      },
      // input失焦
      inputBlur() {
         this.isfocus1 = false;
         this.isfocus2 = false;
      }
   }
};
@@ -443,11 +456,13 @@
            align-items: center;
            justify-content: center;
            font-size: 74rpx;
            font-family: Determination Sans;
            font-weight: 400;
            color: #ffffff;
            line-height: 69rpx;
            text-shadow: 0rpx 3rpx 14rpx rgba(0, 0, 0, 0.33);
            text {
               font-family: weighting;
            }
         }
         .top_right {
            display: flex;
@@ -455,7 +470,6 @@
            justify-content: center;
            flex: 2;
            font-size: 31rpx;
            font-family: Microsoft YaHei;
            font-weight: 300;
            color: #ffffff;
            view {
@@ -472,11 +486,8 @@
         align-items: center;
         flex-direction: column;
         font-size: 28rpx;
         font-family: Microsoft YaHei;
         font-weight: 300;
         color: #d9e1fe;
         // position: relative;
         // top: vww(-10);
      }
   }
   .middle-block {
@@ -486,17 +497,31 @@
      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;
      @include flex justify-content: center;
      @include flex;
      justify-content: center;
      overflow: hidden;
      .block-main {
         width: 650rpx;
         height: 350rpx;
         @include flex flex-direction: column;
         @include flex;
         flex-direction: column;
         margin-bottom: vww(20);
         position: relative;
         .first-line,
         .second-line {
            width: 90%;
            height: vww(44);
            .focusClass {
               color: #5b95fd;
            }
            .inputClass {
               border: 1px solid rgba(73, 95, 252, 0.6) !important;
               box-shadow: 0rpx 5rpx 13rpx 0rpx rgba(73, 95, 252, 0.6) !important;
               border-radius: 12rpx !important;
            }
            .isInputOrigin {
               background-color: #f4f4fc;
            }
            .input-container {
               border: 2px solid #c5c5c5;
               box-shadow: 0rpx 5rpx 13rpx 0rpx #c5c5c5;
@@ -505,6 +530,8 @@
         }
         .first-line {
            @include flex;
            position: relative;
            top: vww(8);
         }
         .second-line {
            @include flex;
@@ -523,10 +550,9 @@
            height: vww(36);
            @include flex justify-content: space-around;
            .item {
               width: vww(50);
               min-width: vww(50);
               height: vww(45);
               font-size: 21rpx;
               font-family: Microsoft YaHei;
               font-weight: 400;
               color: #ffffff;
               text-align: center;
@@ -538,7 +564,6 @@
               }
               .num {
                  font-size: 40rpx;
                  font-family: Microsoft YaHei;
                  font-weight: 300;
                  color: #303030;
               }
@@ -547,65 +572,43 @@
      }
   }
   .bottom-block {
      width: 690rpx;
      width: calc(100% - 60rpx);
      box-sizing: border-box;
      height: 630rpx;
      margin: 0 vww(15) vww(45) vww(15);
      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;
      @include flex justify-content: center;
      @include flex;
      justify-content: center;
      overflow: hidden;
      .block-main {
         width: 94%;
         height: 565rpx;
         margin-top: vww(22);
         margin-top: vww(10);
         @include flex;
         justify-content: space-around;
         align-items: flex-start;
         flex-direction: column;
         overflow: hidden;
         .main-information {
            width: 50%;
            width: 100%;
            height: 28rpx;
            font-size: 28rpx;
            font-family: Microsoft YaHei;
            font-weight: 300;
            color: #303030;
            @include flex;
         }
      }
   }
   .two {
      flex: 4;
      border: vww(2) solid #dddddd;
      margin: vww(20);
      border-radius: vww(10);
      padding: vww(20);
      .uni-table {
         .uni-table-tr {
            padding: 0;
            border: vww(1) solid #c6c6c6;
            .uni-table-th {
               font-size: vww(14);
               height: vww(30);
               line-height: vww(30);
               padding: vww(5) vww(10);
               color: #111111;
               font-weight: 500;
               background: #e2e2e2;
            justify-content: flex-start;
            overflow: hidden;
            .prefix {
               min-width: vww(60);
            }
            .uni-table-td {
               font-size: vww(14);
               font-weight: 400;
               height: vww(30);
               line-height: vww(30);
               padding: vww(5) vww(10);
               color: #111111;
            .suffix {
               flex: 1;
               margin-left: vww(12);
               text-align: left;
            }
         }
      }
      p {
         text-align: center;
         font-size: vww(20);
         font-weight: 500;
         margin-top: vww(5);
      }
   }
   .three {
@@ -623,8 +626,9 @@
      }
   }
   .four {
      margin: vww(10) auto;
      flex: 0.5;
      width: 100%;
      margin-top: vww(5);
      text-align: center;
   }
}
.secondary-confirmation__main {