Просмотр исходного кода

修复提交校核,选择校核人的校验失效问题

yangguanjin 6 дней назад
Родитель
Сommit
059942e1ea
1 измененных файлов с 7 добавлено и 6 удалено
  1. 7 6
      src/pages/equipment/detail/equipmentDetail.vue

+ 7 - 6
src/pages/equipment/detail/equipmentDetail.vue

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