提交

pages/sortBatchReporting/index.vue

@@ -244,13 +244,22 @@
 			deptId: store.curDeptDetails.deptId,
 			keywords: keywords.value
 		};
-		normalStatus.value = true;
+		// normalStatus.value = true;
 		getDayWorkList(reqData).then(res => {
 			if (res.code == 200) {
 				tempList.value = res.data
-				listData.value = res.data.filter(item => {
-					return item.isWasteRecycling == 0 && item.isAmend == 0;
-				});
+				if (normalStatus.value) {
+					listData.value = res.data.filter(item => {
+						return item.isWasteRecycling == 0 && item.isAmend == 0;
+					});
+				} else {
+					listData.value = res.data.filter(item => {
+						return item.isWasteRecycling == 1 || item.isAmend == 1;
+					})
+				}
+				// listData.value = res.data.filter(item => {
+				// 	return item.isWasteRecycling == 0 && item.isAmend == 0;
+				// });
 				for (let i = 0; i < listData.value.length; i++) {
 					if (listData.value[i].prevProcess) {
 						let sum = 0;

pages/sorting/form.vue

@@ -65,7 +65,7 @@
 					v-model="dayworkItem.qualifiedNum" />
 				<span v-else>{{ dayworkItem.qualifiedNum }}</span>
 				<view class="label" style="text-align: right; padding-right: 24rpx">废品量</view>
-				<input v-if="Number(dayworkItem.status) < 3" type="number" placeholder="请输入废品量"
+				<input v-if="Number(dayworkItem.status) < 3" :disabled="true" type="number" placeholder="请输入废品量"
 					v-model="dayworkItem.rejectNum" />
 				<span v-else>{{ dayworkItem.rejectNum }}</span>
 			</view>