修复多数bug

qingyiay

2023-03-31 04f3f15c930c2b02187d0ce11d68978b65361d54

修复多数bug

 api/globalApi.js

@@ -243,6 +243,20 @@
    },

    /**
     * @description 第一次放空
     */
    getOneEvacuation: {
        url: "/wrzs/userOperation/getOneEvacuation",
        method: 'GET'
    },
    /**
     * @description 第二次放空
     */
    getTwoEvacuation: {
        url: "/wrzs/userOperation/getTwoEvacuation",
        method: 'GET'
    },
    /**
     * @称重
     */
    saveWeigh: {
@@ -270,10 +284,10 @@
        url: "/wrzs/tmtaskcoallog/getTmId",
        method: 'GET'
    },
	

    // 获取openId
    getCallOutList:{
        url:'/wrzs/callout/getCallOutList',
        method:'GET'
    getCallOutList: {
        url: '/wrzs/callout/getCallOutList',
        method: 'GET'
    }
}

 api/publicInterface.js

@@ -6,8 +6,8 @@
    BaseUrl as wrBaseUrl
} from '@/api/request.js'
// const BaseUrl = "http://hesuancj.cn:9999"
// const BaseUrl = "https://hesuancj.cn:9095"
const BaseUrl = "http://192.168.3.119:9999"
const BaseUrl = "https://hesuancj.cn:9095"
// const BaseUrl = "http://192.168.3.119:9999"

// 登录
// function apiLogin({

 api/request.js

@@ -79,15 +79,15 @@
}

// const BaseUrl = "http://192.168.0.120:9997"
const webSocketUrl = "ws://192.168.3.119:9997/wrzs/ws/info"
// const webSocketUrl = "ws://192.168.3.119:9997/wrzs/ws/info"

const BaseUrl = "http://192.168.3.119:9997";
// const BaseUrl = "http://192.168.3.119:9997";
// const BaseUrl = "http://192.168.0.144:9997";
// const BaseUrl = "http://hesuancj.cn:9997";
// 线上
// const BaseUrl = "https://hesuancj.cn:9095";
const BaseUrl = "https://hesuancj.cn:9095";

// const webSocketUrl = "ws://hesuancj.cn:9095/wrzs/ws/info"
const webSocketUrl = "wss://hesuancj.cn:9095/wrzs/ws/info"
// const webSocketUrl = "ws://hesuancj.cn:9997/wrzs/ws/info"
// 请求拦截
const fetch = (url, opt) => {

 components/card/card.vue

@@ -4,10 +4,10 @@
        :style="{
            background:
                backgroundType == 0
                    ? 'url(../../../static/image/background/customer-blue.png) no-repeat'
                    ? 'url(https://hesuancj.cn:9095/appimg/image/background/customer-blue.png) no-repeat'
                    : backgroundType == 1
                    ? 'url(../../../static/image/background/huoDai.png) no-repeat'
                    : 'url(../../../static/image/background/driver.png) no-repeat',
                    ? 'url(https://hesuancj.cn:9095/appimg/image/background/huoDai.png) no-repeat'
                    : 'url(https://hesuancj.cn:9095/appimg/image/background/driver.png) no-repeat',
            backgroundSize: '100% 100%'
        }"
    >
@@ -29,9 +29,9 @@
        //     type: Boolean,
        //     default: false
        // },
        backgroundType:{
            type:Number,
            default:0
        backgroundType: {
            type: Number,
            default: 0
        },
        name: {
            type: String,
@@ -39,8 +39,7 @@
        }
    },
    data() {
        return {
        };
        return {};
    },
    methods: {
        bodyClick() {

 pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver.vue

@@ -16,8 +16,9 @@

<script>
import { customerId } from '@/utils/status.js';
import { mapMutations } from 'vuex';
export default {
    onLoad(params) {   
    onLoad(params) {
        this.role = params.role;
        if (params.fleetId) {
            this.fleetId = params.fleetId;
@@ -34,6 +35,7 @@
        };
    },
    methods: {
        ...mapMutations(['lengthchange']),
        init() {},
        addToHuoDaiOrDriver() {
            switch (this.role) {
@@ -74,7 +76,7 @@
                        });
                    }, 1000);
                } else {
                    this.$u.toast(res.data ? res.data : '未成功添加');
                    this.$u.toast(res.msg ? res.msg : '未成功添加');
                }
            });
        },
@@ -83,13 +85,16 @@
            this.$reqPost('bindUserFleet', { fleetId: this.fleetId, name: this.name, phone: this.phone, carNo: this.carNo }, 'params').then(res => {
                console.log('邀请司机', res);
                if (res.code == 0) {
                    this.$u.toast(res.data ? res.data : '操作成功');
                    this.$u.toast(res.msg ? res.msg : '操作成功');
                    this.$reqGet('GetUserFleet', { fleetId: this.fleetId }).then(response => {
                        this.lengthchange(response.data.length);
                    });
                    uni.navigateBack({
                        delta: 1
                    });
                } else {
                    uni.showToast({
                        title: res.data,
                        title: res.msg,
                        icon: 'null',
                        duration: 2000
                    });

 pages/customer-page/customer-index/customer-index.vue

@@ -9,8 +9,8 @@
                        张
                    </view>
                    <view class="card-left__utils">
                        <u-button @tap.stop="receiveClick(item)" text="领取" type="primary" v-if="item.cars2 != item.carNum" shape="circle"></u-button>
                        <u-button text="转发" type="primary" @tap.stop="forwardClick(item)" shape="circle"></u-button>
                        <u-button @tap.stop="receiveClick(item)" text="领取" type="primary" v-if="item.carNumSurplus != 0" shape="circle"></u-button>
                        <u-button text="转发" type="primary" @tap.stop="forwardClick(item)" shape="circle" v-if="item.carNumSurplus1 != 0"></u-button>
                    </view>
                </template>
                <template v-slot:right-top>
@@ -69,7 +69,7 @@
                        <uni-td align="center" @row-click="faYundetail(item)">{{ item.tmCount }}</uni-td>
                    </uni-tr>
                </uni-table>
                <view class="more_text" v-if="showMoreData">没有数据了...</view>
                <view class="more_text" v-if="showMoreData && historyCoalData.length !== 0">没有数据了...</view>
            </scroll-view>
        </view>
        <!-- 领取弹出框 -->
@@ -138,7 +138,6 @@
        init() {
            this.GetOrderPlan();
            this.getJhOrderPlanDataPage();
            if (this.pageCurrent * this.pageSize >= this.total) return (this.showMoreData = true);
        },
        // 获取发运计划列表
        GetOrderPlan() {
@@ -157,9 +156,16 @@
            this.loading = true;
            this.$reqGet('getJhOrderPlanDataPage', { current: this.pageCurrent, size: this.pageSize }).then(res => {
                if (res.data.records) {
                    this.historyCoalData = [...this.historyCoalData, ...res.data.records];
                    this.total = res.data.total;
                    this.loading = false;
                    if (this.pageCurrent > 1) {
                        this.historyCoalData = this.historyCoalData.concat(res.data.records);
                        this.loading = false;
                    } else {
                        this.historyCoalData = res.data.records;
                        this.loading = false;
                    }
                    // this.historyCoalData = [...this.historyCoalData, ...res.data.records];
                    // this.total = res.data.total;
                    // this.loading = false;
                }
            });
        },

 pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue

@@ -5,12 +5,12 @@
            <view class="compDetails">
                <uni-table border stripe emptyText="暂无更多数据">
                    <uni-tr>
                        <uni-th align="left" width="120">转发总量</uni-th>
                        <uni-td align="left">{{ orderPlanDetail.fowardSum || 0 }}张</uni-td>
                    </uni-tr>
                    <uni-tr>
                        <uni-th align="left">领取总量</uni-th>
                        <uni-td align="left">{{ cars2 || 0 }}张</uni-td>
                    </uni-tr>
                    <uni-tr>
                        <uni-th align="left" width="120">转发总量</uni-th>
                        <uni-td align="left">{{ orderPlanDetail.fowardSum || 0 }}张</uni-td>
                    </uni-tr>
                    <uni-tr v-for="(item, index) in orderPlanDetail.huodaiList" :key="index">
                        <uni-th align="left">{{ item.huoDaiName }}</uni-th>
@@ -33,13 +33,13 @@
                    <view class="label-title">提煤单状态</view>
                    <view class="label-value">{{ coalStatus[item.status] }}</view>
                </view>
                <view class="coal-clean">
                    <view class="label-title">净重</view>
                    <view class="label-value">{{ item.clean || 0 }}</view>
                </view>
                <view class="coal-carNo">
                    <view class="label-title">车牌号</view>
                    <view class="label-value">{{ item.carNo || '' }}</view>
                </view>
                <view class="coal-clean">
                    <view class="label-title">净重</view>
                    <view class="label-value">{{ item.clean || 0 }}</view>
                </view>
                <view class="coal-allowance">
                    <view class="label-title">余量</view>
@@ -96,6 +96,9 @@
                    this.orderPlanDetail = res.data;
                    this.yyDailyList = res.data.yyDailyList;
                    uni.hideLoading();
                } else {
                    this.$u.toast('服务器错误，请稍后重试');
                    uni.hideLoading();
                }
            });
        }

 pages/customer-page/fleet-management/fleet-management.vue

@@ -43,7 +43,18 @@
</template>

<script>
import { mapState } from 'vuex';
export default {
    computed: {
        ...mapState(['fleetDriverDataLength'])
    },
    watch: {
        fleetDriverDataLength(v) {
            if (this.fleetDriverData.length !== v) {
                this.GetUserFleet();
            }
        }
    },
    onLoad(params) {
        this.deleteDriveObj.fleetId = params.id;
    },

 pages/customer-page/freight-forwarder-details/freight-forwarder-details.vue

@@ -33,7 +33,7 @@
                    </uni-tr>
                    <uni-tr>
                        <uni-th align="left">任务总数</uni-th>
                        <uni-td align="left">{{ HuoDaiForm.sum }}</uni-td>
                        <uni-td align="left">{{ HuoDaiForm.sum || '' }}</uni-td>
                    </uni-tr>
                    <uni-tr>
                        <uni-th align="left">执行完成</uni-th>

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

@@ -28,16 +28,28 @@
            <view class="utils_chil utils_chilTop">
                <u-button text="签到" type="primary" plain @click="arriveClick"></u-button>
                <u-button text="入场申请" type="primary" plain @click="rcsqClick"></u-button>
                <u-button text="放空" type="primary" plain></u-button>
                <u-button text="放空" type="primary" plain @click="evacuation" throttleTime="500"></u-button>
                <u-button text="呼叫客服" type="primary" plain @click="callCustomerService"></u-button>
            </view>
            <view class="utils_chil"><u-button text="展示提煤单" @click="showCaolPickUpBill" type="primary"></u-button></view>
            <view class="utils_chil"><u-button text="上磅计量" @click="cengZhongClick" type="primary"></u-button></view>
        </view>
        <view class="evacuationModal">
            <u-modal
                :show="evacuationModalShow"
                :title="evacuationTitle"
                :content="evacuationContent"
                :showCancelButton="true"
                @confirm="evacuationConfirm"
                @cancel="evacuationCancel"
            ></u-modal>
        </view>
    </view>
</template>

<script>
let socket = null;
import { webSocketUrl } from '@/api/request.js';
export default {
    onLoad(value) {
        if (value.orderPlanId && value.yyId) {
@@ -77,7 +89,19 @@
                openId: null,
                openName: ''
            },
            coalStatus: ['领取', '预约', '签到', '入场', '称皮', '称毛', '离场', '入磅房', '出磅房', '入煤场', '出煤仓'] // 状态
            coalStatus: ['领取', '预约', '签到', '入场', '称皮', '称毛', '离场', '入磅房', '出磅房', '入煤场', '出煤仓', '放空'], // 状态
            weighHouseCode: '',
            // 放空弹窗控制变量
            evacuationModalShow: false,
            evacuationTitle: '放空确认',
            evacuationContent: '是否确认放空',
            // 第一次放空参数
            weighData: {
                sceneId: '',
                gateCameraId: '',
                equipmentCode: '',
                weigh: 0
            }
        };
    },
    onShow() {
@@ -217,6 +241,10 @@
            this.$reqGet('getWeighHouse', this.getWeightHouseObj).then(res => {
                console.log(res, '获取磅房');
                if (res.code == 0) {
                    this.weighData.sceneId = res.data.id;
                    this.weighData.gateCameraId = res.data.lastEquipmentId;
                    this.weighData.equipmentCode = res.data.lastEquipmentCode;
                    this.weighHouseCode = res.data.code;
                    uni.navigateTo({
                        url: `/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice?takeCoalId=${this.orderPlanId}&sceneId=${
                            res.data.id
@@ -226,6 +254,60 @@
                    this.$u.toast('未在磅房，请前往磅房后再试！！');
                }
            });
        },
        /**
         * 初始化 weoSocket
         */
        initWebSocket() {
            let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`;
            socket = uni.connectSocket({
                url: wsUrl,
                header: {
                    CLIENT_TOC: 'Y'
                },
                complete: res => {
                    console.log(res, 'socket结果');
                }
            });
            socket.onOpen(() => {
                console.log('onOpen');
            });
            // 获取服务器传来的数据，做相应处理
            socket.onMessage(res => {
                console.log('socketWeigh', res);
                let nowWeighObj = JSON.parse(res.data.slice(7));
                if (nowWeighObj.eqCode == this.weighHouseCode) {
                    if (nowWeighObj.eqInfraredStatus) {
                        this.weighData.weigh = nowWeighObj.weigh;
                    } else {
                        this.weighData.weigh = nowWeighObj.weigh;
                    }
                }
            });
            socket.onClose(() => {
                console.log('webSocketClose');
                this.$u.toast('磅房接口终端');
            });
            socket.onError(err => {
                console.log('socket报错', err);
                this.$u.toast('磅房接口暂时不能使用，请重新进入该页面，重试！！');
            });
        },
        // 放空
        evacuation() {
            this.evacuationModalShow = true;
        },
        // 放空弹窗确认
        evacuationConfirm() {
            let mix = Object.assign(this.weighData, this.getWeightHouseObj);
            this.$reqPost('getOneEvacuation', mix, 'json').then(res => {
                console.log(res, '第一次放空');
                this.evacuationModalShow = false;
            });
        },
        // 放空弹窗取消
        evacuationCancel() {
            this.evacuationModalShow = false;
        }
    }
};

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

@@ -1,12 +1,12 @@
<template>
    <view class="coal-pick-up-bill">
        <view class="driver" style="background:url(../../../../../static/image/coalBackgroud/coal-background.png) no-repeat;background-size:100% 100%;">
        <view class="driver" style="background:url(https://hesuancj.cn:9095/appimg/image/coalBackgroud/coal-background.png) no-repeat;background-size:100% 100%;">
            <view class="driver-coalOne">电子提煤单</view>
            <view class="driver-coalTwo">
                <view>{{ coalData.code || '暂无订单编号' }}</view>
                <view>{{ coalData.deptName || '暂无所属矿' }}</view>
                <view>{{ coalData.coalName || '暂无煤种' }}</view>
                <view>{{ coalData.carNo || '暂无车牌' }}</view>
                <view class="bigFont">{{ coalData.deptName || '暂无所属矿' }}</view>
                <view class="bigFont">{{ coalData.coalName || '暂无煤种' }}</view>
                <view class="bigFont">{{ coalData.carNo || '暂无车牌' }}</view>
            </view>
            <view class="driver-coalThree">
                <view>{{ coalData.customerName || '暂无单位' }}</view>
@@ -82,12 +82,15 @@
            color: #2e363f;
            view:nth-child(2) {
                margin-top: vww(15);
                font-size: 40px;
            }
            view:nth-child(3) {
                margin-top: vww(15);
                font-size: 40px;
            }
            view:nth-child(4) {
                margin-top: vww(15);
                font-size: 40px;
            }
        }
        &-coalThree {
@@ -102,10 +105,10 @@
            }
        }
        &-coalFour {
            margin: vww(58.5) 0 0 45.5%;
            margin: vww(59) 0 0 43%;
            image {
                width: vww(35);
                height: vww(35);
                width: vww(52);
                height: vww(52);
            }
        }
    }

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

@@ -20,7 +20,7 @@
                    </view> -->
                </view>
            </view>
            <view class="bottom"><text>TIP:当前状态正常可以称重</text></view>
            <view class="bottom"><text>TIP:当前状态为正常时可以称重</text></view>
        </view>
        <view class="two">
            <p>订单编号：{{ weighList.code || '' }}</p>
@@ -34,7 +34,8 @@
            <p>矿场名称：{{ weighList.filedName || '' }}</p>
        </view>
        <view class="three">
            <!-- 外销订单成皮时，返回加减吨按钮置灰。称毛时可用.外购订单，不出现返回加减吨的按钮 -->
            <u-button type="primary" text="放空" plain @click="evacuation" throttleTime="500"></u-button>
            <!-- 外销订单称皮时，返回加减吨按钮置灰。称毛时可用.外购订单，不出现返回加减吨的按钮 -->
            <u-button
                type="primary"
                text="确定称重"
@@ -45,7 +46,17 @@
            ></u-button>
            <u-button type="primary" text="返回加减吨" :disabled="addAndSubtractCoalDisabled" v-if="weighList.orderTye == '外销'" @click="addAndSubtractCoal"></u-button>
        </view>
        <view class="four">如您需要调整装载货品吨数，请点击返回加减吨</view>
        <view class="four" v-if="weighList.orderTye == '外销'">如您需要调整装载货品吨数，请点击返回加减吨</view>
        <view class="evacuationModal">
            <u-modal
                :show="evacuationModalShow"
                :title="evacuationTitle"
                :content="evacuationContent"
                :showCancelButton="true"
                @confirm="evacuationConfirm"
                @cancel="evacuationCancel"
            ></u-modal>
        </view>
    </view>
</template>

@@ -95,7 +106,11 @@
                hair: 0,
                clean: 0
            },
            infraredStatus: false // 红外状态
            infraredStatus: false, // 红外状态，
            // 放空控制
            evacuationModalShow: false,
            evacuationTitle: '第二次放空确认',
            evacuationContent: '是否确认放空'
        };
    },
    watch: {
@@ -105,7 +120,7 @@
                    this.temporaryWeighObj.skin = this.realTimeWeigh;
                } else {
                    this.temporaryWeighObj.hair = this.realTimeWeigh;
                    this.temporaryWeighObj.clean = this.temporaryWeighObj.hair - this.weighList.skin;
                    this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(2);
                }
            } else if (this.weighList.orderTye == '外购') {
                if (this.weighList.hair == 0) {
@@ -137,6 +152,18 @@
        }
    },
    methods: {
        // 放空
        evacuation() {
            this.evacuationModalShow = true;
        },
        // 放空弹窗确认
        evacuationConfirm() {
            this.evacuationModalShow = false;
        },
        // 放空弹窗取消
        evacuationCancel() {
            this.evacuationModalShow = false;
        },
        init() {
            // 获取称重信息
            this.$reqGet('weighList', { id: this.takeCoalId }).then(res => {
@@ -161,7 +188,7 @@
                        if (this.weighList.skin ? (this.weighList.skin < this.realTimeWeigh ? true : false) : true) {
                            this.saveWeigh();
                        } else {
                            this.$u.toast('毛重不能小于皮重');
                            this.$u.toast('毛重不q能小于皮重');
                            this.isConfirmWeighLoading = false;
                        }
                    } else {

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

@@ -65,7 +65,7 @@
                <!-- 待预约提煤单 -->
                <view class="daiYuYue" v-for="(item, index) in driverBillOfLoadingData.list3" :key="index">
                    <view class="daiYuYueTop">
                        <text>提煤单编号：{{ item.code }}</text>
                        <text class="tmcode">提煤单编号：{{ item.code }}</text>
                    </view>
                    <view class="daiYuYueTable">
                        <!-- <view>{{ item.deptName }}</view>
@@ -73,14 +73,14 @@
                        <view>已预约：{{ item.cars }} 车</view> -->
                        <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>
                                <uni-td align="left">{{ item.deptName || '' }}</uni-td>
                                <uni-td align="left">{{ item.coalName || '' }}</uni-td>
                                <uni-td align="left">{{ item.cars || '' }} 车</uni-td>
                                <uni-td align="left">{{ item.cars || 0 }} 车次</uni-td>
                            </uni-tr>
                            <uni-tr>
                                <uni-th align="center">发运日期</uni-th>
@@ -110,7 +110,7 @@
            <view class="">
                <view @click="list3CardIconClick(item)" class="haveYuYue" v-for="(item, index) in driverBillOfLoadingData.list2" :key="index">
                    <view class="haveYuYueTop">
                        <text>提煤单编号：{{ item.code || '' }}</text>
                        <text class="tmcode">提煤单编号：{{ item.code || '' }}</text>
                    </view>
                    <view class="haveYuYueCenter">
                        <view>{{ item.deptName || '' }}</view>
@@ -154,7 +154,9 @@
            qiangDanTitle: '抢单提示',
            qiangDanContent: '',
            qiangDanOrderPlanId: null,
            fleetId: ''
            fleetId: '',
            xsUserId: '',
            customerId: ''
        };
    },
    onShow() {
@@ -178,10 +180,12 @@
        // 抢单按钮
        qiangDanBtn(value) {
            if (value.tmcCount == '0') {
                this.qiangDan(value.orderPlanId, value.fleetId);
                this.qiangDan(value.orderPlanId, value.fleetId, value.customerId === null ? '0' : value.customerId, value.xsUserId === null ? '0' : value.xsUserId);
            } else {
                this.qiangDanOrderPlanId = value.orderPlanId;
                this.fleetId = value.fleetId;
                this.customerId = value.customerId === null ? '0' : value.customerId;
                this.xsUserId = value.xsUserId === null ? '0' : value.xsUserId;
                this.qiangDanShow = true;
                this.qiangDanContent = `已抢${value.tmcCount}单，确定抢单？`;
            }
@@ -190,14 +194,14 @@
        qiangDanConfirm() {
            this.qiangDanContent = '';
            this.qiangDanShow = false;
            this.qiangDan(this.qiangDanOrderPlanId, this.fleetId);
            this.qiangDan(this.qiangDanOrderPlanId, this.fleetId, this.customerId, this.xsUserId);
        },
        qiangDanCancel() {
            this.qiangDanShow = false;
        },
        // 抢单请求
        qiangDan(id, fleetId) {
            this.$reqPost('qiangDan', { orderPlanId: id, fleetId: fleetId }, 'params')
        qiangDan(id, fleetId, customerId, xsUserId) {
            this.$reqPost('qiangDan', { orderPlanId: id, fleetId: fleetId, customerId: customerId, xsUserId: xsUserId }, 'params')
                .then(res => {
                    if (res.code == 0) {
                        this.$u.toast('抢单成功');
@@ -284,11 +288,17 @@
            font-weight: 300;
            &Top {
                background-color: #f5f5f5;
                height: vww(40);
                height: vww(60);
                padding-left: vww(12);
                line-height: vww(40);
                border: vww(1) solid #eeeeee;
                font-weight: 400;
                // .tmcode {
                //     overflow: hidden;
                //     text-overflow: ellipsis;
                //     white-space: nowrap;
                //     width: 100%;
                // }
            }
            &Table {
                .uni-table {
@@ -320,11 +330,17 @@
            margin-top: vww(24);
            &Top {
                background-color: #f5f5f5;
                height: vww(40);
                height: vww(60);
                padding-left: vww(12);
                line-height: vww(40);
                border: vww(1) solid #eeeeee;
                font-weight: 400;
                // .tmcode {
                //     overflow: hidden;
                //     text-overflow: ellipsis;
                //     white-space: nowrap;
                //     width: 100%;
                // }
            }
            &Center {
                border: vww(1) solid #eeeeee;

 pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue

@@ -2,7 +2,7 @@
    <view class="freightForwarder-index">
        <view class="freightForwarder-index-body">
            <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30" iconSize="1000" v-if="orderPlanData.length == 0"></u-empty>
            <card v-for="(item, index) in orderPlanData" :key="index" :name="item.id" @click="cardBodyClick" backgroundType="1">
            <card v-for="(item, index) in orderPlanData" :key="index" :name="item.id" @click="cardBodyClick(item)" backgroundType="1">
                <template v-slot:left>
                    <view class="card-left__top">
                        <text>{{ item.carNum }}</text>
@@ -52,7 +52,7 @@
                        <uni-td align="center">{{ item.tmCount }}</uni-td>
                    </uni-tr>
                </uni-table>
                <view class="more_text" v-if="showMoreData">没有数据了...</view>
                <view class="more_text" v-if="showMoreData && historyCoalData.length !== 0">没有数据了...</view>
            </scroll-view>
        </view>
    </view>
@@ -121,9 +121,13 @@
            this.loading = true;
            this.$reqGet('getJhOrderPlanDataPage', { current: this.pageCurrent, size: this.pageSize }).then(res => {
                if (res.data.records) {
                    this.historyCoalData = [...this.historyCoalData, ...res.data.records];
                    this.total = res.data.total;
                    this.loading = false;
                    if (this.pageCurrent > 1) {
                        this.historyCoalData = this.historyCoalData.concat(res.data.records);
                        this.loading = false;
                    } else {
                        this.historyCoalData = res.data.records;
                        this.loading = false;
                    }
                }
            });
        },
@@ -142,15 +146,16 @@
                this.orderPlanData = res.data;
            });
        },
        cardBodyClick(id) {
            let code = null;
            this.orderPlanData.forEach(item => {
                if (item.id == id) {
                    code = item.code;
                }
            });
        cardBodyClick(item) {
            // let code = null;
            // this.orderPlanData.forEach(item => {
            //     if (item.orderPlanId == id) {
            //         code = item.code;
            //         id = item.orderPlanId;
            //     }
            // });
            uni.navigateTo({
                url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${id}&code=${code}`
                url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${item.orderPlanId}&code=${item.code}`
            });
        },
        // 转发

 pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue

@@ -198,6 +198,7 @@
                .addCarButton {
                    width: 40%;
                    margin: 0 auto;
                    color: rgb(10, 108, 255);
                }
            }
        }

 pages/public-page/forward/forward.vue

@@ -3,10 +3,10 @@
    <view class="forward">
        <view v-if="roleType == 1"><u-notice-bar :text="text" :fontSize="30" mode="link"></u-notice-bar></view>
        <view v-else-if="roleType == 2"><u-notice-bar :text="text1" :fontSize="30" mode="link"></u-notice-bar></view>
        <view class="forward-card" v-for="(val, index) in jhOrderPlanForwardList">
        <view class="forward-card" v-for="(val, index) in jhOrderPlanForwardList" :key="index">
            <u--form labelPosition="top" :model="forwardForm" ref="form1">
                <u-form-item label="转发对象" labelWidth="20%" ref="item1" @click="forwardObjectClick(index)">
                    <u--input v-model="val.name" placeholder="点击选择转发对象"></u--input>
                    <u--input v-model="val.name" placeholder="点击选择转发对象" :readonly="true"></u--input>
                </u-form-item>
                <u-form-item label="输入数量" labelWidth="20%" ref="item1">
                    <view class="forward-card-amount">
@@ -59,14 +59,7 @@
        this.carNumSurplus1 = Number(params.carNumSurplus1);
        // 货代
        this.carNum = Number(params.carNum);
        this.carNumSurplusHuodai = Number(params.carNumSurplusHuodai);
        if (params.carNumSurplus1 || params.carNumSurplusHuodai) {
            if (params.carNumSurplus1 != 0) {
                this.forwardSurplus = params.carNumSurplus1;
            } else if (params.carNumSurplusHuodai != 0) {
                this.forwardSurplus = params.carNumSurplusHuodai;
            }
        }
        this.carNumSurplusHuodai = this.forwardSurplus = Number(params.carNumSurplusHuodai);
        this.orderPlanId = params.orderPlanId;
        this.$reqGet('forwardList', { OrderPlanId: params.orderPlanId }).then(res => {
            if (res.data.length !== 0 && this.roleType == 1) {
@@ -179,6 +172,7 @@
        checkboxChange(value, index) {
            console.log('复选框变化', value, index);
            if (value.length != 0) {
                console.log(this.forwardSurplus, '货代转发全部数量');
                this.jhOrderPlanForwardList[index].carNum = this.forwardSurplus;
            } else {
                this.jhOrderPlanForwardList[index].carNum = null;

 pages/register/register.vue

@@ -35,13 +35,35 @@
                    <u--input v-model="registerFormModel.carNo" placeholder="请输入内容" clearable></u--input>
                </u-form-item>
                <u-form-item prop="carImg" label="车辆照片" labelWidth="20%" borderBottom v-if="radiovalue1 == '司机'" required>
                    <u-upload :fileList="fileList1" deletable @afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="1" width="250" height="150">
                    <u-upload
                        :fileList="fileList1"
                        deletable
                        @afterRead="afterRead"
                        @delete="deletePic"
                        name="1"
                        multiple
                        :maxCount="1"
                        width="250"
                        height="150"
                        :previewFullImage="true"
                    >
                        <!-- <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
                        mode="widthFix" style="width: 250px;height: 150px;"></image> -->
                    </u-upload>
                </u-form-item>
                <u-form-item prop="drivingImg" label="行驶证" labelWidth="20%" borderBottom v-if="radiovalue1 == '司机'" required>
                    <u-upload :fileList="fileList2" deletable @afterRead="afterRead" @delete="deletePic" name="2" multiple :maxCount="1" width="250" height="150">
                    <u-upload
                        :fileList="fileList2"
                        deletable
                        @afterRead="afterRead"
                        @delete="deletePic"
                        name="2"
                        multiple
                        :maxCount="1"
                        width="250"
                        height="150"
                        :previewFullImage="true"
                    >
                        <!-- <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
                        mode="widthFix" style="width: 250px;height: 150px;"></image> -->
                    </u-upload>
@@ -55,6 +77,12 @@
            <u-modal :show="editRoleModelShow" :title="title" :content="content" :showCancelButton="true" @confirm="roleConfirm" @cancel="roleCancel"></u-modal>
        </view>
        <view class="registerBtn"><u-button text="注册" type="primary" @click="registerClick"></u-button></view>
        <!-- 图片预览弹出框 -->
        <!-- <view class="previewImage-container">
            <u-popup :show="previewImageShow" mode="center" @close="previewImageClose" @open="previewImageOpen">
                <u--image :src="previewImageSrc != null ? BaseUrl + previewImageSrc : ''" width="400px" height="400px"></u--image>
            </u-popup>
        </view> -->
    </view>
</template>

@@ -288,7 +316,6 @@
        },
        // 新增图片
        async afterRead(event) {
            console.log('event', event);
            // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
            let lists = [].concat(event.file);
            let fileListLen = this[`fileList${event.name}`].length;
@@ -307,7 +334,7 @@
                    1,
                    Object.assign(item, {
                        status: 'success',
                        message: '',
                        message: '上传成功',
                        url: result
                    })
                );
@@ -320,15 +347,16 @@
                    url: BaseUrl + '/admin/sys-file/uploadUnToken',
                    filePath: url,
                    name: 'file',
                    // formData: {
                    //     user: 'test'
                    // },
                    formData: {
                        // user: ''
                    },
                    success: res => {
                        resolve(JSON.parse(res.data).data.url);
                        if (num == 1) {
                            this.registerFormModel.carImg = JSON.parse(res.data).data.url;
                            resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
                        } else if (num == 2) {
                            this.registerFormModel.drivingImg = JSON.parse(res.data).data.url;
                            resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
                        }
                    }
                });

 store/index.js

@@ -37,9 +37,12 @@
        userInfo: {},
        roleType: null, // 1客户，2货代，3司机
        userTabbar: [], // 用户所在角色底部菜单，
        orderPlanDataStore: [],
        fleetDriverDataLength: 0
    },
    mutations: {
        lengthchange(state, payload) {
            state.fleetDriverDataLength = payload
        },
        setUserInfo(state, identity) {
            state.userInfo = userObj[identity]
        },