称重异常判断逻辑修改

qingyiay

2023-08-16 3dd852a77ff1fcb8c4c0ceb3a8df727c15ae643e

称重异常判断逻辑修改

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

@@ -3,7 +3,8 @@
    <view class="punchTheClock">
        <!-- 打卡按钮 -->
        <view class="punchTheClock_container">
            <view class="punchTheClock_btn" @click="arrive">
            <view class="punchTheClock_btn"
                @click="arrive">
                <view>
                    <p>{{ coalStatus == 2 ? '已签到' : '签到/打卡' }}</p>
                    <p>{{ nowTime }}</p>
@@ -35,7 +36,7 @@
            }
        };
    },
    onShow() {
        onLoad() {
        this.getSetting(); //获取授权
        this.getFuzzyLocation(); //获取位置
        this.todayDate(); //当前时间
@@ -86,8 +87,7 @@
                    if (res.code == 0) {
                        this.$u.toast('签到成功');
                        setTimeout(() => {
                            uni.navigateBack(
                                {
                                uni.navigateBack({
                                    delta: 1
                                },
                                500
@@ -105,12 +105,14 @@
};
</script>

<style lang="scss" scoped>
<style lang="scss"
    scoped>
.punchTheClock {
    height: 100vh;
    display: flex;
    justify-content: center;
    align-items: center;

    .punchTheClock_container {
        .punchTheClock_btn {
            width: vww(240);
@@ -122,15 +124,18 @@
            display: flex;
            justify-content: center;
            align-items: center;

            p {
                text-align: center;
            }
        }

        .punchTheClock_text {
            display: flex;
            justify-content: center;
            margin-top: vww(20);
            color: #b8b8b8;

            .text {
                margin-left: vww(5);
            }

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

@@ -219,7 +219,8 @@
                :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || !isInputOrigin"
                :loading="isConfirmWeighLoading"
                loadingText="确认"
                @click="confirmWeigh"></u-button>
                @click="confirmWeigh"
                throttleTime="800"></u-button>
            <u-button type="primary"
                text="返回加减吨"
                :disabled="addAndSubtractCoalDisabled"
@@ -345,6 +346,7 @@
                // 皮重异常相关
                abnormalContent: '',
                avgSkin: '', // 平均皮重
                isAbnormalAvgSkin: true, //平均皮重是否异常
                tmTaskCoalList: [],
                abnormalModalShow: false,
                historyBtn: false,
@@ -470,28 +472,25 @@
                if (this.isConfirmWeighLoading == false) {
                    this.isConfirmWeighLoading = true;
                    if (this.weighData.weigh != 0) {
                        // 如果正在称皮
                        if (this.isSkinWeigh) {
                            let xx = new BigNumber(this.avgSkin)
                            let yy = new BigNumber(this.globalweigh)
                            if (xx.minus(yy).toNumber() > 0.2) {
                                this.abnormalModalShow = true
                            } else {
                            // 如果第一次称重
                            if (this.isAbnormalAvgSkin) {
                                this.abnormalModalShow = false
                                this.saveWeigh();
                            } else {
                                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();
                        }
                        // if (this.weighList.orderType == '外销') {
                        //     if (this.weighList.skin ? (this.weighList.skin < this.realTimeWeigh ? true : false) : true) {
                        //         this.saveWeigh();
                        //     } else {
                        //         this.$u.toast('毛重不能小于皮重');
                        //         this.isConfirmWeighLoading = false;
                        //     }
                        // } else {
                        //     this.saveWeigh();
                        // }

                    } else {
                        this.$u.toast('未能获取地磅重量');
                        this.isConfirmWeighLoading = false;
@@ -514,6 +513,7 @@
                            }, 1000);
                        } else {
                            this.$u.toast('称重失败，请稍后重试');
                            this.isConfirmWeighLoading = false
                        }
                    })
                    .catch(err => {
@@ -590,13 +590,10 @@
                        uni.hideLoading()
                        this.avgSkin = res.data.avgSkin
                        this.tmTaskCoalList = res.data.tmTaskCoalList
                        // let xx = new BigNumber(this.avgSkin)
                        // let yy = new BigNumber(weigh)
                        // console.log(weigh, this.avgSkin, yy.minus(xx).toNumber());
                        // if (xx.minus(yy).toNumber() <= 0.2) {
                        //     this.abnormalModalShow = true
                        //     this.historyBtn = true
                        // }
                        /**
                         * @description true的话是不异常 false就是异常 没有历史，平均皮重为0是第一次正常 */
                        this.isAbnormalAvgSkin = (Array.isArray(this.tmTaskCoalList.length === 0) && this
                            .tmTaskCoalList.length === 0 || !this.tmTaskCoalList) && this.avgSkin == 0
                    } else {
                        uni.hideLoading()
                        this.$u.toast('加载失败')
@@ -609,30 +606,32 @@
            },
            // 提交异常原因
            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
                            this.isConfirmWeighLoading = false
                            setTimeout(() => {
                                uni.navigateBack({
                                    delta: 1
                                });
                            }, 1000);
                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
                        }
                    })
                //         } else {
                //             uni.hideLoading()
                //             this.$u.toast('提交失败')
                //             this.abnormalModalShow = true
                //             this.isConfirmWeighLoading = false
                //         }
                //     })
            },
        }
    };