称重逻辑简化，提高可读性

qingyiay

2023-07-02 8c4dd05b10fcaeb94c09613699aab923318a1c6d

称重逻辑简化，提高可读性

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

@@ -141,7 +141,10 @@
                        this.coalDetailsData = res.data;
                        this.showWeigh = this.coalDetailsData.tmTaskCoalItems ? this.coalDetailsData
                            .tmTaskCoalItems : [],
                            uni.hideLoading()
                            this.showWeigh.forEach(v => {
                                v.discount = null
                            })
                        uni.hideLoading()
                    } else {
                        this.$u.toast('加载失败')
                        uni.hideLoading()
@@ -219,7 +222,6 @@
                this.actionShow = false
            },
            selectClick(val) {
                console.log(this.showWeigh);
                this.showWeigh[this.actionIndex].productName = val.productName
                this.showWeigh[this.actionIndex].productId = val.id
            },

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

@@ -70,19 +70,19 @@
                <view class="main-information">
                    <view class="prefix">皮重:</view>
                    <view class="suffix">
                        {{temporaryWeighObj.skin||''}}
                        {{currentSkin}}
                    </view>
                </view>
                <view class="main-information">
                    <view class="prefix">毛重:</view>
                    <view class="suffix">
                        {{temporaryWeighObj.hair?temporaryWeighObj.hair:showWeigh.skin?(showWeigh.skin||''):(showWeigh.hair||'')}}
                        {{currentHair}}
                    </view>
                </view>
                <view class="main-information">
                    <view class="prefix">净重:</view>
                    <view class="suffix">
                        {{ temporaryWeighObj.clean||''}}
                        {{ currentClean}}
                    </view>
                </view>
                <view class="main-information">
@@ -257,9 +257,8 @@
                        this.temporaryWeighObj.skin = newV;
                    } else {
                        this.temporaryWeighObj.hair = newV;
                        this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.showWeigh.skin).toFixed(2);
                        this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this.temporaryWeighObj
                            .clean < 0;
                        this.isweigh = Number(this.currentClean) > this.weighList.orderSurplus || Number(this
                            .currentClean) < 0;
                    }
                } else if (this.weighList.orderType == '外购' || this.weighList.orderType == '内购' || this.weighList
                    .orderType == '转入') {
@@ -267,8 +266,7 @@
                        this.temporaryWeighObj.hair = newV;
                    } else {
                        this.temporaryWeighObj.skin = newV;
                        this.temporaryWeighObj.clean = (this.showWeigh.skin - newV).toFixed(2);
                        this.isweigh = this.temporaryWeighObj.clean < 0 || this.showWeigh.skin < newV && this.showWeigh
                        this.isweigh = Number(this.currentClean) < 0 || this.showWeigh.skin < newV && this.showWeigh
                            .skin > 0;
                    }
                }
@@ -286,9 +284,6 @@
        },
        computed: {
            ...mapState(['globalweigh', 'globalinfraredStatus']),
            // coalContactClean() {
            //     return (Number(this.weighData.coalContactHair) - Number(this.weighData.coalContactSkin)).toFixed(2);
            // },
            token() {
                return uni.getStorageSync('token');
            },
@@ -309,15 +304,24 @@
                        .temporaryWeighObj.hair;
                }
            },
            sideline() {
                return this.weighList.orderType == '内购' || this.weighList.orderType == '转入';
            },

            showWeigh() {
                return this.weighList.tmTaskCoalItems ? (this.weighList.tmTaskCoalItems[0] ? this
                    .weighList.tmTaskCoalItems[0] : {}) : {}
            },
            // 称重历史
            weighHistory() {
                return this.weighList.tmTaskCoalItems ? this.weighList.tmTaskCoalItems : []
            },
            currentHair() {
                return this.temporaryWeighObj.hair ? this.temporaryWeighObj.hair : this.showWeigh.skin ? (this.showWeigh
                    .skin || 0) : (this.showWeigh.hair || 0)
            },
            currentSkin() {
                return this.temporaryWeighObj.skin || 0
            },
            currentClean() {
                return (this.currentHair - this.currentSkin).toFixed(2)
            }
        },
        methods: {