优化学习项目，适用范围、适用角色选择筛选；

王强
1 parent a162734b
Showing 3 changed files with 95 additions and 41 deletions
src/pages/admin/Role/entity.ts
src/pages/ehr/ProgramOfStudy/Settings/components/Modal.tsx
src/pages/ehr/ProgramOfStudy/components/RangeRoleSelector/index.tsx
 /*
  * @Date: 2021-07-14 10:54:47
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2021-07-29 14:50:55
+ * @LastEditTime: 2023-02-27 17:18:17
  */
 export enum RoleTypeEnum {
-  '系统角色' = 1,
-  '流程角色',
-  '功能角色'
+  "系统角色" = 1,
+  "流程角色",
+  "功能角色",
 }
  
 export const roleTypeTag = {
-  1: 'geekblue',
-  2: 'purple',
-  3: 'orange'
+  1: "geekblue",
+  2: "purple",
+  3: "orange",
 };
  
 export const roleRange = [1, 2, 3, 4];
 export const roleRangeType = {
-  1: '展厅',
-  2: '服务站',
-  3: '二手车店',
-  4: '租赁店',
+  1: "展厅",
+  2: "服务站",
+  3: "二手车店",
+  4: "租赁店",
 };
  
+export enum EnumRoleRangeType {
+  "展厅" = 1,
+  "服务站",
+  "二手车店",
+  "租赁店",
+}
+
 /** 角色输入类型 */
 export enum RoleRangeTypeEnum {
-  '允许' = 1,
-  '不允许'
+  "允许" = 1,
+  "不允许",
 }
  
 /** 角色用途枚举 */
 export enum UseTypeEnum {
-  '默认' = 1,
-  '业务',
-  '审批',
-  '管理'
+  "默认" = 1,
+  "业务",
+  "审批",
+  "管理",
 }
  
 /** 角色用途颜色枚举 */
 export enum UseTypeColorEnum {
-  '#4189FD' = 1,
-  '#20C688',
-  '#FF921C',
-  '#F93939'
-}
 \ No newline at end of file
+  "#4189FD" = 1,
+  "#20C688",
+  "#FF921C",
+  "#F93939",
+}
 import SelectBrandOrSeries from "@/pages/ehr/ProgramOfStudy/components/SelectBrandOrSeries";
-import RangeRoleSelector from "@/pages/ehr/ProgramOfStudy/components/RangeRoleSelector";
+import RangeRoleSelector, {
+  RangeRoleSelectorRef,
+} from "@/pages/ehr/ProgramOfStudy/components/RangeRoleSelector";
 import {
   Button,
   DatePicker,
@@ -49,6 +51,7 @@ export default function ProgramOfStudySettingsModal() {
   const [confirmLoading, setConfirmLoading] = useState(false);
   const submitType = useRef<"save" | "draft">("save");
   const tempItem = useRef<EHrProgramOfStudySettings.ListVO>();
+  const rangeRoleSelectorRef = useRef<RangeRoleSelectorRef>(null);
  
   useEffect(() => {
     if (visible) {
@@ -354,6 +357,13 @@ export default function ProgramOfStudySettingsModal() {
               type?: number;
               list?: { value?: string; label?: string }[];
             }) => {
+              console.log("x", form.getFieldValue("rangeRole"));
+              // 如果选择的是 1 按品牌 或 2 按车系 则角色的 authRange 必须包含 1 展厅 3 二手车店
+              if (value?.type === 1 || value?.type === 2) {
+                rangeRoleSelectorRef.current?.setIncludesPreSale(true);
+              } else {
+                rangeRoleSelectorRef.current?.setIncludesPreSale(false);
+              }
               questionBankInitial.setParams(
                 {
                   adapterType: value?.type,
@@ -390,7 +400,12 @@ export default function ProgramOfStudySettingsModal() {
               return value;
             }}
           >
-            <RangeRoleSelector disabled={isView} labelInValue mode="multiple" />
+            <RangeRoleSelector
+              ref={rangeRoleSelectorRef}
+              disabled={isView}
+              labelInValue
+              mode="multiple"
+            />
           </Form.Item>
           <Form.Item
             label="过期时间"
@@ -2,18 +2,25 @@
  * @Author: wangqiang@feewee.cn
  * @Date: 2022-11-21 16:07:40
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2022-11-30 16:17:02
+ * @LastEditTime: 2023-02-27 17:46:14
  */
-import React, { useMemo } from "react";
+import React, {
+  forwardRef,
+  Ref,
+  useImperativeHandle,
+  useMemo,
+  useState,
+} from "react";
 import { Radio, Select } from "antd";
 import useInitail from "@/hooks/useInitail";
 import { getAllRoleCodeApi } from "@/common/api";
 import { CommonUseType } from "@/common/utils";
-import FeeweeFilterOption from '@/pages/notice/components/FeeweeFilterOption';
+import FeeweeFilterOption from "@/pages/notice/components/FeeweeFilterOption";
+import { EnumRoleRangeType } from "@/pages/admin/Role/entity";
  
 interface ValueVO {
   type?: number; // 1 全部 2 部分
-  list?: { value?: string; label?: string }[];
+  list?: { value?: string; label?: string; authRange?: string; }[];
 }
  
 interface Props {
@@ -26,25 +33,43 @@ interface Props {
   useFilter?: boolean; // 是否用作筛选
 }
  
+export interface RangeRoleSelectorRef {
+  setIncludesPreSale: (includesPreSale: boolean) => void;
+}
+
 /**
  * @description: 根据授权查询角色选择器-适用于表单
  */
-export default function StandardAuthRoleSelector({
-  value,
-  onChange,
-  style,
-  disabled = false,
-  mode,
-  labelInValue,
-  useFilter,
-}: Props) {
+export default forwardRef(StandardAuthRoleSelector);
+
+function StandardAuthRoleSelector(
+  {
+    value,
+    onChange,
+    style,
+    disabled = false,
+    mode,
+    labelInValue,
+    useFilter,
+  }: Props,
+  ref: Ref<RangeRoleSelectorRef>
+) {
+  const [includesPreSale, setIncludesPreSale] = useState(false);
   const { data } = useInitail(getAllRoleCodeApi, [], { roleType: 2 });
   const roleList = useMemo(
-    () => data.filter((role) => [CommonUseType.业务, CommonUseType.管理].includes(role.useType!)
+    () => data.filter((role) => ([CommonUseType.业务, CommonUseType.管理].includes(role.useType!) &&
+        includesPreSale
+          ? role.authRange?.includes("" + EnumRoleRangeType.展厅) ||
+            role.authRange?.includes("" + EnumRoleRangeType.二手车店)
+          : true)
       ),
-    [data]
+    [data, includesPreSale]
   );
  
+  useImperativeHandle(ref, () => ({
+    setIncludesPreSale,
+  }));
+
   return !useFilter ? (
     <div style={style}>
       <Radio.Group
@@ -70,12 +95,19 @@ export default function StandardAuthRoleSelector({
           value={value?.list}
           showSearch
           optionFilterProp="children"
-          onChange={(list) => onChange && onChange({ type: value?.type, list })}
+          onChange={(selected, list: any) => {
+            onChange && onChange({ type: value?.type, list });
+          }}
           style={{ flex: 1, width: "100%" }}
           getPopupContainer={(triggerNode) => triggerNode.parentNode}
         >
           {(roleList || []).map((role) => (
-            <Select.Option key={role.roleCode} value={role.roleCode!}>
+            <Select.Option
+              key={role.roleCode}
+              value={role.roleCode!}
+              label={role.roleName}
+              authRange={role.authRange}
+            >
               {role.roleName}
             </Select.Option>
           ))}