bug fix

src/api/api-types/system.d.ts

@@ -122,7 +122,7 @@ export namespace System {
   type GetTaskDetail = BaseDefine<
     {
       mainNumber?: number | string
-      markingGroupNumber?: number | string
+      markingGroupNumbers?: any
       subjectCode?: string
     },
     TaskDetail[]

src/hooks/useOptions.ts

@@ -26,7 +26,8 @@ const useOptions = (
   autoFill = true,
   subjectEnable: boolean | null = true,
   multGroup = false,
-  isAiCheck = false
+  isAiCheck = false,
+  notShowAllLabel = true
 ) => {
   const mainStore = useMainStore()
   const isChooseAllOptionMap = reactive<any>({
@@ -145,7 +146,9 @@ const useOptions = (
   })
 
   const groupListWithAll = computed(() => {
-    return groupList.value?.length && (isAdmin.value || isChief.value || isExpert.value || isLeader.value)
+    return groupList.value?.length &&
+      (isAdmin.value || isChief.value || isExpert.value || isLeader.value) &&
+      !notShowAllLabel
       ? [{ label: '全部', value: void 0 } as unknown as Group].concat(groupList.value)
       : groupList.value
   })
@@ -203,7 +206,7 @@ const useOptions = (
           //   changeModelValue('group')(res[0])
           // }
           changeModelValue('group')(
-            multGroup
+            multGroup && !notShowAllLabel
               ? groupList.value?.length && (isAdmin.value || isChief.value || isExpert.value || isLeader.value)
                 ? [void 0]
                 : []

src/modules/admin-data/task-setting/components/GroupSetting.vue

@@ -12,14 +12,14 @@ import type { EpTableColumn } from 'global-type'
 
 const props = defineProps<{
   mainNumber?: number | string
-  markingGroupNumber?: number | string
+  markingGroupNumbers?: number | string
   subjectCode?: string
 }>()
 
 const { fetch: getTaskDetail, result: taskDetail } = useFetch('getTaskDetail')
 
 const columns: EpTableColumn[] = [
-  { label: '小组', prop: 'markingGroupNumber' },
+  { label: '小组', prop: 'markingGroupNumbers' },
   { label: '计划量', prop: 'markCount' },
   { label: '已完成量', prop: 'finishCount' },
 ]
@@ -27,7 +27,12 @@ const columns: EpTableColumn[] = [
 watch(
   props,
   () => {
-    if (props.mainNumber && props.markingGroupNumber && props.subjectCode) {
+    if (
+      props.mainNumber &&
+      Array.isArray(props.markingGroupNumbers) &&
+      props.markingGroupNumbers?.length &&
+      props.subjectCode
+    ) {
       getTaskDetail({ ...props })
     }
   },

src/modules/admin-data/task-setting/index.vue

@@ -222,7 +222,19 @@ const rules = computed<EpFormRules>(() => {
     mainNumber: [{ required: true, message: '请选择大题' }],
   }
   if (isGroupSetting.value) {
-    // obj['markingGroupNumbers'] = [{ required: true, message: '请选择小组' }]
+    obj['markingGroupNumbers'] = [
+      { required: true, message: '请选择小组' },
+      {
+        validator: (rule: any, value: any, callback: any) => {
+          if (!taskSettingModel.markingGroupNumbers?.length) {
+            callback(new Error('请选择小组'))
+          } else {
+            callback()
+          }
+        },
+        trigger: 'change',
+      },
+    ]
     obj['markCount'] = [{ required: true, message: '请设置统一追加量' }]
   } else {
     obj['markTotalCount'] = [