Merge remote-tracking branch 'origin/master'

components/dialog-turnoverApplication/dialog-turnoverApplication.vue

@@ -1,11 +1,11 @@
 <template>
 	<dialog-base ref="baseDialog" title="周转申请">
 		<view class="list-container">
-			<view class="list-title"><text class="label">请选择周转类型</text></view>
+			<view ><text  style="margin: 0 0 0 5rpx;">请选择周转类型</text></view>
 			<view class="btn uni-row">
 				<view v-for="(item,index) in turnoverType"
 					:class="{ 'middle-btn': true, 'active': item.dictValue == curDayworkItem.turnoverType }"
-					@click="selectTurnoverType(item)"><text class="label">{{item.dictLabel}}</text></view>
+					@click="selectTurnoverType(item)"><text class="label" style="font-size: 30rpx;">{{item.dictLabel}}</text></view>
 			</view>
 			<view class="" style="margin: 0 20rpx 20rpx 0;width: 88%;" >
 				<uni-section title="请选择下序工段" title-font-size="32rpx" style="margin: 0 0 0 -16rpx;" v-if="curDayworkItem.turnoverType == '1'">
@@ -19,19 +19,19 @@
 						style="margin: 0 0 0 16rpx;outline: 2rpx solid #999999;border-radius: 10rpx;"></uni-data-select>
 				</uni-section>
 			</view>
-			<view class="list-title">
-				<text class="label">请选择您摆放位置</text>
+			<view >
+				<text style="margin: 0 0 0 5rpx;">请选择您摆放位置</text>
 			</view>
 			<view class="turnArea uni-row" v-if="curDayworkItem.turnoverType == '1'">
 				<view v-for="(item,index) in turnAreaList" class="btn">
 					<view :class="{ 'middle-btn': true, 'active': handleTurnoverDoor(item) }"
-						@click="selectTurnoverDoor(item)"><text class="label">{{item.code}}</text></view>
+						@click="selectTurnoverDoor(item)"><text class="label" style="font-size: 30rpx;">{{item.code}}</text></view>
 				</view>
 			</view>
 			<view class="turnArea uni-row" v-if="curDayworkItem.turnoverType == '2'">
 				<view v-for="(item,index) in turnoverArea" class="btn">
 					<view :class="{ 'middle-btn': true, 'active': handleTurnoverDoor(item) }"
-						@click="selectTurnoverDoorOutside(item)"><text class="label">{{item.code}}</text></view>
+						@click="selectTurnoverDoorOutside(item)"><text class="label" style="font-size: 30rpx;">{{item.code}}</text></view>
 				</view>
 			</view>
 		</view>

pages/addNewBatch/index.vue

@@ -318,6 +318,7 @@
 			dayWork.value.furnaceNoInfo = furnaceInfo.value
 			basicInfo.value = dayWork.value.furnaceNoInfo
 		}
+		console.log(basicInfo.value)
 	}
 	function iconClick() {
 		checkLotCode(inpValue.value);
@@ -521,7 +522,7 @@
 			})
 			return;
 		}
-		if(basicInfo.value ==null) {
+		if(basicInfo.value) {
 			uni.showToast({
 				icon: 'none',
 				title: '请选择炉号再开始批次'

pages/batchReporting/index.vue

@@ -187,7 +187,7 @@
 
 	onLoad(() => {
 		curPlan.value = store.planDetails;
-
+				normalStatus.value = true;
 		console.log(curPlan.value)
 		//废品回用的领料部门如果是当前工段，也要可以开始新批次
 		//查找当前计划单下的批次废品回用是当前工段
@@ -269,10 +269,15 @@
 		getDayWorkList(reqData).then(res => {
 			if (res.code == 200) {
 				tempList.value = res.data
+				if(normalStatus.value) {
 				listData.value = res.data.filter(item => {
 					return item.isWasteRecycling == 0 && item.isAmend == 0;
 				});
-				normalStatus.value = true;
+				}else {
+					listData.value = res.data.filter(item => {
+						return item.isWasteRecycling == 1 || item.isAmend == 1;
+				})
+				}
 				for (let i = 0; i < listData.value.length; i++) {
 					if (listData.value[i].prevProcess) {
 						let sum = 0;