~wangchengrui/unattended-app.git

			@@ -51,18 +51,18 @@
			</view>
			<view class="main-information"
			v-if="weighList.orderType!=='转入'\|\|weighList.orderType!=='转出'">
			<view class="prefix">矿场:</view>
			<view class="prefix">仓库:</view>
			<view class="suffix">{{ weighList.deptName \|\| '' }}</view>
			</view>
			<view class="main-information"
			v-if="weighList.orderType!=='转入'\|\|weighList.orderType!=='转出'">
			<view class="prefix">煤场:</view>
			<view class="prefix">基地:</view>
			<view class="suffix">{{ weighList.filedName \|\| '' }}</view>
			</view>
			<view class="main-information">
			<!-- <view class="main-information">
			<view class="prefix">煤种名称:</view>
			<view class="suffix">{{ weighList.coalName \|\| '' }}</view>
			</view>
			</view> -->
			<view class="main-information">
			<view class="prefix">订单类型:</view>
			<view class="suffix">{{ weighList.orderType \|\| '' }}</view>
			@@ -104,7 +104,7 @@
			<!-- 外销订单称皮时，返回加减吨按钮置灰。称毛时可用.外购订单，不出现返回加减吨的按钮 -->
			<u-button type="primary"
			text="确定称重"
			:disabled="realTimeWeigh == 0 \|\| globalinfraredStatus \|\| isweigh "
			:disabled="realTimeWeigh == 0 \|\| globalinfraredStatus \|\| isweigh \|\|globalWarning"
			:loading="isConfirmWeighLoading"
			loadingText="确认"
			@click="confirmWeigh"></u-button>
			@@ -252,11 +252,10 @@
			},
			onShow() {
			this.init();
			this.changeisLogin(true)
			// this.realTimeWeigh = 0
			},
			computed: {
			...mapState(['globalweigh', 'globalinfraredStatus']),
			...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning']),
			token() {
			return uni.getStorageSync('token');
			},