0204

api/resourceGroup/resourceGroupDetail.js

@@ -6,4 +6,11 @@ export function getEquipmentByUidAndDid(planDetailId) {
 		url:'/business/detail/getEquipmentByUidAndDid?planDetailId=' + planDetailId ,
 		method: 'GET',
 	})
+}
+export function getResourcGroup(data) {
+	return req.request({
+		url:'/business/detail/getResourcGroup',
+		method: 'GET',
+		data: data
+	})
 }

components/dialog-selectInviteUser/dialog-selectInviteUser.vue

@@ -1,6 +1,7 @@
 <template>
 	<dialog-base ref="baseDialog" title="请选择">
 		<view class="userList">
+			<uni-data-select v-model="resourceGroupId" :localdata="resourceGroupList" placeholder="请选择资源组" @change="handleResourceGroupChange" style="margin-bottom: 20rpx;"></uni-data-select>
 			<uni-easyinput class="uni-mt-5" v-model="userName" placeholder="请输入协作者编号"
 				@input="debounce(handleSearchUserName,500)" ></uni-easyinput> 
 				<!-- @blur="handleBlur" -->
@@ -47,6 +48,9 @@
 	import {
 		getUserByLikeUsername
 	} from '@/api/sys/user.js'
+	import {
+		getResourcGroup
+	} from '@/api/resourceGroup/resourceGroupDetail.js'
 
 	const baseDialog = ref(null)
 	const emit = defineEmits(['handleAddDayWorkItem'])
@@ -56,12 +60,14 @@
 	const userName = ref(null)
 	const userList = ref([])
 	const selectedUserList = ref([])
+	const itemList = ref(null)
+	const resourceGroupList = ref([])
+	const planDetailId = ref(null)
 
 
 	onLoad(() => {
 		userId.value = store.userInfo.userId || "";
-		resourceGroupId.value = store.planDetails.resourceGroupId
-
+        planDetailId.value = store.planDetails.id
 	})
 
 	function resetPage() {
@@ -72,13 +78,25 @@
 	}
 
 	function init() {
-		baseDialog.value.open()
+		getResourcGroup({commonId:userId.value,productionPlanDetailId:planDetailId.value }).then(res => {
+			if(res.code == 200) {
+				for (let i = 0; i < res.data.length; i++) {
+					resourceGroupList.value[i] = {
+						value: res.data[i].resourceGroupId,
+						text: res.data[i].resourceGroupCode
+					}
+				}
+				baseDialog.value.open()
+			}
+		})
+		
 	}
 
 	function open(data) {
 		resetPage()
 		userName.value = null;
 		userList.value = [];
+		itemList.value = data;
 		init();
 	}
 
@@ -115,7 +133,9 @@
 		selectedUserList.value.splice(selectedUserList.value.indexOf(item), 1);
 	}
 
-
+    function handleResourceGroupChange() {
+		
+	}
 	function handleStart() {
 		uni.showModal({
 				title: "提示",
@@ -131,6 +151,7 @@
 					} else {
 						let inviteUserList = []
 						let commonType ="person"
+						
 						for (let i = 0; i < selectedUserList.value.length; i++) {
 							let inviteUser = {}
 							inviteUser.tenantId = store.tenantId
@@ -141,8 +162,10 @@
 							inviteUser.commonType = commonType
 							inviteUser.commonName = selectedUserList.value[i].nickName
 							inviteUser.protemDayworkId = store.dayworkInfo.id
+							inviteUser.protemProcessId = itemList.value[0].processId
 							inviteUserList.push(inviteUser)
 						}
+						console.log(inviteUserList)
 						saveproTem(inviteUserList).then(res => {
 							if (res.code == 200) {
 								uni.showToast({

pages/reportingForWork/index.vue

@@ -64,7 +64,7 @@
 			</view>
 		</view>
 		<view class="top">
-			<button class="top-btn" @click="HandleSeleteInviteUser(null)"><text class="label">邀请报工</text></button>
+			<button class="top-btn" @click="HandleSeleteInviteUser(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>
@@ -195,7 +195,15 @@
 	}
 
 	function HandleSeleteInviteUser(data) {
-		inviteUser.value.open(data)
+		if(data.some(item => item.status == 0)) {
+			uni.showToast({
+				icon: 'none',
+				title: '请报工选择工序后再邀请协作者'
+			})
+		}else {
+			inviteUser.value.open(data)
+		}
+		
 	}
 
 	function HandleChangevehicle() {