付延余
2023-03-22 82fa9121ff649bb681fc55e482fe405c5ce0d4d0
称重界面完成(上磅计量页面完成)
8个文件已修改
180 ■■■■ 已修改文件
api/globalApi.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
components/tab-bar/tab-bar.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/customer-page/customer-my/customer-my.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue 102 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/driver-index/driver-index.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/drvier-my/drvier-my.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/globalApi.js
@@ -234,6 +234,11 @@
        url: "/wrzs/userOperation/weighList",
        method: 'GET'
    },
    // 加减煤
    addAndSubtractCoal:{
        url:'/wrzs/jcgatestate/repeatCheck',
        method:'POST'
    },
    // 获取所在磅房
    getWeighHouse:{
        url:"/wrzs/jccoalweighhouse/getWeighHouse",
components/tab-bar/tab-bar.vue
@@ -29,7 +29,6 @@
    },
    methods: {
        tabbarchange(e) {
            console.log('tabbar改变',this.current, e,this.tabBarList);
            uni.switchTab({
                url: '/' + this.tabBarList[e].pagePath
            });
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
@@ -2,26 +2,22 @@
    <view class="fayunPlan">
        <view>
            <view class="compDetails">
                <view class="comp">{{ orderPlanDetail.compName }}</view>
                <!-- <view class="comp">{{ orderPlanDetail.compName }}</view> -->
                <uni-table border stripe emptyText="暂无更多数据">
                    <uni-tr>
                        <uni-th align="left">总领取量</uni-th>
                        <uni-td align="left">{{ orderPlanDetail.fowerdsum || 0 }}张</uni-td>
                        <uni-th align="left">转发总量</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>
                        <uni-td align="left">{{ item.fleetOrHuodaiNub }}张</uni-td>
                    </uni-tr>
                    <uni-tr v-for="(item,index) in orderPlanDetail.cheduiList" :key="index">
                        <uni-th align="left">{{item.cheduiName}}</uni-th>
                        <uni-td align="left">{{ item.fleetOrHuodaiNub }}张</uni-td>
                    </uni-tr>
                    <uni-tr>
                        <uni-th align="left">车队和货代</uni-th>
                        <uni-td align="left">{{ orderPlanDetail.fleetOrHuodaiNub || 0 }}张</uni-td>
                    </uni-tr>
                    <uni-tr>
                        <uni-th align="left">车队</uni-th>
                        <uni-td align="left">{{ orderPlanDetail.cheduiList || 0 }}张</uni-td>
                    </uni-tr>
                    <uni-tr>
                        <uni-th align="left">货代</uni-th>
                        <uni-td align="left">{{ orderPlanDetail.huodaiList || 0 }}张</uni-td>
                    </uni-tr>
                    <uni-tr>
                        <uni-th align="left">司机</uni-th>
                        <uni-th align="left">司机总领取</uni-th>
                        <uni-td align="left">{{ orderPlanDetail.sijiSum || 0 }}张</uni-td>
                    </uni-tr>
                </uni-table>
pages/customer-page/customer-my/customer-my.vue
@@ -147,7 +147,7 @@
        },
        // 获取车队列表
        getFleet() {
            this.$reqGet('getFleet', { customerId }).then(res => {
            this.$reqGet('getFleet').then(res => {
                this.fleetData = res.data;
                console.log('车队列表', res);
            });
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -87,6 +87,17 @@
        },
        // 签到
        arriveClick() {
            // 获取位置信息
            // wx.getFuzzyLocation({
            //  type: 'wgs84',
            //  success (res) {
            //    const latitude = res.latitude
            //    const longitude = res.longitude
            //  }
            // })
            uni.navigateTo({
                url: `/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock?orderPlanId=${this.orderPlanId}`
            });
@@ -112,7 +123,7 @@
                console.log(res, '获取磅房');
                if(res.code == 0){
                    uni.navigateTo({
                        url: `/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice?takeCoalId=${this.orderPlanId}&sceneId=${res.data.id}&gateCameraId=${res.data.gateCameraId}&gateCameraCode=${res.data.gateCameraCode}&weighCode=${res.data.weighCode}`
                        url: `/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice?takeCoalId=${this.orderPlanId}&sceneId=${res.data.id}&gateCameraId=${res.data.lastEquipmentId}&gateCameraCode=${res.data.lastEquipmentCode}&weighHouseCode=${res.data.code}`
                    });
                }else{
                    this.$u.toast('未在磅房,请前往磅房后再试!!')
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -25,15 +25,18 @@
        <view class="two">
            <p>订单编号:{{ weighList.code || '' }}</p>
            <p>订单类型:{{ weighList.orderTye || '' }}</p>
            <p>订单余量:{{ weighList.allowance }}</p>
            <p>皮重:{{ weighList.skin || '' }}</p>
            <p>毛重:{{ weighList.hair || '' }}</p>
            <p>净重:{{ weighList.clean || '' }}</p>
            <p>订单余量:{{ weighList.orderSurplus }}</p>
            <p>皮重:{{ weighList.skin || 0 }}</p>
            <p>毛重:{{ weighList.hair || 0 }}</p>
            <p>净重:{{ weighList.skin == 0 && weighList.hair == 0 ? weighList.clean : weighList.skin != 0 ? realTimeWeigh - weighList.skin : weighList.hair - realTimeWeigh }}</p>
            <p>煤种名称:{{ weighList.coalName }}</p>
            <p>单位名称:{{ weighList.deptName }}</p>
            <p>矿场名称:{{ weighList.filedName }}</p>
        </view>
        <view class="three">
            <!-- 外销订单成皮时,返回加减吨按钮置灰。称毛时可用.外购订单,不出现返回加减吨的按钮 -->
            <u-button type="primary" text="确定称重" @click="confirmWeigh"></u-button>
            <u-button type="primary" text="返回加减吨"></u-button>
            <u-button type="primary" text="确定称重" :loading="isConfirmWeighLoading" loadingText="加载中" @click="confirmWeigh"></u-button>
            <u-button type="primary" text="返回加减吨" :disabled="addAndSubtractCoalDisabled" v-if="weighList.orderTye == '外销'" @click="addAndSubtractCoal"></u-button>
        </view>
        <view class="four">如您需要调整装载货品吨数,请点击返回加减吨</view>
    </view>
@@ -48,7 +51,7 @@
        this.weighData.sceneId = params.sceneId;
        this.weighData.gateCameraId = params.gateCameraId;
        this.weighData.equipmentCode = params.gateCameraCode;
        this.weighCode = params.weighCode;
        this.weighHouseCode = params.weighHouseCode;
    },
    data() {
        return {
@@ -60,11 +63,12 @@
                carNo: '',
                gateCameraId: '',
                equipmentCode: '',
                weigh: '',
                weigh: 0,
                tmCode: ''
            },
            takeCoalId: null,
            weighCode: '',
            weighHouseCode: '',
            isConfirmWeighLoading: false, //确定称重按钮
            realTimeWeigh: '',
            weighList: {},
            webSocket: null // webSocket实例
@@ -87,6 +91,15 @@
    computed: {
        token() {
            return uni.getStorageSync('token');
        },
        addAndSubtractCoalDisabled() {
            if (this.weighList.orderTye == '外销') {
                if (this.weighList.skin == 0) {
                    return true;
                } else if (this.weighList.skin != 0) {
                    return false;
                }
            }
        }
    },
    methods: {
@@ -107,10 +120,58 @@
         * @确认称重等待后端提供实时称重接口,获取皮重,毛重
         */
        confirmWeigh() {
            console.log('确认称重', this.weighData);
            this.$reqPost('saveWeigh',this.weighData,'json').then(res=>{
                console.log(res,"确认称重");
            })
            if (this.isConfirmWeighLoading == false) {
                this.isConfirmWeighLoading = true;
                if (this.weighData.weigh != 0) {
                    if (this.weighList.orderTye == '外销') {
                        if (this.weighList.skin ? (this.weighList.skin < this.realTimeWeigh ? true : false) : true) {
                            this.saveWeigh();
                        } else {
                            this.$u.toast('毛重不能小于皮重');
                            this.isConfirmWeighLoading = false;
                        }
                    } else {
                        this.saveWeigh();
                    }
                } else {
                    this.$u.toast('未能获取地磅重量');
                    this.isConfirmWeighLoading = false;
                }
            }
        },
        // 确认称重接口
        saveWeigh() {
            this.$reqPost('saveWeigh', this.weighData, 'json')
                .then(res => {
                    if (res.code == 0) {
                        this.$u.toast('称重成功');
                        setTimeout(() => {
                            uni.navigateBack({
                                delta: 1
                            });
                            this.isConfirmWeighLoading = false;
                        }, 1000);
                    }
                })
                .catch(err => {
                    this.isConfirmWeighLoading = false;
                    console.log(err);
                });
        },
        // 加减煤
        addAndSubtractCoal() {
            this.$reqPost('addAndSubtractCoal', { deptId: this.weighData.deptId, sceneId: this.weighData.sceneId, carNo: this.weighData.carNo }, 'json').then(res => {
                if (res.code == 0) {
                    this.$u.toast('操作成功,即将返回上一页')
                    setTimeout(() => {
                        uni.navigateBack({
                            delta: 1
                        });
                        this.isConfirmWeighLoading = false;
                    }, 1000);
                    console.log(res, '加减煤');
                }
            });
        },
        /**
         * 初始化 weoSocket
@@ -131,18 +192,21 @@
                console.log('onOpen');
            });
            socket.onMessage(res => {
                // 获取服务器传来的数据,做相应处理
                console.log('socketWeigh', res);
                let nowWeigh = JSON.parse(res.data.slice(7)).weigh;
                // if (nowWeigh.eqCode == this.weighCode) {
                //     this.weighData.weigh = this.realTimeWeigh = nowWeigh;
                // }
                this.weighData.weigh = this.realTimeWeigh = nowWeigh;
            }); // 获取服务器传来的数据,做相应处理
                let nowWeighHouseCode = JSON.parse(res.data.slice(7)).eqCode;
                if (nowWeighHouseCode == this.weighHouseCode) {
                    this.weighData.weigh = this.realTimeWeigh = nowWeigh;
                }
            });
            socket.onClose(() => {
                console.log('close');
                console.log('webSocketClose');
                this.$u.toast('磅房接口终端');
            });
            socket.onError(err => {
                console.log('socket报错', err);
                this.$u.toast('磅房接口暂时不能使用,请重新进入该页面,重试!!');
            });
        }
    }
pages/driver-page/driver-index/driver-index.vue
@@ -126,7 +126,8 @@
            // 抢单模态框
            qiangDanShow: false,
            qiangDanTitle: '抢单提示',
            qiangDanContent: ''
            qiangDanContent: '',
            qiangDanOrderPlanId:null
        };
    },
    onShow() {
@@ -141,22 +142,26 @@
            uni.showLoading({
                title: '加载中...'
            });
            // this.$reqGet('qiangDanList', { id: customerId }).then(res => {
            this.$reqGet('qiangDanList').then(res => {
                console.log('抢单列表', res);
                uni.hideLoading();
                this.driverBillOfLoadingData = res.data;
            });
        },
        // 抢单按钮
        qiangDanBtn(value) {
            if (value.taskNum == 0) {
            if (value.tmcCount == 0) {
                this.qiangDan(value.orderPlanId);
            } else {
                this.qiangDanOrderPlanId = value.orderPlanId
                this.qiangDanShow = true
                this.qiangDanContent = `已抢${value.tmcCount}单,确定抢单?`
            }
        },
        // 抢单模态框
        qiangDanConfirm() {},
        qiangDanConfirm() {
            this.qiangDanContent = ''
            this.qiangDan(this.qiangDanOrderPlanId);
        },
        qiangDanCancel() {
            this.qiangDanShow = false;
        },
pages/driver-page/drvier-my/drvier-my.vue
@@ -38,10 +38,14 @@
                    <u--input border="none" inputAlign="right" disabled disabledColor="#fff"></u--input>
                </u-form-item>
                <u-form-item labelWidth="20%" label="车辆照片" ref="item1">
                    <u--image :showLoading="true" :src="BaseUrl + userInfo.carImg" width="80px" height="80px" @click="imageClick(1)"></u--image>
                    <u--image :showLoading="true" :src="userInfo.carImg != null ? BaseUrl + userInfo.carImg : ''" width="80px" height="80px" @click="imageClick(1)">
                        <view slot="error" style="font-size: 24rpx;">加载失败</view>
                    </u--image>
                </u-form-item>
                <u-form-item labelWidth="25%" label="行驶证照片" ref="item1">
                    <u--image :showLoading="true" :src="BaseUrl + userInfo.drivingImg" width="80px" height="80px" @click="imageClick(2)"></u--image>
                    <u--image :showLoading="true" :src="userInfo.drivingImg != null ? BaseUrl + userInfo.drivingImg : ''" width="80px" height="80px" @click="imageClick(2)">
                        <view slot="error" style="font-size: 24rpx;">加载失败</view>
                    </u--image>
                </u-form-item>
            </u--form>
            <view class="push-information-button">
@@ -53,7 +57,7 @@
        <!-- 图片预览弹出框 -->
        <view class="previewImage-container">
            <u-popup :show="previewImageShow" mode="center" @close="previewImageClose" @open="previewImageOpen">
                <u--image :src="BaseUrl + previewImageSrc" width="400px" height="400px"></u--image>
                <u--image :src="previewImageSrc!=null?BaseUrl + previewImageSrc:''" width="400px" height="400px"></u--image>
            </u-popup>
        </view>
@@ -106,7 +110,7 @@
                drivingImg: '',
                axleNum: '',
                weight: '',
                userId:''
                userId: ''
            },
            src: '',
            fileList1: [],
@@ -135,11 +139,9 @@
                title: '加载中...'
            });
            this.$reqGet('getUserEntity').then(res => {
                console.log(res, '司机详情');
                uni.hideLoading();
                this.userInfo = res.data;
                Object.keys(this.editUserInfo).map(item => {
                    console.log(res.data[item]);
                    if (res.data[item]) {
                        this.editUserInfo[item] = res.data[item];
                    }