~fyy/unattended-app.git

			@@ -103,7 +103,7 @@
			<!-- .外购订单，不出现返回加减吨的按钮 -->
			<u-button type="primary"
			text="确定称重"
			:disabled="realTimeWeigh == 0 \|\| globalinfraredStatus \|\| isweigh \|\|globalWarning"
			:disabled="realTimeWeigh == 0 \|\| globalinfraredStatus \|\| isweigh \|\|globalWarning \|\| weighList.isReWeigh == 1"
			:loading="isConfirmWeighLoading"
			loadingText="确认"
			@click="confirmWeigh"></u-button>
			@@ -119,7 +119,7 @@
			:loading="UnloadingAgainLoading"
			loadingText="确认"
			:disabled="isweigh\|\|realTimeWeigh == 0"
			v-if='canUnload && !isJixuxiehuo'></u-button>
			v-if='canUnload && isJixuxiehuo'></u-button>
			<!-- 放空 -->
			<u-button type="primary"
			text="放空"
			@@ -322,7 +322,6 @@
			...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning', 'globalisconnect', 'globalisUploadimg',
			'globalisLogin', 'socketTask','is_open_socket'
			]),
			...mapGetters(['yuanFaList']),
			token() {
			return uni.getStorageSync('token');
			},
			@@ -415,11 +414,9 @@
			}
			},
			isJixuxiehuo() { //是否显示继续卸货按钮
			console.log(this.yuanFaList,'this.yuanFaList====是否显示继续卸货')
			console.log(this.$store.getters.yuanFaList,'yuanFaList====getters')
			console.log(this.weighList?.tmTaskCoalItems,'this.weighList?.tmTaskCoalItems')
			if(this.weighList?.tmTaskCoalItems && this.weighList?.tmTaskCoalItems.length > 0 && this.yuanFaList && this.yuanFaList.length > 0) {
			return this.weighList?.tmTaskCoalItems.length == this.yuanFaList.length
			if(this.weighList?.tmTaskCoalItems && this.weighList?.tmTaskCoalItems.length > 0) {
			return this.weighList?.tmTaskCoalItems.length > 0
			}else {
			return false
			}
			@@ -445,6 +442,7 @@
			this.outBuy = (this.weighList.orderType.indexOf('销') !== -1) && this.showWeigh.skin > 0;
			// 继续卸货只有外购类型第二次会有
			this.canUnload = this.weighList.orderType === '外购' && this.showWeigh.hair > 0;
			console.log(this.canUnload,'this.canUnload====')
			}
			});
			},
			@@ -535,7 +533,6 @@
			carNo: this.weighData.carNo,
			tmId: this.weighData.tmId,
			filedId: this.weighData.filedId,
			tmId: this.weighData.tmId,
			gateCameraId: this.weighData.gateCameraId,
			equipmentCode: this.weighData.equipmentCode,
			tmCode: this.weighData.tmCode,
			@@ -551,7 +548,7 @@
			});
			}, 1000);
			} else {
			this.$u.toast('操作失败，请稍候重试');
			this.$u.toast(res.msg);
			}
			})
			},