1.18

components/dialog-end-work/dialog-end-work.vue

@@ -151,7 +151,7 @@
 
 	function handleInputRejectNum() {
 		for (let i = 0; i < wasteInfo.value.length; i++) {
-			wasteInfo.value[i].rejectNum = wasteInfo.value[i].rejectNum.replace(/^0+|^-|[^\d]/g, '');
+			wasteInfo.value[i].rejectNum = wasteInfo.value[i].rejectNum.replace(/^-|[^\d]/g, '');
 		}
 	}
 

components/dialog-selectEquipment/dialog-selectEquipment.vue

@@ -26,7 +26,7 @@
 		</view>
 		<view class="userList" v-if="flag">
 			<uni-easyinput class="uni-mt-5" v-model="userName" placeholder="请输入协作者编号"
-			@input="debounce(handleSearchUserName,500)" @blur="handleBlur"></uni-easyinput>
+				@input="debounce(handleSearchUserName,500)" @blur="handleBlur"></uni-easyinput>
 
 			<view class="uni-row showUser">
 				<view v-for="(item,index) in userList">
@@ -36,7 +36,7 @@
 		</view>
 		<view class="uni-row selectedUserList">
 			<view class="selectedUser uni-row" v-for="(item,index) in selectedUserList">
-				<view >{{item.nickName}}</view>
+				<view>{{item.nickName}}</view>
 				<view v-if="selectedUserList.length > 0" @click="handleRemoveUserName(item)">×</view>
 			</view>
 		</view>
@@ -116,53 +116,56 @@
 		}).then(res => {
 			console.log(res)
 			if (res.code == 200) {
-				for (var i = 0; i < res.data.length; i++) {
+				//过滤出工序交集
+				let filteredData = res.data.filter((item1) =>
+					store.dayworkInfo.processSequence.some((item2) => item2.processCode === item1.processCode)
+				);
+				for (let i = 0; i < filteredData.length; i++) {
 					processList.value[i] = {
-						text: res.data[i].processAlias,
-						value: res.data[i].processId
+						text: filteredData[i].processAlias,
+						value: filteredData[i].processId
 					}
-				};
-
-				selectedProcess.value = res.data[0].processId;
-			}
+				}
+				selectedProcess.value = filteredData[0].processId;
+			} 
 		})
-		
+
 		Promise.all([getEquipmentByUidAndDid(store.userInfo.userId, store.curDeptDetails.deptId), getDayWorkItemList({
-			userId: store.userInfo.userId,
-			dayworkId: store.dayworkInfo.id,
-			status: 1
-		})])
-		.then(([equipmentRes, response]) => {
-			console.log(equipmentRes)
-			console.log(response.rows)
-			if (equipmentRes.code == 200 && response.code == 200) {
-				let equipmentListData = equipmentRes.rows.filter((equipment) => {
-					return !response.rows.some((item) => item.equipmentDetailId == equipment.commonId);
-				});
-				equipmentList.value = equipmentListData.map((equipment) => {
-					return {
-						text: equipment.commonCode,
-						value: equipment
-					}
-				});
-				selectedEquipment.value = equipmentListData.length > 0 ? equipmentListData[0] : null;
-			}
-			baseDialog.value.open()
-		});
-	// 					for (let i = 0; i < equipmentList.value.length; i++) {
-	// 						for (let j = 0; j < response.rows.length; j++) {
-	// 							if (response.rows[j].equipmentDetailId == equipmentList.value[i].commonId) {
-	// 								equipmentList.value.splice(j, 1)
-	// 							}
-	// 						}
-	// 					}
-	// 					for (var i = 0; i < equipmentList.value.length; i++) {
-	// 						equipmentList.value[i] = {
-	// 							text: equipmentList.value[i].commonCode,
-	// 							value: equipmentList.value[i]
-	// 						}
-	// 					}
-	// 				
+				userId: store.userInfo.userId,
+				dayworkId: store.dayworkInfo.id,
+				status: 1
+			})])
+			.then(([equipmentRes, response]) => {
+				console.log(equipmentRes)
+				console.log(response.rows)
+				if (equipmentRes.code == 200 && response.code == 200) {
+					let equipmentListData = equipmentRes.rows.filter((equipment) => {
+						return !response.rows.some((item) => item.equipmentDetailId == equipment.commonId);
+					});
+					equipmentList.value = equipmentListData.map((equipment) => {
+						return {
+							text: equipment.commonCode,
+							value: equipment
+						}
+					});
+					selectedEquipment.value = equipmentListData.length > 0 ? equipmentListData[0] : null;
+				}
+				baseDialog.value.open()
+			});
+		// 					for (let i = 0; i < equipmentList.value.length; i++) {
+		// 						for (let j = 0; j < response.rows.length; j++) {
+		// 							if (response.rows[j].equipmentDetailId == equipmentList.value[i].commonId) {
+		// 								equipmentList.value.splice(j, 1)
+		// 							}
+		// 						}
+		// 					}
+		// 					for (var i = 0; i < equipmentList.value.length; i++) {
+		// 						equipmentList.value[i] = {
+		// 							text: equipmentList.value[i].commonCode,
+		// 							value: equipmentList.value[i]
+		// 						}
+		// 					}
+		// 				
 	}
 
 	function open(data) {
@@ -190,7 +193,7 @@
 	}
 
 	function handleSearchUserName() {
-		if(userName.value){
+		if (userName.value) {
 			getUserByLikeUsername(userName.value).then(res => {
 				if (res.code == 200) {
 					userList.value = res.data;
@@ -203,15 +206,15 @@
 		selectedUserList.value.push(item);
 		userList.value = [];
 	}
-	
-	function handleBlur(){
-		setTimeout(function(){
+
+	function handleBlur() {
+		setTimeout(function() {
 			userList.value = [];
-		},200)
+		}, 200)
 	}
-	
-	function handleRemoveUserName(item){
-		selectedUserList.value.splice(selectedUserList.value.indexOf(item),1);
+
+	function handleRemoveUserName(item) {
+		selectedUserList.value.splice(selectedUserList.value.indexOf(item), 1);
 	}
 
 	function switchChange(e) {
@@ -330,11 +333,12 @@
 				}
 			}
 		}
+
 		.selectedUserList {
 			width: 100%;
 			justify-content: flex-start;
 			flex-wrap: wrap;
-		
+
 			.selectedUser {
 				border: 1rpx solid #999;
 				border-radius: 8rpx;
@@ -344,7 +348,7 @@
 				line-height: 50rpx;
 				margin: 20rpx 20rpx 0 0;
 				justify-content: space-around;
-				
+
 			}
 		}
 	}

pages/addNewBatch/index.vue

@@ -124,7 +124,7 @@
 			productionPlanDetailId: curPlan.value.id,
 			productionPlanId: curPlan.value.productionDetailId,
 			technologicalProcessId: curPlan.value.technologicalProcessId,
-			deptId: store.curDeptDetails
+			deptId: store.curDeptDetails.deptId
 		}
 		init();
 	})

pages/batchReporting/index.vue

@@ -136,7 +136,7 @@
 	onLoad(() => {
 		curPlan.value = store.planDetails;
 		console.log(curPlan.value)
-		if (store.planDetails.requisitionDepartmentId == store.curDeptDetails) {
+		if (store.planDetails.requisitionDepartmentId == store.curDeptDetails.deptId) {
 			bottomStatus.value = true;
 		}else{
 			bottomStatus.value = false;

pages/changeBox/index.vue

@@ -181,7 +181,12 @@
 		}
 		if (carrierRejectList.length > 0) {
 			addCarrierReject(carrierRejectList).then((response) => {
-				if (response.code == 200) {} else {
+				if (response.code == 200) {
+					uni.showToast({
+						icon: 'success',
+						title: '操作成功',
+					});
+				} else {
 					uni.showToast({
 						icon: 'error',
 						title: '添加失败',

pages/dashboard/index.vue

@@ -27,7 +27,7 @@
 		<view class="business-btn uni-row" @click="handleToProductionPlan"><text class="label">报工</text></view>
 		<view class="business-btn uni-row" @click="handleToHandlingList"><text class="label">周转</text></view>
 		<view class="bottom-btn-container">
-			<view class="start-batch-btn uni-row" @click="handleToEquiPmentList"><text class="label">绑定设备</text></view>
+			<!-- <view class="start-batch-btn uni-row" @click="handleToEquiPmentList"><text class="label">绑定设备</text></view> -->
 			<view class="start-batch-btn uni-row" @click="handleSwitchOrQuit"><text class="label">切换 / 退出账号</text>
 			</view>
 		</view>
@@ -166,6 +166,7 @@
 					}
 				}
 				curSelectedTenant.value = store.userInfo.tenantId;
+				console.log(curSelectedTenant.value)
 			}
 		})
 	}

pages/reportingForWork/index.vue

@@ -116,7 +116,7 @@
 	})
 
 	function init() {
-		console.log(store.dayworkInfo)
+		console.log(store.dayworkInfo.processSequence)
 		userInfo.value = store.userInfo;
 		uni.showLoading({
 			title: '加载中'
@@ -128,7 +128,7 @@
 		}).then(res => {
 			if (res.code == 200) {
 				listData.value = res.rows || [];
-				console.log(listData)
+				console.log(listData.value)
 				// 时间戳转工时
 				for (var i = 0; i < listData.value.length; i++) {
 					let timeStamp = listData.value[i].workingHours;