0109

components/dialog-lotReporting/dialog-lotReporting.vue

@@ -117,6 +117,9 @@
 		getDayworkByCarrierId,
 		reportDaywork
 	} from '@/api/business/quickDaywork'
+	import {
+		store
+	} from '@/store/index.js'
 
 	const props = defineProps({
 		getList: {
@@ -309,8 +312,8 @@
 				workshopId: curDaywork.value.workshopId,
 				deptName: deptList.value.find(v => v.value === curDaywork.value.deptId).text,
 				isSortPackaging: normalStatus.value ? "1" : "0"
-			}
-
+			},
+			tenantId: !store.tenantId ? store.userInfo.tenantId : store.tenantId
 		}))
 		console.log(params)
 		reportDaywork(params).then(res => {

pages/addNewBatch/index.vue

@@ -621,6 +621,7 @@
 		dayWork.value.isAmend = batchNoList.value[0].isAmend
 		dayWork.value.fromId = batchNoList.value[0].fromId
 		dayWork.value.isSuperaddition = batchNoList.value[0].isSuperaddition
+		dayWork.value.tenantId = !store.tenantId ? store.userInfo.tenantId : store.tenantId
 		store.furnaceNumberInfo = basicInfo.value;
 		if (checkLotCode(dayWork.value.lotCode)) {
 			isTakeStock().then(response => {

pages/batchReporting/index.vue

@@ -570,7 +570,8 @@
 		}
 		console.log(data)
 		data.forEach(item => {
-			item.isSort = 0
+			item.isSort = 0,
+				item.tenantId = !store.tenantId ? store.userInfo.tenantId : store.tenantId
 		})
 		showDayworkSave(data).then(res => {
 			console.log(res)

pages/batchReportingOutsource/index.vue

@@ -557,7 +557,8 @@
 		}
 		console.log(data)
 		data.forEach(item => {
-			item.isSort = 0
+			item.isSort = 0,
+				item.tenantId = !store.tenantId ? store.userInfo.tenantId : store.tenantId
 		})
 		showDayworkInnerSave(data).then(res => {
 			console.log(res)

pages/fastProductionPlan/index.vue

@@ -459,6 +459,9 @@
 					title: '加载中'
 				});
 				lastRequestTimestamp.value = currentTime;
+				selection.value.forEach(item => {
+					item.tenantId = !store.tenantId ? store.userInfo.tenantId : store.tenantId
+				})
 				finishQuick(selection.value).then(res => {
 					// console.log(res)
 					if (res.code === 200) {

pages/reportingForInnerWork/index.vue

@@ -339,6 +339,7 @@
 				deptId: store.curDeptDetails.deptId,
 				deptName: store.curDeptDetails.deptName,
 				outsourceDetailId: dayWorkInfo.value.dayworkItemList[0].outsourceDetailId,
+				tenantId: !store.tenantId ? store.userInfo.tenantId : store.tenantId,
 				isWx: 1
 			}
 		} else {
@@ -357,6 +358,7 @@
 				deptId: store.curDeptDetails.deptId,
 				deptName: store.curDeptDetails.deptName,
 				outsourceDetailId: dayWorkInfo.value.dayworkItemList[0].outsourceDetailId,
+				tenantId: !store.tenantId ? store.userInfo.tenantId : store.tenantId,
 				isWx: 1,
 				...data
 			}

pages/reportingForWork/index.vue

@@ -63,9 +63,11 @@
 				</view>
 			</view>
 		</view>
-		<view class="top uni-row" v-if="flag" >
-			<button class="bottom-btn left-btn" style="background-color: #1684fc;" @click="HandleSeleteInviteUser(listData)"><text class="label">邀请报工</text></button>
-			<button class="bottom-btn right-btn" style="background-color: #e99d42;" @click="HandleSendInspection(listData)"><text class="label">送检</text></button>
+		<view class="top uni-row" v-if="flag">
+			<button class="bottom-btn left-btn" style="background-color: #1684fc;"
+				@click="HandleSeleteInviteUser(listData)"><text class="label">邀请报工</text></button>
+			<button class="bottom-btn right-btn" style="background-color: #e99d42;"
+				@click="HandleSendInspection(listData)"><text class="label">送检</text></button>
 		</view>
 		<view class="bottom uni-row">
 			<button class="bottom-btn left-btn" @click="handleChangevehicle"><text class="label">更换载具</text></button>
@@ -340,6 +342,7 @@
 					store.dayworkInfo['isLast'] == 1 ? store.dayworkInfo['lastLotQuantity'] : store.dayworkInfo[
 						'oneLotQuantity'] : store.dayworkInfo['processQualifiedNum'],
 				deptId: store.curDeptDetails.deptId,
+				tenantId: !store.tenantId ? store.userInfo.tenantId : store.tenantId,
 				deptName: store.curDeptDetails.deptName
 			}
 		} else {
@@ -357,6 +360,7 @@
 				startTime: timestampToTime(new Date()),
 				deptId: store.curDeptDetails.deptId,
 				deptName: store.curDeptDetails.deptName,
+				tenantId: !store.tenantId ? store.userInfo.tenantId : store.tenantId,
 				...data
 			}
 			reqParam.value = dayWorkItem.value;
@@ -470,30 +474,30 @@
 	}
 
 	.top {
-	position: fixed;
-	right: 0;
-	bottom: 100rpx;
-	left: 0;
-	height: 100rpx;
-	padding: 16rpx 24rpx;
-	align-items: center;
-	background-color: #FFFFFF;
-	justify-content: space-between;
-	
-	.bottom-btn {
-		flex: 1;
-		font-size: 28rpx;
-		color: #FFFFFF;
-	
-		&.left-btn {
-			background-color: rgba(0, 226, 166, 1);
-		}
-	
-		&.right-btn {
-			margin-left: 24rpx;
+		position: fixed;
+		right: 0;
+		bottom: 100rpx;
+		left: 0;
+		height: 100rpx;
+		padding: 16rpx 24rpx;
+		align-items: center;
+		background-color: #FFFFFF;
+		justify-content: space-between;
+
+		.bottom-btn {
+			flex: 1;
+			font-size: 28rpx;
+			color: #FFFFFF;
+
+			&.left-btn {
+				background-color: rgba(0, 226, 166, 1);
+			}
+
+			&.right-btn {
+				margin-left: 24rpx;
+			}
 		}
 	}
-	}
 
 	.bottom {
 		position: fixed;

pages/sortBatchInnerReporting/index.vue

@@ -575,6 +575,7 @@
 		console.log(data)
 		data.forEach(item => {
 			item.isSort = 1
+			item.tenantId = !store.tenantId ? store.userInfo.tenantId : store.tenantId
 		})
 		showDayworkSaveInner(data).then(res => {
 			if (res.code == 200) {

pages/sortBatchReporting/index.vue

@@ -755,6 +755,7 @@
 		console.log(data)
 		data.forEach(item => {
 			item.isSort = 1
+			item.tenantId = !store.tenantId ? store.userInfo.tenantId : store.tenantId
 		})
 		showDayworkSave(data).then(res => {
 			if (res.code == 200) {