qingyiay
2023-04-10 7406be32979e90a730b5a2ac8d392892f71835d2
修复称重不显示问题,优化信息提示
12个文件已修改
76 ■■■■■ 已修改文件
pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/customer-page/customer-index/customer-index.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/customer-page/customer-my/customer-my.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/customer-page/fleet-management/fleet-management.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/appointment/appointment.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/driver-index/driver-index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver.vue
@@ -94,7 +94,7 @@
                    });
                } else {
                    uni.showToast({
                        title: res.msg,
                        title: res.msg ? 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.carNum != 0" shape="circle"></u-button>
                        <u-button text="转发" type="primary" @tap.stop="forwardClick(item)" shape="circle" v-if="item.cars2 != 0"></u-button>
                        <u-button @tap.stop="receiveClick(item)" text="领取" type="primary" v-if="item.carNum - item.cars2 != 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>
@@ -34,7 +34,7 @@
                                <text class="lingqu" @tap.stop="numInput(item.id)">{{ item.receiveNum || '_______' }}</text>
                                张
                            </view> -->
                            <view v-if="item.cars == item.cars2 ? false : true">剩余{{ item.carNum - item.cars2 }}张</view>
                            <view v-if="item.carNum == item.cars2 ? false : true">剩余{{ item.carNum - item.cars2 }}张</view>
                            <view v-else>已领完</view>
                        </view>
                    </view>
@@ -188,7 +188,7 @@
                            duration: 1000
                        });
                    } else {
                        this.$u.toast(res.data ? res.data : '领取失败');
                        this.$u.toast(res.msg ? res.msg : '领取失败');
                    }
                });
            } else {
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
@@ -97,7 +97,7 @@
                    this.yyDailyList = res.data.yyDailyList;
                    uni.hideLoading();
                } else {
                    this.$u.toast('服务器错误,请稍后重试');
                    this.$u.toast('加载失败,请稍后重试');
                    uni.hideLoading();
                }
            });
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
@@ -81,6 +81,8 @@
                    this.orderPlanDetail = res.data;
                    this.yyDailyList = res.data.yyDailyList.filter((v, i) => i == this.index);
                    uni.hideLoading();
                } else {
                    this.$u.toast('加载失败');
                }
            });
        }
pages/customer-page/customer-my/customer-my.vue
@@ -182,7 +182,7 @@
                    this.$u.toast('添加成功');
                    this.getFleet();
                } else {
                    this.$u.toast(res.data ? res.data : '添加失败');
                    this.$u.toast(res.msg ? res.msg : '添加失败');
                }
            });
            this.updateGroupShow = false;
@@ -247,6 +247,8 @@
                console.log('删除车队', res);
                if (res.code == 0) {
                    this.$u.toast('删除成功');
                } else {
                    this.$u.toast(res.msg ? res.msg : '删除失败');
                }
                uni.hideLoading();
                this.getFleet();
pages/customer-page/fleet-management/fleet-management.vue
@@ -121,7 +121,7 @@
                    });
                } else {
                    uni.showToast({
                        title: '删除失败',
                        title: res.msg ? res.msg : '删除失败',
                        duration: 2000
                    });
                }
pages/driver-page/appointment/appointment.vue
@@ -78,6 +78,8 @@
                uni.hideLoading();
                if (res.code == 0) {
                    this.yuYueData = res.data;
                } else {
                    this.$u.toast('加载失败');
                }
            });
        },
@@ -116,7 +118,9 @@
            this.rcsqData.filedId = value.filedId;
            this.$reqPost('saveRCSQ', this.rcsqData, 'json').then(res => {
                if (res.code == 0) {
                    this.$u.toast('新建入场申请成功。');
                    this.$u.toast('入场申请成功');
                } else {
                    this.$u.toast('入场申请失败,请稍后重试');
                }
            });
        }
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -303,10 +303,10 @@
            this.$reqPost('getOneEvacuation', mix, 'json').then(res => {
                console.log(res, '第一次放空');
                if (res.code == 0) {
                    this.$u.toast('已放空');
                    this.$u.toast('操作成功');
                    this.evacuationModalShow = false;
                } else {
                    this.$u.toast('放空失败,请稍后重试');
                    this.$u.toast('操作失败,请稍后重试');
                    this.evacuationModalShow = false;
                }
            });
pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill.vue
@@ -44,6 +44,8 @@
                console.log('获取提煤单详情', res);
                if (res.code == 0) {
                    this.coalData = res.data[0];
                } else {
                    this.$u.toast('加载失败');
                }
            });
        }
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -47,7 +47,7 @@
            ></u-button>
            <u-button type="primary" text="返回加减吨" :disabled="addAndSubtractCoalDisabled" @click="addAndSubtractCoal" class="jiajian"></u-button>
        </view>
        <view class="four" v-if="weighList.orderTye == '外销'">如您需要调整装载货品吨数,请点击返回加减吨</view>
        <view class="four" v-if="weighList.orderTye !== '外购'">如您需要调整装载货品吨数,请点击返回加减吨</view>
        <!-- 放空弹窗 -->
        <view class="evacuationModal">
            <u-modal
@@ -112,25 +112,29 @@
            infraredStatus: false, // 红外状态,
            // 放空控制
            evacuationModalShow: false,
            evacuationTitle: '第二次放空确认',
            evacuationTitle: '放空确认',
            evacuationContent: '是否确认放空'
        };
    },
    watch: {
        realTimeWeigh(newV, oldV) {
            if (this.weighList.orderTye == '外销') {
            if (this.weighList.orderTye == '外销' || this.weighList.orderTye == '内销') {
                if (this.weighList.skin == 0) {
                    this.temporaryWeighObj.skin = this.realTimeWeigh;
                    // this.temporaryWeighObj.skin = this.realTimeWeigh;
                    this.temporaryWeighObj.skin = newV;
                } else {
                    this.temporaryWeighObj.hair = this.realTimeWeigh;
                    // this.temporaryWeighObj.hair = this.realTimeWeigh;
                    this.temporaryWeighObj.hair = newV;
                    this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(2);
                }
            } else if (this.weighList.orderTye == '外购') {
            } else if (this.weighList.orderTye == '外购' || this.weighList.orderTye == '转出') {
                if (this.weighList.hair == 0) {
                    this.temporaryWeighObj.hair = this.realTimeWeigh;
                    // this.temporaryWeighObj.hair = this.realTimeWeigh;
                    this.temporaryWeighObj.hair = newV;
                } else {
                    this.temporaryWeighObj.skin = this.realTimeWeigh;
                    this.temporaryWeighObj = this.weighList.hair - this.temporaryWeighObj.skin;
                    // this.temporaryWeighObj.skin = this.realTimeWeigh;
                    this.temporaryWeighObj.skin = newV;
                    this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(2);
                }
            }
        }
@@ -145,14 +149,15 @@
        },
        // 加减煤按钮禁用与否
        addAndSubtractCoalDisabled() {
            if (this.weighList.orderTye == '外销') {
                if (this.weighList.skin == 0) {
            if (this.weighList.orderTye == '外销' || this.weighList.orderTye == '内销' || this.weighList.orderTye == '转出') {
                if (this.weighList.hair == 0) {
                    return true;
                } else if (this.weighList.skin != 0) {
                } else if (this.weighList.hair != 0) {
                    return false;
                }
            }
        },
        // 是否放空按钮禁用
        isEvacuation() {
            if (this.weighList.hair == this.weighList.skin || this.temporaryWeighObj.skin == this.temporaryWeighObj.hair) {
                return false;
@@ -237,7 +242,7 @@
         */
        initWebSocket() {
            let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`;
            socket = uni.connectSocket({
            let socket = uni.connectSocket({
                url: wsUrl,
                header: {
                    CLIENT_TOC: 'Y'
@@ -253,7 +258,9 @@
            socket.onMessage(res => {
                console.log('socketWeigh', res);
                let nowWeighObj = JSON.parse(res.data.slice(7));
                if (nowWeighObj.eqCode == this.weighHouseCode) {
                console.log(nowWeighObj);
                // 一开始是weighHouseCode
                if (nowWeighObj.eqCode == this.weighData.equipmentCode) {
                    if (nowWeighObj.eqInfraredStatus) {
                        this.infraredStatus = true;
                        this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
@@ -264,12 +271,13 @@
                }
            });
            socket.onClose(() => {
                uni.closeSocket();
                console.log('webSocketClose');
                this.$u.toast('磅房接口终端');
                this.$u.toast('磅房已关闭');
            });
            socket.onError(err => {
                console.log('socket报错', err);
                this.$u.toast('磅房接口暂时不能使用,请重新进入该页面,重试!!');
                this.$u.toast('磅房暂时不能使用,请重新进入该页面,重试!!');
            });
        },
        // 放空
pages/driver-page/driver-index/driver-index.vue
@@ -206,7 +206,7 @@
                    if (res.code == 0) {
                        this.$u.toast('抢单成功');
                    } else {
                        this.$u.toast(res.data ? res.data : '抢单失败');
                        this.$u.toast(res.msg ? res.msg : '抢单失败');
                    }
                })
                .then(() => {
pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
@@ -146,6 +146,8 @@
                console.log('删除车队', res);
                if (res.code == 0) {
                    this.$u.toast('删除成功');
                } else {
                    this.$u.toast(res.msg ? res.msg : '删除失败');
                }
                uni.hideLoading();
                this.getFleet();