Merge remote-tracking branch 'origin/master' into takeOffUpdate

曾柯
2 parents fde1e85d bc1e6cd3
Showing 6 changed files with 69 additions and 2 deletions
src/pages/approval/ApprovalSetting/api.ts
src/pages/approval/ApprovalSetting/subpages/components/DefaultFlowNewOrEdit.tsx
src/pages/approval/ApprovalSetting/subpages/components/PreSettingForm/entity.ts
src/pages/approval/ApprovalSetting/subpages/components/Selectors/OfficeWordTypeSelector.tsx
src/pages/approval/ApprovalSetting/subpages/components/Selectors/index.ts
src/pages/approval/FlowSetting/subpages/ConditionSetting/components/CustomFlowNewOrEdit.tsx
 import request from '@/utils/request';
 import type { http } from '@/typing/http';
-import { Approval_HOST } from '@/utils/host';
+import { Approval_HOST, OFFICE } from '@/utils/host';
  
 /**
  * 审批配置分页列表
@@ -60,3 +60,9 @@ export interface GetCanApproveRolesReq {
 export function getCanApproveRoles(params: GetCanApproveRolesReq): http.PromiseResp<CommonApi.RoleCodeVO[]> {
   return request.get(`${Approval_HOST}/erp/approval/config/approval/role/configurable`, { params });
 }
+/**
+ * 查询所有工作类型列表
+ */
+export function getOfficeWordTypes(): http.PromiseResp<CommonApi.ShopRpTypeVO[]> {
+  return request.get(`${OFFICE}/erp/work/config/group/all/work/types`);
+}
@@ -17,6 +17,7 @@ import {
   RPTypesSelector,
   BizTypeSelector,
   ShopBizTypeSelector,
+  OfficeWordTypeSelector,
 } from './Selectors';
 import { TriggerAll } from '@/pages/approval/FlowSetting/entity';
 import { Condition_Type_Enum as TriggerType } from './PreSettingForm/entity';
@@ -372,6 +373,9 @@ export default function DefaultSettingNewOrEdit(props: Props) {
               {type === TriggerType['门店业态'] && (
                 <ShopBizTypeSelector visible={type === TriggerType['门店业态']} index={index} item={item} onChange={onConditionChange} />
               )}
+              {type === TriggerType['工作类型'] && (
+                <OfficeWordTypeSelector visible={type === TriggerType['工作类型']} index={index} item={item} onChange={onConditionChange} />
+              )}
             </FormItem>
           );
         })}
@@ -21,7 +21,8 @@ export enum Condition_Type_Enum {
   '缴费申请款项',
   '事项申请款项',
   '报销类型',
-  '门店业态'
+  '门店业态',
+  '工作类型'
 }
  
 // 判断规则
+import React, { useEffect, useState } from 'react';
+import SelectorWithFull from '@/components/SelectorWithFull';
+import useInitial from '@/hooks/useInitail';
+import { getOfficeWordTypes } from '../../../api';
+
+interface Props {
+  visible: boolean;
+  index: number;
+  item: ApprovalSetting.ConditionVal;
+  readOnly?: boolean;
+  onChange: (item: ApprovalSetting.ConditionVal, value: any, index: number) => void;
+}
+
+// 工作类型
+export const OfficeWordTypeSelector = ({ visible, index, item, readOnly, onChange }: Props) => {
+  const { value } = item;
+  const originalData = JSON.parse(value || '{}');
+
+  const [delay, setDelay] = useState(true);
+  const { data, setParams } = useInitial(getOfficeWordTypes, [], {}, delay);
+
+  useEffect(() => {
+    if (visible) {
+      setDelay(false);
+      setParams({}, true);
+    }
+  }, [visible]);
+
+  return (
+    <SelectorWithFull
+      showSearch
+      autoClearSearchValue={false}
+      treeNodeFilterProp="label"
+      maxTagCount={100}
+      disabled={readOnly}
+      labelInValue
+      value={
+        originalData.length > 0
+          ? originalData.map((i: any) => ({
+              value: i.idOrCode,
+              label: i.name,
+            }))
+          : []
+      }
+      multiple
+      placeholder="请选择工作类型或输入关键字筛选"
+      onChange={(value) => onChange(item, value, index)}
+      data={data.map((item) => ({ key: item.id, value: item.id, label: item.name }))}
+    />
+  );
+};
@@ -14,3 +14,4 @@ export { BrandSelector } from &#39;./BrandSelector&#39;;
 export { RPTypesSelector } from './RPTypesSelector';
 export { BizTypeSelector } from './BizTypeSelector';
 export { ShopBizTypeSelector } from './ShopBizTypeSelector';
+export { OfficeWordTypeSelector } from './OfficeWordTypeSelector';
@@ -17,6 +17,7 @@ import {
   RPTypesSelector,
   BizTypeSelector,
   ShopBizTypeSelector,
+  OfficeWordTypeSelector,
 } from '@/pages/approval/ApprovalSetting/subpages/components/Selectors';
 import { TriggerAll } from '@/pages/approval/FlowSetting/entity';
 import { Condition_Type_Enum as TriggerType } from '@/pages/approval/ApprovalSetting/subpages/components/PreSettingForm/entity';
@@ -385,6 +386,9 @@ export default function CustomFlowNewOrEdit(props: Props) {
               {type === TriggerType['门店业态'] && (
                 <ShopBizTypeSelector visible={type === TriggerType['门店业态']} index={index} item={item} onChange={onConditionChange} />
               )}
+              {type === TriggerType['工作类型'] && (
+                <OfficeWordTypeSelector visible={type === TriggerType['工作类型']} index={index} item={item} onChange={onConditionChange} />
+              )}
             </FormItem>
           );
         })}