修改bug

qingyiay

2023-04-21 fb4fa76b4c1a93c833cd97f97f41b6158ab1aef7

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

@@ -20,10 +20,13 @@
               </view> -->
            </view>
         </view>
         <view class="bottom" v-if="weighList.orderType == '内购' || weighList.orderType == '转出'">
         <view class="bottom" v-if="weighList.orderType == '外销' || weighList.orderType == '转出' || weighList.orderType == '外购'">
            <view>
               <view style="font-weight: 600;">原发信息</view>
               <text>皮重{{ primarySkin || '' }}毛重{{ primaryHair || '' }}净重{{ primaryClean || '' }}</text>
               <text v-if="weighList.orderType == '外购' && weighList.hair == 0">
                  毛重:{{ coalContactHair || '' }}皮重:{{ coalContactSkin || '' }}净重:{{ (Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2) || '' }}
               </text>
               <text v-else>毛重:{{ primaryHair || '' }}皮重:{{ primarySkin || '' }}净重:{{ primaryClean || '' }}</text>
            </view>
         </view>
         <view class="bottom"><text>TIP:当前状态为正常时可以称重</text></view>
@@ -41,12 +44,12 @@
      </view>
      <view class="three">
         <!-- 放空 -->
         <u-button type="primary" text="放空" plain @click="evacuation" throttleTime="500" :disabled="isEvacuation"></u-button>
         <u-button type="primary" text="放空" plain @click="evacuation" throttleTime="500" :disabled="!isEvacuation"></u-button>
         <!-- 外销订单称皮时，返回加减吨按钮置灰。称毛时可用.外购订单，不出现返回加减吨的按钮 -->
         <u-button
            type="primary"
            text="确定称重"
            :disabled="realTimeWeigh == 0 || globalinfraredStatus"
            :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh"
            :loading="isConfirmWeighLoading"
            loadingText="确认"
            @click="confirmWeigh"
@@ -64,6 +67,27 @@
            @confirm="evacuationConfirm"
            @cancel="evacuationCancel"
         ></u-modal>
      </view>
      <!-- 外购类型手动输入弹窗 -->
      <view class="">
         <u-modal :show="firstHairCustomernameShow" title="填写原发重量" @confirm="OutsourcingConfirm">
            <view class="">
               <text>毛重:</text>
               <view class=""><u--input placeholder="请输入毛重" v-model="coalContactHair" type="digit"></u--input></view>
               <text>皮重:</text>
               <view class=""><u--input placeholder="请输入皮重" v-model="coalContactSkin" type="digit"></u--input></view>
            </view>
         </u-modal>
      </view>
      <!-- 手动输入之后的二次弹窗 -->
      <view class="secondary-confirmation">
         <u-modal :show="secondConfirmShow" title="请确认原发重量" :showCancelButton="true" @confirm="secondConfirm" @cancel="secondCancel">
            <view class="secondary-confirmation__main">
               <view class="secondary-child">毛重:{{ coalContactHair }}</view>
               <view class="secondary-child">皮重:{{ coalContactSkin }}</view>
               <view class="secondary-child">净重:{{ (Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2) }}</view>
            </view>
         </u-modal>
      </view>
   </view>
</template>
@@ -97,24 +121,16 @@
            equipmentCode: '',
            weigh: 0,
            tmCode: '',
            sceneInOut: ''
            sceneInOut: '',
            coalContactClean: 0,
            coalContactHair: 0,
            coalContactSkin: 0
         },
         takeCoalId: null,
         weighHouseCode: '',
         isConfirmWeighLoading: false, //确定称重按钮
         realTimeWeigh: '',
         weighList: {},
         webSocket: null, // webSocket实例
         // lockReconnect: false, // 重连锁，避免多次重连
         // maxReconnect: 6, // 最大重连次数， -1 标识无限重连
         // reconnectTime: 0, // 重连尝试次数
         // heartbeat: {
         //    interval: 30 * 1000, // 心跳间隔时间
         //    timeout: 10 * 1000, // 响应超时时间
         //    pingTimeoutObj: null, // 延时发送心跳的定时器
         //    pongTimeoutObj: null, // 接收心跳响应的定时器
         //    pingMessage: JSON.stringify({ type: 'ping' }) // 心跳请求信息
         // }
         // 临时称重对象
         temporaryWeighObj: {
            skin: 0,
@@ -129,7 +145,15 @@
         // 获取原发信息
         primarySkin: null,
         primaryHair: null,
         primaryClean: null
         primaryClean: null,
         // 判断称重按钮是否可用
         isweigh: false,
         // 外购类型称重出现弹窗填写毛，皮，
         firstHairCustomernameShow: false,
         coalContactHair: '',
         coalContactSkin: '',
         // 二次确认
         secondConfirmShow: false
      };
   },
   watch: {
@@ -142,6 +166,7 @@
               // this.temporaryWeighObj.hair = this.realTimeWeigh;
               this.temporaryWeighObj.hair = newV;
               this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(2);
               this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus;
            }
         } else if (this.weighList.orderType == '外购' || this.weighList.orderType == '内购' || this.weighList.orderType == '转入') {
            if (this.weighList.hair == 0) {
@@ -151,6 +176,7 @@
               // this.temporaryWeighObj.skin = this.realTimeWeigh;
               this.temporaryWeighObj.skin = newV;
               this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(2);
               this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus;
            }
         }
      },
@@ -160,7 +186,6 @@
            this.weighData.weigh = this.realTimeWeigh = v;
            console.log(this.realTimeWeigh, '真实重量改变了');
         },
         immediate: true,
         deep: true
      }
   },
@@ -185,10 +210,11 @@
      },
      // 是否放空按钮禁用
      isEvacuation() {
         if (this.weighList.hair == this.weighList.skin || this.temporaryWeighObj.skin == this.temporaryWeighObj.hair) {
            return false;
         } else {
            return true;
         if (this.weighList.orderType == '外销' || this.weighList.orderType == '内销' || this.weighList.orderType == '转出') {
            return this.weighList.skin == this.temporaryWeighObj.hair || this.temporaryWeighObj.skin == this.temporaryWeighObj.hair;
         }
         if (this.weighList.orderType == '外购' || this.weighList.orderType == '内购' || this.weighList.orderType == '转入') {
            return this.weighList.hair == this.temporaryWeighObj.skin || this.temporaryWeighObj.skin == this.temporaryWeighObj.hair;
         }
      }
   },
@@ -204,8 +230,31 @@
               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.firstHairCustomernameShow = true;
               }
            }
         });
      },
      // 外购类型输入点击确认之后二次确认
      OutsourcingConfirm() {
         this.weighData.coalContactSkin = Number(this.coalContactSkin);
         this.weighData.coalContactHair = Number(this.coalContactHair);
         this.weighData.coalContactClean = Number((Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2));
         if (Number(this.coalContactSkin) == 0 || Number(this.coalContactHair) == 0) {
            this.$u.toast('重量不能为0,请重新填写');
         } else {
            this.secondConfirmShow = true;
         }
      },
      // 二次确认弹窗 点击确定
      secondConfirm() {
         this.secondConfirmShow = false;
         this.firstHairCustomernameShow = false;
      },
      // 二次弹窗点击取消
      secondCancel() {
         this.secondConfirmShow = false;
      },
      /**
       * @确认称重等待后端提供实时称重接口，获取皮重，毛重
@@ -316,7 +365,13 @@
      evacuationConfirm() {
         this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
            console.log(res, '第二次放空');
            this.evacuationModalShow = false;
            if (res.code == 0) {
               this.$u.toast('操作成功');
               this.evacuationModalShow = false;
            } else {
               this.$u.toast(res.msg ? res.msg : '操作失败');
               this.evacuationModalShow = true;
            }
         });
      },
      // 放空弹窗取消
@@ -396,4 +451,14 @@
      flex: 0.5;
   }
}
.secondary-confirmation__main {
   display: flex;
   flex-direction: column;
   justify-content: space-between;
   align-items: center;
   .secondary-child {
      display: flex;
      justify-content: space-between;
   }
}
</style>