feat: 用户新增编辑不能选全部

src/hooks/useOptions.ts

@@ -93,20 +93,20 @@ const useOptions = (
   })
 
   const groupList = computed<Group[]>(() => {
-    const list =
+    return (
       groupListResult?.value?.map((n) => {
         return {
           value: n,
           label: `第${n}组`,
         }
       }) || []
-    return list?.length && (isAdmin.value || isChief.value)
-      ? [{ label: '全部', value: void 0 } as unknown as Group].concat(list)
-      : list
+    )
   })
 
   const groupListWithAll = computed(() => {
-    return groupList.value
+    return groupList.value?.length && (isAdmin.value || isChief.value)
+      ? [{ label: '全部', value: void 0 } as unknown as Group].concat(groupList.value)
+      : groupList.value
   })
 
   watch(

src/modules/admin-data/export/index.vue

@@ -83,7 +83,7 @@ const columns: EpTableColumn[] = [
 ]
 
 function onSearch() {
-  Object.assign(requestModel, model)
+  Object.assign(requestModel, { ...model })
 }
 
 onOptionInit(onSearch)

src/modules/analysis/monitoring/index.vue

@@ -75,11 +75,8 @@ import type { ExtractApiParams, ExtractApiResponse } from '@/api/api'
 
 const { push } = useRouter()
 
-const { subjectList, mainQuestionList, groupList, dataModel, changeModelValue, initFinish, onOptionInit } = useOptions([
-  'subject',
-  'question',
-  'group',
-])
+const { subjectList, mainQuestionList, groupListWithAll, dataModel, changeModelValue, initFinish, onOptionInit } =
+  useOptions(['subject', 'question', 'group'])
 
 const model = reactive<
   Omit<ExtractApiParams<'getStatistics'>, 'markingGroupNumbers'> & {
@@ -140,7 +137,7 @@ const formItems = computed<EpFormItem[]>(() => [
     slotType: 'select',
     prop: 'markingGroupNumbers',
     slot: {
-      options: groupList.value,
+      options: groupListWithAll.value,
       onChange: changeModelValue('group'),
     },
   },