修改bug

qingyiay

2023-04-21 fb4fa76b4c1a93c833cd97f97f41b6158ab1aef7

修改bug

 pages/driver-page/appointment/appointment.vue

@@ -120,7 +120,7 @@
                if (res.code == 0) {
                    this.$u.toast('入场申请成功');
                } else {
                    this.$u.toast('入场申请失败，请稍后重试');
                    this.$u.toast(res.msg ? res.msg : '入场申请失败，请稍后重试');
                }
            });
        }

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

@@ -20,10 +20,13 @@
                    </view> -->
                </view>
            </view>
            <view class="bottom" v-if="weighList.orderType == '内购' || weighList.orderType == '转出'">
            <view class="bottom" v-if="weighList.orderType == '外销' || weighList.orderType == '转出' || weighList.orderType == '外购'">
                <view>
                    <view style="font-weight: 600;">原发信息</view>
                    <text>皮重{{ primarySkin || '' }}毛重{{ primaryHair || '' }}净重{{ primaryClean || '' }}</text>
                    <text v-if="weighList.orderType == '外购' && weighList.hair == 0">
                        毛重:{{ coalContactHair || '' }}皮重:{{ coalContactSkin || '' }}净重:{{ (Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2) || '' }}
                    </text>
                    <text v-else>毛重:{{ primaryHair || '' }}皮重:{{ primarySkin || '' }}净重:{{ primaryClean || '' }}</text>
                </view>
            </view>
            <view class="bottom"><text>TIP:当前状态为正常时可以称重</text></view>
@@ -65,11 +68,24 @@
                @cancel="evacuationCancel"
            ></u-modal>
        </view>
        <!-- 外购类型手动输入弹窗 -->
        <view class="">
            <u-modal :show="firstHairCustomernameShow" title="填写重量" @confirm="OutsourcingConfirm">
            <u-modal :show="firstHairCustomernameShow" title="填写原发重量" @confirm="OutsourcingConfirm">
                <view class="">
                    <view class=""><u--input placeholder="请输入毛重" border="surround" v-model="CoalContactHair" type="digit"></u--input></view>
                    <view class=""><u--input placeholder="请输入皮重" border="surround" v-model="CoalContactSkin" type="digit"></u--input></view>
                    <text>毛重:</text>
                    <view class=""><u--input placeholder="请输入毛重" v-model="coalContactHair" type="digit"></u--input></view>
                    <text>皮重:</text>
                    <view class=""><u--input placeholder="请输入皮重" v-model="coalContactSkin" type="digit"></u--input></view>
                </view>
            </u-modal>
        </view>
        <!-- 手动输入之后的二次弹窗 -->
        <view class="secondary-confirmation">
            <u-modal :show="secondConfirmShow" title="请确认原发重量" :showCancelButton="true" @confirm="secondConfirm" @cancel="secondCancel">
                <view class="secondary-confirmation__main">
                    <view class="secondary-child">毛重:{{ coalContactHair }}</view>
                    <view class="secondary-child">皮重:{{ coalContactSkin }}</view>
                    <view class="secondary-child">净重:{{ (Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2) }}</view>
                </view>
            </u-modal>
        </view>
@@ -105,7 +121,10 @@
                equipmentCode: '',
                weigh: 0,
                tmCode: '',
                sceneInOut: ''
                sceneInOut: '',
                coalContactClean: 0,
                coalContactHair: 0,
                coalContactSkin: 0
            },
            takeCoalId: null,
            weighHouseCode: '',
@@ -131,8 +150,10 @@
            isweigh: false,
            // 外购类型称重出现弹窗填写毛，皮，
            firstHairCustomernameShow: false,
            CoalContactHair: '',
            CoalContactSkin: ''
            coalContactHair: '',
            coalContactSkin: '',
            // 二次确认
            secondConfirmShow: false
        };
    },
    watch: {
@@ -165,7 +186,6 @@
                this.weighData.weigh = this.realTimeWeigh = v;
                console.log(this.realTimeWeigh, '真实重量改变了');
            },
            immediate: true,
            deep: true
        }
    },
@@ -210,17 +230,31 @@
                    this.weighData.tmId = res.data.id;
                    this.weighData.carNo = res.data.carNo;
                    this.weighData.tmCode = res.data.code;
                    if (this.weighList.orderType == '外销' && this.weighList.hair == 0) {
                    if (this.weighList.orderType == '外购' && this.weighList.hair == 0) {
                        this.firstHairCustomernameShow = true;
                    }
                }
            });
        },
        // 外购类型输入点击确认之后二次确认
        OutsourcingConfirm() {
            this.weighData.CoalContactSkin = Number(this.CoalContactSkin);
            this.weighData.CoalContactHair = Number(this.CoalContactHair);
            this.weighData.CoalContactclean = Number(this.CoalContactHair) - Number(this.CoalContactSkin);
            this.saveWeigh();
            this.weighData.coalContactSkin = Number(this.coalContactSkin);
            this.weighData.coalContactHair = Number(this.coalContactHair);
            this.weighData.coalContactClean = Number((Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2));
            if (Number(this.coalContactSkin) == 0 || Number(this.coalContactHair) == 0) {
                this.$u.toast('重量不能为0,请重新填写');
            } else {
                this.secondConfirmShow = true;
            }
        },
        // 二次确认弹窗 点击确定
        secondConfirm() {
            this.secondConfirmShow = false;
            this.firstHairCustomernameShow = false;
        },
        // 二次弹窗点击取消
        secondCancel() {
            this.secondConfirmShow = false;
        },
        /**
         * @确认称重等待后端提供实时称重接口，获取皮重，毛重
@@ -417,4 +451,14 @@
        flex: 0.5;
    }
}
.secondary-confirmation__main {
    display: flex;
    flex-direction: column;
    justify-content: space-between;
    align-items: center;
    .secondary-child {
        display: flex;
        justify-content: space-between;
    }
}
</style>

 pages/driver-page/driver-index/driver-index.vue

@@ -117,7 +117,6 @@
                    <view class="haveYuYueCenter">
                        <view>{{ item.deptName || '' }}</view>
                        <view>{{ item.coalName || '' }}</view>
                        <view>排队数：暂无{{}}</view>
                    </view>
                    <view class="haveYuYueBottom">
                        <text>{{ item.yuYueSection || '时段' }}</text>