增加销类型称重判断逻辑

qingyiay

2023-07-17 17427143356e8a410552cb44120a02eb6eb35540

增加销类型称重判断逻辑

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

@@ -5,15 +5,15 @@
        </view>
        <view class="top-information">
            <view class="cutomer-name"
                v-if="orderType == '转入' || orderType == '转出'">煤场:{{ coalDetailsData.toFiledName || '' }}</view>
                v-if="orderType == '转入' || orderType == '转出'">仓库:{{ coalDetailsData.toFiledName || '' }}</view>
            <view class="cutomer-name"
                v-else>客户:{{ coalDetailsData.customerName || '' }}</view>
            <view class="fild-name">
                <view class="">矿场:{{ coalDetailsData.deptName || '暂无' }}</view>
                <view class="">基地:{{ coalDetailsData.deptName || '暂无' }}</view>
                <view class=""
                    v-if="orderType == '转入' || orderType == '转出'">煤场:{{ coalDetailsData.filedName || '' }}</view>
                    v-if="orderType == '转入' || orderType == '转出'">仓库:{{ coalDetailsData.filedName || '' }}</view>
                <view class=""
                    v-else>煤场:{{ coalDetailsData.filedName || '暂无' }}</view>
                    v-else>仓库:{{ coalDetailsData.filedName || '暂无' }}</view>
            </view>
        </view>
        <view class="block-information">

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

@@ -85,23 +85,16 @@
                        {{ currentClean}}
                    </view>
                </view>
                <view class="main-information">
                <!-- <view class="main-information">
                    <view class="prefix">订单余量:</view>
                    <view class="suffix">{{ weighList.orderSurplus || 0 }}</view>
                </view>
                </view> -->
            </view>
        </view>
        <!--  称重历史-->
        <weigh-item :list="weighHistory"></weigh-item>
        <view class="three">
            <!-- 放空 -->
            <u-button type="primary"
                text="放空"
                plain
                @click="evacuation"
                throttleTime="500"
                :disabled="!isEvacuation"></u-button>
            <!-- 外销订单称皮时，返回加减吨按钮置灰。称毛时可用.外购订单，不出现返回加减吨的按钮 -->
            <!-- .外购订单，不出现返回加减吨的按钮 -->
            <u-button type="primary"
                text="确定称重"
                :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||globalWarning"
@@ -121,6 +114,14 @@
                loadingText="确认"
                :disabled="isweigh||realTimeWeigh == 0"
                v-if='canUnload'></u-button>
            <!-- 放空 -->
            <u-button type="primary"
                text="放空"
                plain
                @click="evacuation"
                throttleTime="500"
                :disabled="!isEvacuation"></u-button>

        </view>
        <!-- 放空弹窗 -->
        <view class="evacuationModal">
@@ -233,8 +234,7 @@
                            this.temporaryWeighObj.skin = newV;
                        } else {
                            this.temporaryWeighObj.hair = newV;
                            this.isweigh = Number(this.currentClean) > this.weighList.orderSurplus || Number(this
                                .currentClean) < 0;
                            this.isweigh = Number(this.currentClean) < 0;
                        }
                    } else if (this.weighList.orderType == '外购' || this.weighList.orderType == '内购' || this.weighList
                        .orderType == '转入') {
@@ -287,11 +287,15 @@
                return this.weighList.tmTaskCoalItems ? this.weighList.tmTaskCoalItems : []
            },
            currentHair() {
                if (this.weighList.orderType == '外销' || this.weighList.orderType == '内销' || this.weighList.orderType ==
                    '转出') {
                    return this.temporaryWeighObj.hair ? this.temporaryWeighObj.hair : ''
                }
                return this.temporaryWeighObj.hair ? this.temporaryWeighObj.hair : this.showWeigh.skin ? (this.showWeigh
                    .skin || '') : (this.showWeigh.hair || '')
            },
            currentSkin() {
                return this.temporaryWeighObj.skin || ''
                return this.temporaryWeighObj.skin ? this.temporaryWeighObj.skin : (this.showWeigh.skin || '')
            },
            currentClean() {
                if (!this.currentSkin) return ''
@@ -299,7 +303,8 @@
                    .orderType == '转入') {
                    return (this.currentHair - this.currentSkin).toFixed(2)
                } else {
                    return !this.showWeigh.skin ? this.currentSkin : (this.currentHair - this.currentSkin).toFixed(2)
                    return !this.showWeigh.skin ? this.currentSkin : (this.currentHair - this.currentSkin) > 0 ? (this
                        .currentHair - this.currentSkin).toFixed(2) : ''
                }

            }
@@ -744,15 +749,16 @@

        .three {
            margin: 0 auto vww(5);
            margin-bottom: vww(60);
            width: 96%;
            display: grid;
            grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
            grid-template-columns: repeat(auto-fit, minmax(140rpx, 1fr));
            justify-content: center;
            gap: vww(10);
            color: #939393;

            .u-button {
                width: vww(90);
                width: vww(70);
            }
        }


 pages/driver-page/drvier-my/drvier-my.vue

@@ -495,16 +495,19 @@
                });
                this.$reqGet('getUserEntity').then(res => {
                    uni.hideLoading();
                    this.userInfo = res.data;
                    this.editUserInfo = this.userInfo = res.data;
                    this.editUserInfo.password = ""
                    uni.setStorageSync('carImg', this.userInfo.carImg);
                    uni.setStorageSync('drivingImg', this.userInfo.drivingImg);
                    uni.setStorageSync('bodyofcarJpg', this.userInfo.bodyofcarJpg)
                    if (this.fileList1.length == 0) {

                        this.fileList1.push({
                            url: `${BaseUrl}${this.userInfo.carImg}`
                        });
                        })
                    }
                    if (this.fileList2.length == 0) {
                        if (!this.userInfo.drivingImg) return
                        this.fileList2.push({
                            url: `${BaseUrl}${this.userInfo.drivingImg}`
                        });
@@ -524,12 +527,6 @@
                            });
                        }
                    }
                    Object.keys(this.editUserInfo).map(item => {
                        if (res.data[item]) {
                            this.editUserInfo[item] = res.data[item];
                            this.editUserInfo.password = ''
                        }
                    });
                });
            },
            // 修改按钮点击

 store/index.js

@@ -262,7 +262,7 @@
                })
                commit('changereconnectNum', 1)
                dispatch('reconnect')
            } else if (state.connectNum > 6 && state.globalisLogin) {
            } else if (state.connectNum >= 6 && state.globalisLogin) {
                commit('changereconnectNum', 1)
                uni.showToast({
                    title: '网络异常,请稍后重试',