小组多选下拉框场景下，“全部”选项的交互修改

src/hooks/useOptions.ts

@@ -73,7 +73,21 @@ const useOptions = (
   const changeModelValue = <T extends keyof DataModel>(key: T) => {
     return (v: DataModel[T]) => {
       console.log('changeModelValue', key, v)
-      dataModel[key] = v
+      // dataModel[key] = v
+
+      if (multGroup && key === 'group') {
+        if (v.includes(undefined)) {
+          if (dataModel[key]?.length === groupListWithAll.value.length) {
+            dataModel[key] = v.filter((item: any) => !!item)
+          } else {
+            dataModel[key] = groupListWithAll.value.map((item: any) => item.value)
+          }
+        } else {
+          dataModel[key] = v.filter((item: any) => !!item)
+        }
+      } else {
+        dataModel[key] = v
+      }
     }
   }
 

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

@@ -123,16 +123,16 @@ const customGroupChange = (v: any) => {
   }
 }
 const transGroupOptions = computed(() => {
-  return (taskSettingModel.markingGroupNumbers || []).includes(undefined)
-    ? (groupListWithAll.value || []).map((item: any) => {
-        item.value != undefined && (item.disabled = true)
-        return item
-      })
-    : groupListWithAll.value.map((item: any) => {
-        item.disabled = false
-        return item
-      })
-  // return groupListWithAll.value || []
+  // return (taskSettingModel.markingGroupNumbers || []).includes(undefined)
+  //   ? (groupListWithAll.value || []).map((item: any) => {
+  //       item.value != undefined && (item.disabled = true)
+  //       return item
+  //     })
+  //   : groupListWithAll.value.map((item: any) => {
+  //       item.disabled = false
+  //       return item
+  //     })
+  return groupListWithAll.value || []
 })
 
 const items = computed<EpFormItem[]>(() => [
@@ -170,10 +170,10 @@ const items = computed<EpFormItem[]>(() => [
     hidden: !isGroupSetting.value,
     slot: {
       // options: groupList.value,
-      // onChange: changeModelValue('group'),
+      onChange: changeModelValue('group'),
       // multiple: true,
       options: transGroupOptions.value,
-      onChange: customGroupChange,
+      // onChange: customGroupChange,
       multiple: true,
     },
   }),

src/modules/analysis/group-monitoring/hooks/useFormFilter.ts

@@ -81,16 +81,16 @@ const useFormFilter = () => {
     }
   }
   const transGroupOptions = computed(() => {
-    return (model.markingGroupNumbers || []).includes(undefined)
-      ? (groupListWithAll.value || []).map((item: any) => {
-          item.value != undefined && (item.disabled = true)
-          return item
-        })
-      : groupListWithAll.value.map((item: any) => {
-          item.disabled = false
-          return item
-        })
-    // return groupListWithAll.value || []
+    // return (model.markingGroupNumbers || []).includes(undefined)
+    //   ? (groupListWithAll.value || []).map((item: any) => {
+    //       item.value != undefined && (item.disabled = true)
+    //       return item
+    //     })
+    //   : groupListWithAll.value.map((item: any) => {
+    //       item.disabled = false
+    //       return item
+    //     })
+    return groupListWithAll.value || []
   })
   const items = computed<EpFormItem[]>(() => [
     OneRowSpan5({
@@ -119,7 +119,8 @@ const useFormFilter = () => {
       slotType: 'select',
       slot: {
         options: transGroupOptions.value,
-        onChange: customGroupChange,
+        // onChange: customGroupChange,
+        onChange: changeModelValue('group'),
         multiple: true,
       },
     }),

src/modules/analysis/monitoring/index.vue

@@ -156,7 +156,7 @@ const formItems = computed<EpFormItem[]>(() => [
   {
     label: '小组',
     slotType: 'select',
-    prop: 'markingGroupNumber',
+    prop: 'markingGroupNumbers',
     slot: {
       options: groupListWithAll.value,
       onChange: changeModelValue('group'),
@@ -366,7 +366,8 @@ const onRefresh = () => {
   day < 10 && (day = '0' + day)
   if (fetchModel.subjectCode && fetchModel.questionMainNumber) {
     fetch({
-      ...omit(fetchModel, 'refresh'),
+      ...omit(fetchModel, ['refresh', 'markingGroupNumbers']),
+      markingGroupNumbers: [fetchModel.markingGroupNumbers],
       // startTime: `${year}${month}${day}000000`,
       // endTime: `${year}${month}${day}235959`,
       curDay: `${year}${month}${day}`,

src/modules/analysis/personnel-compare/hooks/useCompareFilter.ts

@@ -66,16 +66,16 @@ const useCompareFilter = () => {
     }
   }
   const transGroupOptions = computed(() => {
-    return (model.markingGroupNumber || []).includes(undefined)
-      ? (groupListWithAll.value || []).map((item: any) => {
-          item.value != undefined && (item.disabled = true)
-          return item
-        })
-      : groupListWithAll.value.map((item: any) => {
-          item.disabled = false
-          return item
-        })
-    // return groupListWithAll.value || []
+    // return (model.markingGroupNumber || []).includes(undefined)
+    //   ? (groupListWithAll.value || []).map((item: any) => {
+    //       item.value != undefined && (item.disabled = true)
+    //       return item
+    //     })
+    //   : groupListWithAll.value.map((item: any) => {
+    //       item.disabled = false
+    //       return item
+    //     })
+    return groupListWithAll.value || []
   })
 
   const items = computed(() => [
@@ -108,7 +108,7 @@ const useCompareFilter = () => {
       labelWidth: '52px',
       slot: {
         options: transGroupOptions.value,
-        onChange: customGroupChange,
+        onChange: changeModelValue('group'),
         multiple: true,
       },
     }),

src/modules/analysis/personnel-compare/index.vue

@@ -158,7 +158,6 @@ const allTableData = computed(() => {
       let g = groups[i]
       arr.push(...g.markerCompares)
     }
-    console.log('allTableData', arr)
     return arr
   } else {
     return []

src/modules/analysis/personnel-statistics/hooks/useStatisticsFilter.ts

@@ -144,16 +144,16 @@ const useStatisticsFilter = () => {
     }
   }
   const transGroupOptions = computed(() => {
-    return (model.markingGroupNumber || []).includes(undefined)
-      ? (groupListWithAll.value || []).map((item: any) => {
-          item.value != undefined && (item.disabled = true)
-          return item
-        })
-      : groupListWithAll.value.map((item: any) => {
-          item.disabled = false
-          return item
-        })
-    // return groupListWithAll.value || []
+    // return (model.markingGroupNumber || []).includes(undefined)
+    //   ? (groupListWithAll.value || []).map((item: any) => {
+    //       item.value != undefined && (item.disabled = true)
+    //       return item
+    //     })
+    //   : groupListWithAll.value.map((item: any) => {
+    //       item.disabled = false
+    //       return item
+    //     })
+    return groupListWithAll.value || []
   })
 
   const items = computed<EpFormItem[]>(() => [
@@ -186,7 +186,7 @@ const useStatisticsFilter = () => {
       slotType: 'select',
       slot: {
         options: transGroupOptions.value,
-        onChange: customGroupChange,
+        onChange: changeModelValue('group'),
         multiple: true,
         disabled: isDeputy.value,
       },

src/modules/analysis/personnel-statistics/index.vue

@@ -218,7 +218,11 @@ function onSearch() {
     searchMarkerId.value = model.markerId
     searchOnline.value = model.online
     if (deputyHasInit.value) {
-      let params: any = { ...omit(fetchModel.value, 'expand', 'markerId', 'online'), markingGroupNumber: '' }
+      // let params: any = { ...omit(fetchModel.value, 'expand', 'markerId', 'online'), markingGroupNumber: '' }
+      let params: any = {
+        ...omit(fetchModel.value, 'expand', 'markerId', 'online', 'markingGroupNumber'),
+        markingGroupNumbers: fetchModel.value.markingGroupNumber.filter(Boolean),
+      }
       if (fetchModel.value.curDay == 'notIncludeCurDay') {
         params.curDay = ''
         params.includeCurDay = false

src/modules/marking/inquiry/index.vue

@@ -282,16 +282,16 @@ const customGroupChange = (v: any) => {
   }
 }
 const transGroupOptions = computed(() => {
-  return (model.markingGroupNumbers || []).includes(undefined)
-    ? (groupListWithAll.value || []).map((item: any) => {
-        item.value != undefined && (item.disabled = true)
-        return item
-      })
-    : groupListWithAll.value.map((item: any) => {
-        item.disabled = false
-        return item
-      })
-  // return groupListWithAll.value || []
+  // return (model.markingGroupNumbers || []).includes(undefined)
+  //   ? (groupListWithAll.value || []).map((item: any) => {
+  //       item.value != undefined && (item.disabled = true)
+  //       return item
+  //     })
+  //   : groupListWithAll.value.map((item: any) => {
+  //       item.disabled = false
+  //       return item
+  //     })
+  return groupListWithAll.value || []
 })
 
 const items = computed<EpFormItem[]>(() => [
@@ -324,7 +324,7 @@ const items = computed<EpFormItem[]>(() => [
     slot: {
       placeholder: '评卷小组',
       options: transGroupOptions.value,
-      onChange: customGroupChange,
+      onChange: changeModelValue('group'),
       multiple: true,
     },
   }),

src/modules/monitor/training-monitoring/hooks/useFormFilter.ts

@@ -134,16 +134,16 @@ const useFormFilter = () => {
     }
   }
   const transGroupOptions = computed(() => {
-    return (model.markingGroupNumbers || []).includes(undefined)
-      ? (groupListWithAll.value || []).map((item: any) => {
-          item.value != undefined && (item.disabled = true)
-          return item
-        })
-      : groupListWithAll.value.map((item: any) => {
-          item.disabled = false
-          return item
-        })
-    // return groupListWithAll.value || []
+    // return (model.markingGroupNumbers || []).includes(undefined)
+    //   ? (groupListWithAll.value || []).map((item: any) => {
+    //       item.value != undefined && (item.disabled = true)
+    //       return item
+    //     })
+    //   : groupListWithAll.value.map((item: any) => {
+    //       item.disabled = false
+    //       return item
+    //     })
+    return groupListWithAll.value || []
   })
 
   const items = computed<EpFormItem[]>(() => {
@@ -177,7 +177,7 @@ const useFormFilter = () => {
         labelWidth: '50px',
         slot: {
           options: transGroupOptions.value,
-          onChange: customGroupChange,
+          onChange: changeModelValue('group'),
           multiple: true,
         },
       }),

src/modules/quality/self-check/index.vue

@@ -108,16 +108,16 @@ const customGroupChange = (v: any) => {
   }
 }
 const transGroupOptions = computed(() => {
-  return (model.markingGroupNumbers || []).includes(undefined)
-    ? (groupListWithAll.value || []).map((item: any) => {
-        item.value != undefined && (item.disabled = true)
-        return item
-      })
-    : groupListWithAll.value.map((item: any) => {
-        item.disabled = false
-        return item
-      })
-  // return groupListWithAll.value || []
+  // return (model.markingGroupNumbers || []).includes(undefined)
+  //   ? (groupListWithAll.value || []).map((item: any) => {
+  //       item.value != undefined && (item.disabled = true)
+  //       return item
+  //     })
+  //   : groupListWithAll.value.map((item: any) => {
+  //       item.disabled = false
+  //       return item
+  //     })
+  return groupListWithAll.value || []
 })
 
 const items = computed<EpFormItem[]>(() => {
@@ -143,7 +143,7 @@ const items = computed<EpFormItem[]>(() => {
       label: '小组',
       slotType: 'select',
       prop: 'markingGroupNumbers',
-      slot: { options: transGroupOptions.value, onChange: customGroupChange, multiple: true },
+      slot: { options: transGroupOptions.value, onChange: changeModelValue('group'), multiple: true },
     }),
     OneRowSpan6({
       label: '时间',