放空逻辑修改 提煤单状态显示字段修改

qingyiay

2023-10-12 f2aa6f75d70cc7df54bfd0cf33af46fe96401856

放空逻辑修改 提煤单状态显示字段修改

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

@@ -25,7 +25,7 @@
                        <view class="status-button"
                            style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/statusbutton.png') no-repeat;
                                        background-size: cover;">
                            {{coalStatus[correctStatus]||''}}
                            {{coalDetailsData.statusView||''}}
                        </view>
                    </view>
                    <view class="time">
@@ -336,7 +336,7 @@
                    serviecePhone: ''
                },
                coalStatus: ['领取', '预约', '签到', '入场', '称皮', '称毛', '离场', '入磅房', '出磅房', '入煤仓', '出煤仓', '放空', '作废', '入场申请',
                    '进入场院', '异常审核中', '返回加减吨', '超时', '打印中', '打印中', '填写'
                    '进入场院', '异常审核中', '返回加减吨', '超时', '打印中', '打印中', '填写', '放空确认中', '超最大毛重确认中'
                ], // 状态
                weighHouseCode: '',
                // 放空弹窗控制变量
@@ -717,7 +717,8 @@
            evacuationConfirm() {
                this.weighData = {
                    ...this.weighData,
                    weigh: this.globalweigh
                    weigh: this.globalweigh,
                    isBackground: 1
                };
                let mix = Object.assign(this.weighData, this.getWeightHouseObj);
                this.$reqPost('getOneEvacuation', mix, 'json').then(res => {

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

@@ -189,7 +189,6 @@
                plain
                @click="evacuation"
                throttleTime="500"
                :disabled="!isEvacuation"
                v-if='weighList.skin||weighList.hair'></u-button>
            <!-- 外销订单称皮时，返回加减吨按钮置灰。称毛时可用.外购订单，不出现返回加减吨的按钮 -->
            <u-button type="primary"
@@ -210,6 +209,10 @@
            style="color: #ff6363;width: auto;margin: 0 auto;">
            <text v-if="weighList.orderType == '外购'">超出原发毛重,磅房人员确认中,请勿离开此页面</text>
            <text v-else>超出最大毛重,磅房人员确认中,请勿离开此页面</text>
        </view>
        <view v-show="afterEvacuationStatus"
            style="color: #ff6363;width: auto;margin: 0 auto;">
            <text>{{afterEvacuationText}}</text>
        </view>
        <!-- 放空弹窗 -->
        <view class="evacuationModal">
@@ -384,7 +387,9 @@
                checkboxValue1: [],
                isExceedOrigin: false, //是否超出毛重
                refreshLoading: false,
                timer: null
                timer: null,
                afterEvacuationStatus: null, //放空后提煤单状态状态为21时提示‘等待磅房确认’
                afterEvacuationText: ''
            };
        },
        watch: {
@@ -422,15 +427,6 @@
                            this.isSkinWeigh = false;
                            this.outBuy = true;
                            this.temporaryWeighObj.hair = newV;
                            // if (this.weighList.orderType == '外购') {
                            //     let xx = new BigNumber(newV)
                            //     let yy = new BigNumber(this.weighList.hairTwo)
                            //     if (xx.minus(yy) > 0.3) {
                            //         this.$u.toast('超出原发信息毛重,请等待管理人员处理')
                            //         this.isExceedOrigin = true
                            //         this.saveWeigh()
                            //     }
                            // }
                        } else {
                            this.isSkinWeigh = true; //称皮没有返回装卸
                            this.outBuy = false //称皮没有返回装卸
@@ -616,13 +612,16 @@
                this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
                    console.log(res, '第二次放空');
                    if (res.code == 0) {
                        this.$u.toast('操作成功，即将返回上一页');
                        setTimeout(() => {
                            uni.navigateBack({
                                delta: 1
                            });
                        }, 1000);
                        this.$u.toast('操作成功');
                        // setTimeout(() => {
                        //     uni.navigateBack({
                        //         delta: 1
                        //     });
                        // }, 1000);
                        this.evacuationModalShow = false;
                        this.afterEvacuationStatus = res.data.status === 21 || res.data.status === 22
                        this.afterEvacuationText = res.msg

                    } else {
                        this.$u.toast(res.msg ? res.msg : '操作失败');
                        this.evacuationModalShow = true;

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

@@ -124,11 +124,11 @@
            </view>
        </view>
        <view class="loginout">
            <view class="loginout-main"><u-button text="重置密码"
            <!-- <view class="loginout-main"><u-button text="重置密码"
                    type="primary"
                    @click="initPwd"
                    shape="circle"
                    plain></u-button></view>
                    plain></u-button></view> -->
            <view class="loginout-main"><u-button text="退出登录"
                    type="primary"
                    @click="logout"