qingyiay
2023-09-21 c234dffcd3adaf7b8d87a5a8301871493c0cadbd
修改皮重异常弹窗不正确弹出
3个文件已修改
24 ■■■■■ 已修改文件
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -360,7 +360,8 @@
                        this.primaryClean = this.coalDetailsData.cleanTwo;
                        // 入门证 和 出门证 是否显示
                        this.ablePrintInduction = this.coalDetailsData.hair || this.coalDetailsData.skin
                        this.ablePrintOut = this.coalDetailsData.hair && this.coalDetailsData.skin
                        this.ablePrintOut = this.coalDetailsData.hair && this.coalDetailsData.skin || this
                            .coalDetailsData.status === 6
                    } else {
                        this.$u.toast('加载失败');
                    }
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -549,6 +549,7 @@
                                let yy = new BigNumber(this.globalweigh)
                                if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
                                    this.abnormalModalShow = true
                                    this.skinAbnormal()
                                } else {
                                    this.saveWeigh();
                                }
@@ -566,6 +567,7 @@
            // 确认称重接口
            saveWeigh() {
                this.weighData.coalContactClean = this.coalContactClean;
                console.log(this.weighData);
                this.$reqPost('saveWeigh', this.weighData, 'json')
                    .then(res => {
                        console.log(res, '称重接口');
@@ -682,13 +684,11 @@
            // 提交异常原因
            abnormalConfirm() {
                this.weighData.abnormalText = this.abnormalContent
                this.skinAbnormal()
                this.saveWeigh()
                this.abnormalModalShow = false
            },
            skinAbnormal() {
                this.$reqPost('skinAbnormal', { sceneId: this.weighData.sceneId }, 'params').then(() => {
                    this.abnormalModalShow = false
                })
                this.$reqPost('skinAbnormal', { sceneId: this.weighData.sceneId, tmId: this.weighData.tmId }, 'params')
            },
            mergeStateChange(e) {
                if (e.length !== 0) {
pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue
@@ -53,7 +53,7 @@
                        @click.stop="loadOrder(item.id)"
                        :loading="loading"
                        loadingText="确认"
                        v-if='item.isPretendDischar===0'></u-button>
                        v-if='!item.ableDischar'></u-button>
                </view>
            </view>
        </view>
@@ -77,7 +77,7 @@
                loading: false,
                id: "",
                coalStatus: ['领取', '预约', '签到', '入场', '称皮', '称毛', '离场', '入磅房', '出磅房', '入煤仓', '出煤仓', '放空', '作废', '入场申请',
                    '进入场院', '异常审核中'
                    '进入场院', '异常审核中',
                ], // 状态
            }
        },
@@ -93,7 +93,14 @@
                this.$reqGet('getAccordingCoalNameAll', { coalName: this.name }).then(res => {
                    uni.hideLoading()
                    if (res.code === 0) {
                        this.detailData = res.data
                        const errorStatusArr = [0, 1, 2, 3, 6, 11, 12, 13];
                        this.detailData = res.data.map(v => {
                            return {
                                ...v,
                                ableDischar: v.skin === v.hair || v.hair === 0 && v.skin === 0 || v
                                    .isPretendDischar !== 0 || errorStatusArr.indexOf(v.status) !== -1
                            }
                        })
                    } else {
                        this.$u.toast('加载失败')
                    }