|
|
@@ -419,7 +419,7 @@ const showSelectUserPopupFn = async (checkItem: any) => {
|
|
|
currentCheckItem.value = checkItem
|
|
|
|
|
|
try {
|
|
|
- const recheckId = dataSource.value?.equipment.mainChecker
|
|
|
+ const mainCheckerUserId = dataSource.value?.equipment.mainCheckerUser?.id
|
|
|
|
|
|
const userRes: any = await requestFunc(TaskOrderFuncName.RecheckUserList, equipType, {
|
|
|
nickName: '',
|
|
|
@@ -427,15 +427,16 @@ const showSelectUserPopupFn = async (checkItem: any) => {
|
|
|
pageSize: 200,
|
|
|
orderId: dataSource.value?.taskOrder?.id,
|
|
|
})
|
|
|
- const list = (userRes?.data?.list || []).map((item: any) => ({
|
|
|
+ const checkerUserOptionList = (userRes?.data?.list || []).map((item: any) => ({
|
|
|
...item,
|
|
|
label: item.nickname,
|
|
|
value: item.id,
|
|
|
}))
|
|
|
|
|
|
- const defaultItem = list.find((item: any) => item.value === recheckId) || {}
|
|
|
- currentReckUser.value = defaultItem
|
|
|
- recheckUserGroupList.value = list
|
|
|
+ const defaultOption = checkerUserOptionList.find((item: any) => item.value === mainCheckerUserId) || {}
|
|
|
+ currentReckUser.value = defaultOption
|
|
|
+ selectedUserValue.value = defaultOption.value
|
|
|
+ recheckUserGroupList.value = checkerUserOptionList
|
|
|
|
|
|
showSelectUserPopup.value = true
|
|
|
} catch (error) {
|
|
|
@@ -456,7 +457,7 @@ const onUserChange = (selected) => {
|
|
|
|
|
|
// 确认选择用户
|
|
|
const confirmSelectUser = async () => {
|
|
|
- if (!currentReckUser.value) {
|
|
|
+ if (!selectedUserValue.value || selectedUserValue.value === '') {
|
|
|
uni.showToast({ title: '请选择校核人', icon: 'error' })
|
|
|
return
|
|
|
}
|