确定装卸逻辑修改 增加称重时稳定态

qingyiay

2023-10-11 96db936c641b23897636ff6a15e31f8f87964342

确定装卸逻辑修改 增加称重时稳定态

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

@@ -175,13 +175,13 @@
                        :disabled="correctStatus>= 3"></u-button>
                </view>
                <view class="bottom-button">
                    <u-button text="放空"
                    <!-- <u-button text="放空"
                        type="primary"
                        plain
                        @click="evacuation"
                        throttleTime="500"
                        shape="circle"
                        :disabled="isEvacuation || isapproach"></u-button>
                        :disabled="isEvacuation || isapproach"></u-button> -->
                    <u-button text="呼叫客服"
                        type="primary"
                        plain
@@ -1207,8 +1207,7 @@
                width: 100%;
                margin: 0 auto;

                .top-button,
                .bottom-button {
                .top-button {
                    width: 100%;
                    height: vww(47);
                    @include flex;
@@ -1222,6 +1221,23 @@
                        border: 2px solid #3b56eb;
                    }
                }

                .bottom-button {
                    width: 40%;
                    height: vww(47);
                    padding-left: vww(18);
                    @include flex;
                    justify-content: flex-start;

                    .u-button {
                        width: 100%;
                        height: 60rpx;
                        font-size: 28rpx;
                        font-weight: 300;
                        color: #497bfb;
                        border: 2px solid #3b56eb;
                    }
                }
            }
        }


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

@@ -194,7 +194,7 @@
            <!-- 外销订单称皮时，返回加减吨按钮置灰。称毛时可用.外购订单，不出现返回加减吨的按钮 -->
            <u-button type="primary"
                text="确定称重"
                :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||!mergeState"
                :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||!mergeState||globalWarning"
                :loading="isConfirmWeighLoading"
                loadingText="确认"
                @click="confirmWeigh"
@@ -453,7 +453,7 @@
        },
        computed: {
            ...mapState(['globalweigh', 'globalinfraredStatus', 'globalisconnect', 'globalisUploadimg', 'globalisLogin',
                'is_open_socket', 'socketTask', 'confirmWeighVisiable', 'confirmWeighContent'
                'is_open_socket', 'socketTask', 'confirmWeighVisiable', 'confirmWeighContent', 'globalWarning'
            ]),
            coalContactClean() {
                let xx = BigNumber(this.weighData.coalContactHair)

 pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue

@@ -49,6 +49,10 @@
                        <view class="info code">
                            订单编号:{{item.code}}
                        </view>
                        <view class="info confirmPeople"
                            v-if="item.confirmPeople">
                            审核人:{{item.confirmPeople}}
                        </view>
                    </view>
                </view>
                <view class="confirm-button">
@@ -59,7 +63,7 @@
                        @click.stop="loadOrder(item.id)"
                        :loading="loading"
                        loadingText="确认"
                        v-if='!item.ableDischar'></u-button>
                        v-if='!item.ableDischar&&item.isContainLoginUser'></u-button>
                </view>
            </view>
        </view>
@@ -87,6 +91,11 @@
                ], // 状态
            }
        },
        computed: {
            userId() {
                return uni.getStorageSync('userId')
            }
        },
        onLoad(params) {
            this.name = params.coalName ? params.coalName : ''
            this.init()
@@ -108,7 +117,10 @@
                            return {
                                ...v,
                                ableDischar: v.skin === v.hair || v.hair === 0 && v.skin === 0 || v
                                    .isPretendDischar !== 0 || errorStatusArr.indexOf(v.status) !== -1
                                    .isPretendDischar !== 0 || errorStatusArr.indexOf(v.status) !== -1,
                                isContainLoginUser: v.confirmPeopleId ? v.confirmPeopleId.split(',')
                                    .indexOf(this.userId) === -
                                    1 : true
                            }
                        })
                    } else {
@@ -227,12 +239,17 @@
                }

                .createTime,
                .code {
                .code,
                .confirmPeople {
                    width: 100%;
                    margin-left: vww(9);
                    display: flex;
                    justify-content: flex-start;
                }

                .confirmPeople {
                    margin-top: vww(24);
                }
            }



 pages/tabbar-page/index-tabbar/index-tabbar.vue

@@ -174,7 +174,8 @@
                    if (this.globalweighHouseCode && nowWeighObj.eqCode == this.globalweighHouseCode) {
                        this.changeWeigh(nowWeighObj.weigh);
                        this.changeinfraredStatus(!!nowWeighObj.eqInfraredStatus);
                        console.log(!!nowWeighObj.eqInfraredStatus, '红外状态');
                        let warningState = nowWeighObj.warning == 1
                        this.changeWarning(warningState)
                    }
                } else if (v.startsWith('msg')) {
                    function removeTags(str) {
@@ -204,7 +205,8 @@
        },
        methods: {
            ...mapMutations(['pushMessage', 'changeWeigh', 'changeinfraredStatus', 'changeisconnect', 'websocketInit',
                'changewsgVisiable', 'changewsgContent', 'changeconfirmWeighVisiable', 'changeconfirmWeighContent'
                'changewsgVisiable', 'changewsgContent', 'changeconfirmWeighVisiable', 'changeconfirmWeighContent',
                'changeWarning'
            ]),
            messagePage() {
                uni.navigateTo({

 store/index.js

@@ -147,7 +147,9 @@
        wsgContent: '',
        globalIsFirstWeighing: 1, //是否是第一次上磅
        confirmWeighVisiable: false, //磅房管理确认称重完成提示弹窗
        confirmWeighContent: ''
        confirmWeighContent: '',
        // 称重稳定态  0/稳定 1/非稳定  非稳定态不能点称重
        globalWarning: false,
    },
    mutations: {
        lengthchange(state, payload) {
@@ -244,7 +246,11 @@
        },
        changeconfirmWeighContent(state, payload) {
            state.confirmWeighContent = payload
        }
        },
        // 改变稳定态
        changeWarning(state, payload) {
            state.globalWarning = payload
        },
    },
    actions: {
        websocketInit({ state, dispatch, commit }) {