Merge remote-tracking branch 'origin/master'

pages/batchReporting/index.vue

@@ -67,7 +67,7 @@
 				<view class="item-info uni-row">
 					<text class="label">投入数</text>
 					<text
-						class="label right">{{item['processQualifiedNum'] == 0 ?  item['productionQuantity']  : item['processQualifiedNum']}}</text>
+						class="label right">{{ item.prevProcess == null ? item['productionQuantity']  : item['processQualifiedNum']}}</text>
 				</view>
 				<view class="item-info uni-row">
 					<text class="label">上道工序</text>
@@ -403,7 +403,9 @@
 						return;
 					}
 					*/
-					let vehicleObj = { carrierCode: ret.resp_result};
+					let vehicleObj = {
+						carrierCode: ret.resp_result
+					};
 					if (!vehicleObj.carrierCode || vehicleObj.carrierCode == "") {
 						uni.showToast({
 							icon: "none",

pages/sorting/form.vue

@@ -79,7 +79,10 @@
 			</view>
 
 			<view class="btns-container uni-row">
-				<view class="bottom-btn left-btn " @click="handleChangeCarrier">更换载具</view>
+				<!-- 最后一步完成不能更换载具 -->
+				<view v-if="dayworkItem.daywork != null && dayworkItem.daywork.status != 2" class="bottom-btn left-btn "
+					@click="handleChangeCarrier">
+					更换载具</view>
 				<view v-if="checkFinishable()&&Number(dayworkItem.status) < 3" class="finished-btn"
 					@click.stop="handleFinishDaywork">结束报工</view>
 				<view v-if="!checkFinishable()&&Number(dayworkItem.status) < 3" class="pause-btn"
@@ -247,7 +250,8 @@
 			success: function(res) {
 				if (res.confirm) {
 					dayworkItem.value.rejectNum = dayworkItem.value.rejectNum - tempInfo.rejectNum
-					dayworkItem.value.qualifiedNum = parseInt(dayworkItem.value.qualifiedNum) + parseInt(tempInfo.rejectNum)
+					dayworkItem.value.qualifiedNum = parseInt(dayworkItem.value.qualifiedNum) + parseInt(
+						tempInfo.rejectNum)
 					unfitInfos.value.splice(index, 1)
 				} else if (res.cancel) {
 					return