qingyiay
2023-09-05 64d748607d42358038f54538ddc245e38c1ef567
修改bug
4个文件已修改
64 ■■■■ 已修改文件
pages/driver-page/appointment/appointment.vue 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/drvier-my/drvier-my.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/public-page/forward/forward.vue 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/appointment/appointment.vue
@@ -1,19 +1,26 @@
<template>
    <view class="appointment">
        <combined-title :title="yuYueData.length != 0 ? yuYueData[0].filedName + '——' + yuYueData[0].sendDate : '暂无预约列表'"></combined-title>
        <combined-title
            :title="yuYueData.length != 0 ? yuYueData[0].filedName + '——' + yuYueData[0].sendDate : '暂无预约列表'"></combined-title>
        <view class="appointment-table">
            <uni-table border stripe emptyText="暂无更多数据">
            <uni-table border
                stripe
                emptyText="暂无更多数据">
                <uni-tr>
                    <uni-th align="center">时间段</uni-th>
                    <uni-th align="center">可预约</uni-th>
                    <uni-th align="center">已预约</uni-th>
                    <uni-th align="center">操作</uni-th>
                </uni-tr>
                <uni-tr v-for="(item, index) in yuYueData" :key="item.id">
                <uni-tr v-for="(item, index) in yuYueData"
                    :key="item.id">
                    <uni-td align="center">{{ (item.startTime || '') + '-' + (item.endTime || '') }}</uni-td>
                    <uni-td align="center">{{ item.carNum || '' }}</uni-td>
                    <uni-td align="center">{{ item.carNum1 || '' }}</uni-td>
                    <uni-td><u-button text="选择" type="primary" :disabled="item.carNum == item.carNum1" @click="yuYueBtnClick(item)"></u-button></uni-td>
                    <uni-td><u-button text="选择"
                            type="primary"
                            :disabled="item.carNum == item.carNum1"
                            @click="yuYueBtnClick(item)"></u-button></uni-td>
                </uni-tr>
            </uni-table>
        </view>
@@ -95,9 +102,11 @@
        // 预约
        yuYueClick(id) {
            this.yuYuePostParams.yuYueId = id;
            this.$reqPost('yuYue', { takeCoalId: this.yuYuePostParams.takeCoalId, yuYueId: this.yuYuePostParams.yuYueId }, 'params').then(res => {
                this.$reqPost('yuYue', { takeCoalId: this.yuYuePostParams.takeCoalId, yuYueId: this.yuYuePostParams
                        .yuYueId }, 'params').then(res => {
                if (res.code == 0) {
                    this.$u.toast('预约成功!');
                    let timer = setTimeout(() => {
                        uni.navigateBack({
                            delta: 1
@@ -106,10 +115,9 @@
                } else {
                    this.$u.toast(res.msg ? res.msg : '预约失败');
                }
                setTimeout(() => {
                }).then(() => {
                    this.yuYueList();
                }, 500);
            });
                })
        },
        // 入场申请
        saveRCSQ(value) {
@@ -128,16 +136,19 @@
};
</script>
<style lang="scss" scoped>
<style lang="scss"
    scoped>
::v-deep.appointment {
    width: 94%;
    margin: 0 auto;
    h1 {
        font-size: vww(20);
        text-align: center;
        font-weight: 550;
        margin: vww(30) 0 vww(18) 0;
    }
    // 表格
    .uni-table-scroll {
        width: 100%;
@@ -164,6 +175,7 @@
                    line-height: vww(20);
                    padding: vww(5) vww(10);
                    color: #111111;
                    .u-button {
                        height: vww(23);
                    }
pages/driver-page/drvier-my/drvier-my.vue
@@ -194,14 +194,14 @@
                                border="none"
                                inputAlign="left"></u--input>
                        </u-form-item>
                        <u-form-item labelWidth="20%"
                        <!-- <u-form-item labelWidth="20%"
                            label="车牌号"
                            prop="carNo"
                            required>
                            <u--input v-model="editUserInfo.carNo"
                                border="none"
                                inputAlign="left"></u--input>
                        </u-form-item>
                        </u-form-item> -->
                        <u-form-item labelWidth="20%"
                            label="体重"
                            prop="weight"
pages/public-page/forward/forward.vue
@@ -37,7 +37,7 @@
                                    <u-form-item label="转发对象"
                                        labelWidth="21%"
                                        ref="item1"
                                        @click="forwardObjectClick(index)">
                                        @click="forwardObjectClick(index,val.name)">
                                        <u--input v-model="val.name"
                                            placeholder="点击选择转发对象"
                                            :readonly="true"
@@ -86,7 +86,8 @@
                    :hairline="false"
                    type="warning"
                    @click.stop="submitForm"
                    :disabled="whetherClick1"></u-button></view>
                    :disabled="whetherClick1"
                    :loading='loading'></u-button></view>
        </view>
        <!-- 增加按钮 -->
@@ -230,7 +231,10 @@
                    style: {
                        backgroundColor: '#FB0101'
                    }
                }]
                }],
                loading: false, //提交loading
                originForwardName: '', //原转发对象
                laterForwardName: '', //后转发对象
            };
        },
        onShow() {
@@ -332,9 +336,10 @@
                });
            },
            // 转发
            forwardObjectClick(index) {
            forwardObjectClick(index, name) {
                this.selectPopupShow = true;
                this.index = index;
                this.originForwardName = name || ''
            },
            selectPopupClose() {
                this.selectPopupShow = false;
@@ -352,6 +357,9 @@
                        this.jhOrderPlanForwardList[this.index].xsUserId = item.userId;
                        this.jhOrderPlanForwardList[this.index].name = item.name;
                        this.jhOrderPlanForwardList[this.index].fleetId = 0;
                        if (this.originForwardName) {
                            this.addForm(item.name)
                        }
                    }
                });
            },
@@ -367,6 +375,9 @@
                        this.jhOrderPlanForwardList[this.index].fleetId = item.id;
                        this.jhOrderPlanForwardList[this.index].name = item.name;
                        this.jhOrderPlanForwardList[this.index].xsUserId = 0;
                        if (this.originForwardName) {
                            this.addForm(item.name)
                        }
                    }
                });
            },
@@ -442,13 +453,13 @@
                this.calculate(this.jhOrderPlanForwardList);
            },
            // 添加一组表单
            addForm() {
            addForm(name) {
                // 判断是否有一个复选,如果有则禁止新加的复选,没有则不禁止
                let ischeck = this.jhOrderPlanForwardList.some(v => v.ischecked == true);
                if (!ischeck) {
                    this.jhOrderPlanForwardList.push({
                        orderPlanId: this.orderPlanId,
                        name: '',
                        name: name || '',
                        carNum: null,
                        xsUserId: 0,
                        fleetId: 0,
@@ -460,7 +471,7 @@
                } else {
                    this.jhOrderPlanForwardList.push({
                        orderPlanId: this.orderPlanId,
                        name: '',
                        name: name || '',
                        carNum: null,
                        xsUserId: 0,
                        fleetId: 0,
@@ -509,14 +520,17 @@
                    }
                });
                if (isPass) {
                    this.loading = true;
                    this.$reqPost('forward', this.jhOrderPlanForwardList, 'json').then(res => {
                        console.log(res, 'zh');
                        if (res.code == 0) {
                            this.loading = false
                            this.$u.toast('提交成功');
                            setTimeout(() => {
                                uni.navigateBack({ delta: 1 });
                            }, 1000);
                        } else {
                            this.loading = false
                            this.$u.toast(res.msg);
                        }
                    });
pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue
@@ -24,7 +24,7 @@
            freightForwarderMyPage,
            UnloadMypage
        },
        onLoad() {
        onShow() {
            this.init();
        },
        data() {