qingyiay
2023-09-26 97d88adcdfa7e13b2203c8716c02866fae087704
修改磅房忙碌问题及其他问题
5个文件已修改
29 ■■■■ 已修改文件
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/login/login.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/login/userPassword.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/tabbar-page/index-tabbar/index-tabbar.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
store/index.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -130,7 +130,7 @@
                                height="150"
                                :previewFullImage="true"
                                :disabled="isModifyoriginInfo"
                                :deletable='!deletable'></u-upload>
                                :deletable="!deletable"></u-upload>
                        </u-form-item>
                    </u-form>
                    <view class="submit-button">
@@ -241,7 +241,7 @@
        </view>
        <!-- 磅房忙碌提示弹窗 -->
        <view class="">
            <u-modal :show="wsgVisiable"
            <u-modal :show="wsgShow"
                title="提示"
                :content="wsgContent"
                @confirm="wsgContentConfirm"></u-modal>
@@ -269,7 +269,9 @@
                this.getWeightHouseObj.overTmWaixiao = value.overTmWaixiao
            }
            this.fileList1 = []
            this.changeglobalIsFirstWeighing(1)
            if (this.globalIsFirstWeighing === 1) {
                console.log('获取详情 onload');
                this.getTakeCoal(); //获取提煤单详情
            }
            this.init(); //获取日志
@@ -277,6 +279,7 @@
        onShow() {
            this.coalDayPage(); //获取日志 定时任务
            if (this.globalIsFirstWeighing === 2) {
                console.log('获取详情 onShow');
                this.getTakeCoal(); //获取提煤单详情
            }
        },
@@ -400,9 +403,18 @@
                    }
                },
                timeout: '0',
                wsgShow: false
            };
        },
        watch: {
            '$store.state.wsgVisiable': {
                deep: true,
                handler: function(val) {
                    this.wsgShow = val
                }
            }
        },
        computed: {
            ...mapState(['globalweigh', 'globalinfraredStatus', 'wsgVisiable', 'wsgContent', 'globalIsFirstWeighing']),
            name() {
pages/login/login.vue
@@ -141,9 +141,7 @@
                                this.setUserTabbar(res.data.type);
                                uni.setStorageSync('roleType', res.data.type);
                                uni.setStorageSync("userId", res.data.userId)
                                if (res.data.carNo) {
                                    uni.setStorageSync("carNo", res.data.carNo)
                                }
                                uni.setStorageSync("carNo", res.data.carNo)
                                setCustomerId(res.data.customerid);
                                uni.hideLoading();
                                //跳转页面
pages/login/userPassword.vue
@@ -89,6 +89,7 @@
                                        this.setUserTabbar(res.data.type);
                                        uni.setStorageSync('roleType', res.data.type);
                                        uni.setStorageSync("userId", res.data.userId)
                                        uni.setStorageSync("carNo", res.data.carNo)
                                        setCustomerId(res.data.customerid);
                                        setName(res.name);
                                        uni.hideLoading();
pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -191,9 +191,10 @@
                    }
                } else if (v.startsWith('wsg')) {
                    let wsgObj = JSON.parse(v.slice(5));
                    if (uni.getStorageInfoSync('carNo') === wsgObj.carNo) {
                        changewsgVisiable(true)
                        changewsgContent(wsgObj.content)
                    console.log(uni.getStorageSync('carNo'), wsgObj.carNo);
                    if (uni.getStorageSync('carNo') === wsgObj.carNo) {
                        this.changewsgVisiable(true)
                        this.changewsgContent(wsgObj.content)
                    }
                }
            }
store/index.js
@@ -249,6 +249,7 @@
                    console.log('ws失败');
                    commit('changereconnectState', false)
                    dispatch('reconnect')
                    commit('changeisconnect', false)
                }
            })
            state.socketTast.onOpen(() => dispatch('websocketOnOpen'))