优化题库设置，添加适用范围展示，添加通用审批流程交互，并对接接口；

王强
1 parent 68e1e5e7
Showing 10 changed files with 429 additions and 196 deletions
src/pages/ehr/ProgramOfStudy/QuestionBank/api.ts
src/pages/ehr/ProgramOfStudy/QuestionBank/components/QuestionBankItem/MultipleChoice.tsx
src/pages/ehr/ProgramOfStudy/QuestionBank/components/QuestionBankList/QuestionBankModal.tsx
src/pages/ehr/ProgramOfStudy/QuestionBank/components/QuestionBankList/components/ApprovalProgressModal.tsx
src/pages/ehr/ProgramOfStudy/QuestionBank/components/QuestionBankList/components/DraftList/index.tsx
src/pages/ehr/ProgramOfStudy/QuestionBank/components/QuestionBankList/components/UsingList/index.tsx
src/pages/ehr/ProgramOfStudy/QuestionBank/index.tsx
src/pages/ehr/ProgramOfStudy/QuestionBank/interface.d.ts
src/pages/ehr/ProgramOfStudy/QuestionBank/store.ts
src/pages/ehr/ProgramOfStudy/Settings/components/ApprovalProgressModal.tsx
 import request from "@/utils/request";
 import { ABILITY_HOST } from "@/utils/host";
-import { common } from "@/typing/common";
 import { http } from "@/typing/http";
  
 /** 获取题库列表 */
-export function getQuestionBankListApi(params: QuestionBank.QueryParams) {
-  return request.get<common.Page<QuestionBank.List[]>>(
-    `${ABILITY_HOST}/erp/question/factory/list`,
-    { params }
-  );
+export function getQuestionBankListApi(
+  params: QuestionBank.QueryParams
+): http.PromisePageResp<QuestionBank.List> {
+  return request.get(`${ABILITY_HOST}/erp/question/factory/list`, { params });
 }
  
 /** 保存题库 */
@@ -24,21 +22,20 @@ export function deleteQuestionBankApi(id: number) {
 }
  
 /** 获取题目列表 */
-export function getQuestionListApi(params: { factoryId: number }) {
-  return request.get<common.Page<QuestionBank.Question[]>>(
-    `${ABILITY_HOST}/erp/question/info/list`,
-    { params }
-  );
+export function getQuestionListApi(params: {
+  factoryId: number;
+}): http.PromisePageResp<QuestionBank.Question> {
+  return request.get(`${ABILITY_HOST}/erp/question/info/list`, { params });
 }
  
 /** 保存题目 */
 export function saveQuestionApi(params: QuestionBank.Question) {
-  return request.post<any>(`${ABILITY_HOST}/erp/question/info/save`, params);
+  return request.post<string>(`${ABILITY_HOST}/erp/question/info/save`, params);
 }
  
 /** 删除题目 */
 export function deleteQuestionApi(id: number) {
-  return request.get<any>(`${ABILITY_HOST}/erp/question/info/del`, {
+  return request.get<string>(`${ABILITY_HOST}/erp/question/info/del`, {
     params: { id },
   });
 }
@@ -45,7 +45,7 @@ export default function MultipleChoice({ item, edit = false, index }: Props) {
  
   const formInit = () => {
     form.setFieldsValue({ ...initContent, rightAnswer: initContent.rightAnswer!.split(',') });
-  }
+  };
  
   // 确定添加/修改 题
   const onOk = () => {
@@ -56,6 +56,7 @@ export default function MultipleChoice({ item, edit = false, index }: Props) {
       }
       const params: QuestionBank.Question = {
         ...content,
+        draftId,
         title: val.title,
         rightAnswer: val.rightAnswer.sort().join(','),
       };
@@ -70,8 +71,8 @@ export default function MultipleChoice({ item, edit = false, index }: Props) {
         setIsAddFinish(true);
       }).catch(error => message.error(error.message));
       setContent({ ...content, id: content.index, title: val.title, rightAnswer: val.rightAnswer });
-    })
-  }
+    });
+  };
  
   // 添加选项
   const addOption = () => {
@@ -83,7 +84,7 @@ export default function MultipleChoice({ item, edit = false, index }: Props) {
     setContent({ ...content, answerItemList: [...content.answerItemList!, param] });
     setAddInputValue('');
     // setIsAdd(false);
-  }
+  };
  
   // 删除选项
   const delOption = (key: string) => {
@@ -96,7 +97,7 @@ export default function MultipleChoice({ item, edit = false, index }: Props) {
     // 如果删除选项编号在正确答案之前，则重置选项编号
     const rightLabels = content.answerItemList!.filter(ans => rightAnswer.filter((ra: string) => ra !== key).includes(ans.itemNo)).map(ans => ans.answerItem);
     if (rightAnswer.findIndex((ra: string) => +ra > +key) > -1) form.setFieldsValue({ rightAnswer: answerItemList.filter(ans => rightLabels.includes(ans.answerItem)).map(ans => ans.key) });
-  }
+  };
  
   // 删除题目
   const delQuestion = (item: QuestionBank.Question, index: number) => {
@@ -105,7 +106,7 @@ export default function MultipleChoice({ item, edit = false, index }: Props) {
       addModalContents.length > 0 && setAddModalContents(addModalContents.filter(content => content.index !== index));
       TYPE === 1 ? setQuestionLoading(true) : setDraftLoading(true);
     }).catch(error => message.error(error.message));
-  }
+  };
  
   // 取消编辑题目
   const cancel = () => {
@@ -118,7 +119,7 @@ export default function MultipleChoice({ item, edit = false, index }: Props) {
       setAddModalContents(addModalContents.filter(cont => cont.index !== content.index));
       setIsAddFinish(true);
     }
-  }
+  };
  
   return (
     <Row
@@ -136,64 +137,68 @@ export default function MultipleChoice({ item, edit = false, index }: Props) {
     >
       {isBatchDelete ? <Checkbox style={{ marginRight: 10 }} checked={isChecked} /> : null}
       <Card style={{ flex: 1, marginBottom: 10, borderColor: isChecked ? '#1890FF' : '' }}>
-        <Row justify='space-between' align='top'>
+        <Row justify="space-between" align="top">
           <Col span={2}>{!addVisible && (index !== undefined && typeof index === 'number') && <h1>{TYPE === 1 ? index + 1 + (current! - 1) * pageSize! : count}</h1>}</Col>
           <Col span={18}>
             <Form form={form}>
-              <Form.Item name='title' rules={[{ required: isEdit, message: '请输入题目' }]}>
+              <Form.Item name="title" rules={[{ required: isEdit, message: '请输入题目' }]}>
                 {!isEdit ?
                   <span style={{ fontSize: 16, display: 'block' }}>{content.title}</span> :
-                  <Input placeholder='请输入题目' allowClear />}
+                  <Input placeholder="请输入题目" allowClear />}
               </Form.Item>
-              <Form.Item name='rightAnswer' rules={[{ required: isEdit, message: '请选择正确答案' }]}>
-                <Checkbox.Group className='multipleChoice' disabled={!isEdit} >
-                  {content.answerItemList!.map(ans => <Checkbox key={ans.itemNo} value={ans.itemNo} style={{ width: '100%', marginBottom: 10 }}>
-                    <div style={{ display: 'flex', justifyContent: 'space-between', width: '100%' }}>
-                      <span className="span_word_break" style={{ display: 'block', width: '95%' }}>{ans.itemNo}.&nbsp;&nbsp;{ans.answerItem}</span>
-                      {isEdit && <Popconfirm title={`确定删除？`} onConfirm={() => delOption(ans.itemNo!)}><Button type='link' style={{ display: 'block' }} icon={<DeleteOutlined />} /></Popconfirm>}
-                    </div>
-                  </Checkbox>
+              <Form.Item name="rightAnswer" rules={[{ required: isEdit, message: '请选择正确答案' }]}>
+                <Checkbox.Group className="multipleChoice" disabled={!isEdit}>
+                  {content.answerItemList!.map(ans => (
+                    <Checkbox key={ans.itemNo} value={ans.itemNo} style={{ width: '100%', marginBottom: 10 }}>
+                      <div style={{ display: 'flex', justifyContent: 'space-between', width: '100%' }}>
+                        <span className="span_word_break" style={{ display: 'block', width: '95%' }}>{ans.itemNo}.&nbsp;&nbsp;{ans.answerItem}</span>
+                        {isEdit && <Popconfirm title="确定删除？" onConfirm={() => delOption(ans.itemNo!)}><Button type="link" style={{ display: 'block' }} icon={<DeleteOutlined />} /></Popconfirm>}
+                      </div>
+                    </Checkbox>
+)
                   )}
                 </Checkbox.Group>
               </Form.Item>
             </Form>
-            <Row justify='space-between' style={{ height: 42 }}>
+            <Row justify="space-between" style={{ height: 42 }}>
               <Col span={6} style={{ justifyContent: 'center', alignItems: 'center', display: 'flex' }}>
-                {isEdit && <Button disabled={!isEdit} type='link' icon={isAdd ? <CloseOutlined /> : <PlusOutlined />} style={{ padding: '4px 0' }} onClick={() => setIsAdd(!isAdd)}>{isAdd ? '取消添加选项' : '添加单个选项'}</Button>}
+                {isEdit && <Button disabled={!isEdit} type="link" icon={isAdd ? <CloseOutlined /> : <PlusOutlined />} style={{ padding: '4px 0' }} onClick={() => setIsAdd(!isAdd)}>{isAdd ? '取消添加选项' : '添加单个选项'}</Button>}
               </Col>
               <Col span={18}>
-                {isAdd && <Input
+                {isAdd && (
+                <Input
                   style={{ width: '100%' }}
-                  placeholder='请输入选项'
+                  placeholder="请输入选项"
                   allowClear
                   value={addInputValue}
                   onChange={e => setAddInputValue(e.target.value.trim())}
                   onPressEnter={() => addOption()}
                   suffix={
-                    <Button type='link' icon={<PlusCircleOutlined />} onClick={() => addOption()} />
-                  } />
-                }
+                    <Button type="link" icon={<PlusCircleOutlined />} onClick={() => addOption()} />
+                  }
+                />
+)}
               </Col>
             </Row>
           </Col>
           <Col span={4}>
             {TYPE === 2 && !isBatchDelete ? (
-              <Row justify='end'>
+              <Row justify="end">
                 {/* {!isEdit && <Button disabled type='default' style={{ marginRight: 10 }} icon={<DragOutlined />} />} */}
                 {!isEdit ?
-                  <Button type='default' style={{ marginRight: 10 }} icon={<FormOutlined />} onClick={() => setIsEdit(!isEdit)} /> :
-                  <Button type='default' style={{ marginRight: 10 }} icon={<CheckOutlined />} onClick={() => onOk()} />}
-                {!isEdit ?
-                  <Popconfirm title={`确定删除？`} onConfirm={() => delQuestion(content!, content.index!)}>
-                    <Button type='default' icon={<DeleteOutlined />} danger />
-                  </Popconfirm> :
-                  <Button type='default' icon={<CloseOutlined />} onClick={cancel} />
-                }
+                  <Button type="default" style={{ marginRight: 10 }} icon={<FormOutlined />} onClick={() => setIsEdit(!isEdit)} /> :
+                  <Button type="default" style={{ marginRight: 10 }} icon={<CheckOutlined />} onClick={() => onOk()} />}
+                {!isEdit ? (
+                  <Popconfirm title="确定删除？" onConfirm={() => delQuestion(content!, content.index!)}>
+                    <Button type="default" icon={<DeleteOutlined />} danger />
+                  </Popconfirm>
+                ) :
+                  <Button type="default" icon={<CloseOutlined />} onClick={cancel} />}
               </Row>
             ) : null}
           </Col>
         </Row>
       </Card>
     </Row>
-  )
+  );
 }
 \ No newline at end of file
 /*
  * @Date: 2021-07-14 10:54:47
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2022-12-09 19:06:15
+ * @LastEditTime: 2023-02-10 09:13:23
  */
 import React, { useEffect, useState } from "react";
 import { Modal, Form, Input, message, TreeSelect } from "antd";
 import { useStore } from "../../index";
 import { saveQuestionBankApi, saveDraftApi } from "../../api";
-import { LabeledValue } from "antd/lib/select";
 import RangeRoleSelector from "@/pages/ehr/ProgramOfStudy/components/RangeRoleSelector";
+import SelectBrandOrSeries from '@/pages/ehr/ProgramOfStudy/components/SelectBrandOrSeries';
  
 export default function QuestionBankModal() {
   const {
@@ -29,13 +29,11 @@ export default function QuestionBankModal() {
     draftPagination;
   const [form] = Form.useForm();
   const [confirmLoading, setComfirmLoading] = useState(false);
-  const [standardId, setStandardId] = useState<number>();
  
   useEffect(() => {
     if (visible) {
       currentItem && form.setFieldsValue(currentItem);
       if (currentItem) {
-        setStandardId(currentItem.standardId);
         form.setFieldsValue({
           name: currentItem.name,
           standardId: currentItem.standardId,
@@ -46,6 +44,13 @@ export default function QuestionBankModal() {
               value: role.roleCode,
             })),
           },
+          adapter: {
+            type: currentItem.adapterType,
+            list: currentItem.adapterList?.map((range) => ({
+              value: range.adapterId,
+              label: range.adapterName,
+            })),
+          },
         });
       } else {
         form.setFieldsValue({
@@ -68,6 +73,11 @@ export default function QuestionBankModal() {
         roleCode: item.value,
         roleName: item.label,
       })),
+      adapterType: val?.adapter?.type,
+      adapterList: val?.adapter?.list?.map((item: any) => ({
+        adapterId: item.value,
+        adapterName: item.label,
+      })),
     };
     const api = TYPE === 2 || isDraft ? saveDraftApi : saveQuestionBankApi;
     api(params)
@@ -88,13 +98,6 @@ export default function QuestionBankModal() {
       });
   };
  
-  const standardChange = (standard: LabeledValue) => {
-    if (!!standard && visible) {
-      setStandardId(+standard?.value);
-    }
-    return standard;
-  };
-
   const validatorRole = (rule: any, value: any) => {
     if (!value) return Promise.reject(Error("请选择适用角色"));
     if (value.type === 2 && !value?.list) {
@@ -103,6 +106,32 @@ export default function QuestionBankModal() {
     return Promise.resolve();
   };
  
+  const validatorBrandOrSeries = (
+    rule: any,
+    value: any = { type: 1, list: [] }
+  ) => {
+    if (value.type === 4) return Promise.resolve();
+    if (!value.type || !value.list?.length) {
+      return Promise.reject(Error("请选择适用范围"));
+    }
+    if (value.list && value.list.length > 0) return Promise.resolve();
+    else {
+      return Promise.reject(
+        Error(
+          `请选择${
+            value.type === 1
+              ? "品牌"
+              : value.type === 2
+              ? "车系"
+              : value.type === 3
+              ? "门店"
+              : "适用范围"
+          }`
+        )
+      );
+    }
+  };
+
   return (
     <Modal
       title={
@@ -144,7 +173,6 @@ export default function QuestionBankModal() {
           name="standardId"
           label="业务类型"
           rules={[{ required: true, message: "请选择业务类型" }]}
-          getValueFromEvent={standardChange}
         >
           <TreeSelect
             allowClear
@@ -164,6 +192,19 @@ export default function QuestionBankModal() {
           />
         </Form.Item>
         <Form.Item
+          label="适用范围"
+          name="adapter"
+          rules={[
+            {
+              required: true,
+              validator: validatorBrandOrSeries,
+              message: "请选择适用范围",
+            },
+          ]}
+        >
+          <SelectBrandOrSeries mode="multiple" />
+        </Form.Item>
+        <Form.Item
           name="role"
           label="适用角色"
           required
+/*
+ * @Author: wangqiang@feewee.cn
+ * @Date: 2022-10-26 09:24:59
+ * @LastEditors: wangqiang@feewee.cn
+ * @LastEditTime: 2023-02-09 17:43:55
+ */
+import ApprovalProgress from "@/components/ApprovalProgress";
+import { Button, Modal } from "antd";
+import React from "react";
+import { useStore } from "../../../index";
+
+export default function ApprovalProgressModal() {
+  const { approvalProgressModalInfo, setApprovalProgressModalInfo } =
+    useStore();
+
+  const onCancel = () => setApprovalProgressModalInfo({ visible: false });
+
+  return (
+    <Modal
+      title={`${
+        approvalProgressModalInfo.title
+          ? approvalProgressModalInfo.title + "-"
+          : ""
+      }审批进度`}
+      open={approvalProgressModalInfo.visible}
+      onCancel={onCancel}
+      maskClosable={false}
+      destroyOnClose
+      footer={[
+        <Button key="cancel" onClick={onCancel}>
+          关闭
+        </Button>,
+      ]}
+    >
+      <ApprovalProgress orderNo={approvalProgressModalInfo.orderNo} />
+    </Modal>
+  );
+}
 /*
  * @Date: 2021-07-26 17:19:45
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2022-11-21 20:01:42
+ * @LastEditTime: 2023-02-09 17:54:02
  */
 import React, { useEffect } from "react";
 import { useStore } from "../../../../index";
@@ -20,6 +20,8 @@ import {
 import { PlusOutlined } from "@ant-design/icons";
 import { debounce } from "lodash";
 import QuestionBankModal from "../../QuestionBankModal";
+import { AdapterType } from "@/pages/ehr/ProgramOfStudy/Settings/store";
+import ApprovalProgressModal from "@/pages/ehr/ProgramOfStudy/QuestionBank/components/QuestionBankList/components/ApprovalProgressModal";
  
 enum Status {
   "default" = 1,
@@ -44,10 +46,11 @@ export default function DraftList() {
     breadcrumbs,
     setBreadcrumbs,
     setCurrentBreadcrumb,
-    roleVisible,
-    setRoleVisible,
+    detailModalInfo,
+    setDetailModalInfo,
     isDraft,
     setIsDraft,
+    setApprovalProgressModalInfo,
   } = useStore();
   const {
     list,
@@ -57,7 +60,6 @@ export default function DraftList() {
     setParams,
     paginationConfig,
   } = draftPagination;
-  const { current, pageSize } = paginationConfig;
  
   useEffect(() => {
     if (isDraft) {
@@ -81,21 +83,31 @@ export default function DraftList() {
   };
  
   const delBank = (id: number) => {
+    const hide = message.loading("删除中，请稍后...", 0);
     deleteDraftApi(id)
       .then((res) => {
+        hide();
         message.success(res.result);
         setLoading(true);
       })
-      .catch((error) => message.error(error.message));
+      .catch((error) => {
+        hide();
+        message.error(error.message);
+      });
   };
  
   const approvalDraft = (draftId: number) => {
+    const hide = message.loading("提交中，请稍后...", 0);
     approvalDraftApi(draftId)
       .then((res) => {
+        hide();
         message.success(res.result);
         setLoading(true);
       })
-      .catch((error) => message.error(error.message));
+      .catch((error) => {
+        hide();
+        message.error(error.message);
+      });
   };
  
   const search = debounce(
@@ -132,12 +144,6 @@ export default function DraftList() {
         loading={loading}
       >
         <Table.Column
-          title="题库编号"
-          dataIndex="id"
-          align="left"
-          render={(id: number, record: QuestionBank.List, index: number) => index + 1 + (current! - 1) * pageSize!}
-        />
-        <Table.Column
           title="题库名称"
           dataIndex="name"
           align="left"
@@ -161,26 +167,44 @@ export default function DraftList() {
         <Table.Column
           title="适用角色"
           align="left"
-          render={(record: QuestionBank.List) => (
-            <span
-              style={{ color: record.scopeType === 1 ? "orange" : "purple" }}
-            >
-              {record.scopeType === 1 ? (
-                "全部"
-              ) : record.roleList?.length ? (
+          render={(record: QuestionBank.List) => (record.scopeType === 1 ? (
+              "全部角色"
+            ) : record.roleList?.length ? (
+              <a
+                onClick={() => {
+                  setCurrentItem(record);
+                  setDetailModalInfo({ visible: true, type: "适用角色" });
+                }}
+              >
+                部分角色
+              </a>
+            ) : (
+              "-"
+            ))}
+        />
+        <Table.Column
+          title="适用范围"
+          align="left"
+          render={(record: QuestionBank.List) => (record.adapterType ? (
+              record.adapterType === AdapterType.全部门店 ? (
+                "全部门店"
+              ) : (
                 <a
                   onClick={() => {
                     setCurrentItem(record);
-                    setRoleVisible(true);
+                    setDetailModalInfo({
+                      visible: true,
+                      type: "适用范围",
+                      typeName: AdapterType[record.adapterType!],
+                    });
                   }}
                 >
-                  部分
+                  {AdapterType[record.adapterType]}
                 </a>
-              ) : (
-                "-"
-              )}
-            </span>
-          )}
+              )
+            ) : (
+              "-"
+            ))}
         />
         <Table.Column
           title="状态"
@@ -193,56 +217,90 @@ export default function DraftList() {
         <Table.Column
           title="操作"
           align="left"
-          render={(record: QuestionBank.List) => (record.status === StatusText["审批中"] ? (
-            <span style={{ color: "#999" }}>审批中的草稿无法操作</span>
-            ) : (
-              <>
-                <a
-                  onClick={() => {
-                    setCurrentItem(record);
-                    setVisible(true);
-                  }}
-                >
-                  编辑
-                </a>
-                <Divider type="vertical" />
-                <Popconfirm
-                  title={`确定提交【${record.name}】审批？`}
-                  onConfirm={() => approvalDraft(record.id!)}
-                >
-                  <a style={{ color: "#faad14" }}>提交审批</a>
-                </Popconfirm>
-                <Divider type="vertical" />
-                <Popconfirm
-                  title={`确定删除【${record.name}】?`}
-                  onConfirm={() => delBank(record.id!)}
-                >
-                  <a style={{ color: "red" }}>删除</a>
-                </Popconfirm>
-              </>
-            ))}
+          render={(record: QuestionBank.List) => (
+            <>
+              {record.auditNo ? (
+                <>
+                  <a
+                    onClick={() => {
+                      setApprovalProgressModalInfo({
+                        title: record.name,
+                        visible: true,
+                        orderNo: record.auditNo,
+                      });
+                    }}
+                  >
+                    审批进度
+                  </a>
+                  <Divider type="vertical" />
+                </>
+              ) : null}
+              {record.status === StatusText.审批中 ? null : (
+                <>
+                  <a
+                    onClick={() => {
+                      setCurrentItem(record);
+                      setVisible(true);
+                    }}
+                  >
+                    编辑
+                  </a>
+                  <Divider type="vertical" />
+                  <Popconfirm
+                    title={`确定提交【${record.name}】审批？`}
+                    onConfirm={() => approvalDraft(record.id!)}
+                  >
+                    <a style={{ color: "#faad14" }}>提交审批</a>
+                  </Popconfirm>
+                  <Divider type="vertical" />
+                  <Popconfirm
+                    title={`确定删除【${record.name}】?`}
+                    onConfirm={() => delBank(record.id!)}
+                  >
+                    <a style={{ color: "red" }}>删除</a>
+                  </Popconfirm>
+                </>
+              )}
+            </>
+          )}
         />
       </Table>
       <QuestionBankModal />
       <Modal
-        title={currentItem && `【${currentItem.name}】适用角色`}
-        visible={roleVisible}
+        title={
+          currentItem &&
+          `【${currentItem.name}】-${detailModalInfo.type}${
+            detailModalInfo.typeName ? `-${detailModalInfo.typeName}` : ""
+          }`
+        }
+        visible={detailModalInfo.visible}
         maskClosable={false}
-        onOk={() => setRoleVisible(false)}
-        onCancel={() => setRoleVisible(false)}
+        onOk={() => setDetailModalInfo({ visible: false, type: "适用角色" })}
+        onCancel={() => setDetailModalInfo({ visible: false, type: "适用角色" })}
         footer={[
-          <Button key="1" onClick={() => setRoleVisible(false)}>
+          <Button
+            key="1"
+            onClick={() => setDetailModalInfo({ visible: false, type: "适用角色" })}
+          >
             关闭
           </Button>,
         ]}
         afterClose={() => setCurrentItem(undefined)}
       >
         <div style={{ flex: 1, maxHeight: 550, overflowY: "auto" }}>
-          {currentItem?.roleList?.map((role, index) => (
-            <p key={role.roleCode}>{role.roleName}</p>
-          ))}
+          {detailModalInfo.type === "适用角色"
+            ? currentItem?.roleList?.map((role, index) => (
+              <p key={role.roleCode}>{role.roleName}</p>
+              ))
+            : null}
+          {detailModalInfo.type === "适用范围"
+            ? currentItem?.adapterList?.map((adapter, index) => (
+              <p key={adapter.adapterId}>{adapter.adapterName}</p>
+              ))
+            : null}
         </div>
       </Modal>
+      <ApprovalProgressModal />
     </>
   );
 }
 /*
  * @Date: 2021-07-26 17:19:45
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2022-12-09 19:07:33
+ * @LastEditTime: 2023-02-09 17:52:44
  */
 import React, { useEffect, useState } from "react";
 import { useStore } from "../../../../index";
@@ -21,6 +21,8 @@ import { debounce } from &quot;lodash&quot;;
 import QuestionBankModal from "../../QuestionBankModal";
 import RangeRoleSelector from "@/pages/ehr/ProgramOfStudy/components/RangeRoleSelector";
 import FeeweeFilterOption from "@/pages/notice/components/FeeweeFilterOption";
+import SelectBrandOrSeries from "@/pages/ehr/ProgramOfStudy/components/SelectBrandOrSeries";
+import { AdapterType } from "@/pages/ehr/ProgramOfStudy/Settings/store";
  
 export default function UsingList() {
   const {
@@ -32,8 +34,8 @@ export default function UsingList() {
     breadcrumbs,
     setBreadcrumbs,
     setCurrentBreadcrumb,
-    roleVisible,
-    setRoleVisible,
+    detailModalInfo,
+    setDetailModalInfo,
     setIsDraft,
     setTYPE,
     draftPagination,
@@ -47,7 +49,6 @@ export default function UsingList() {
     setParams,
     paginationConfig,
   } = pagination;
-  const { current, pageSize } = paginationConfig;
   const [getDraftLoading, setGetDraftLoading] = useState(false);
  
   useEffect(() => {
@@ -62,12 +63,17 @@ export default function UsingList() {
   };
  
   const delBank = (id: number) => {
+    const hide = message.loading("删除中，请稍后...", 0);
     deleteQuestionBankApi(id)
       .then((res) => {
+        hide();
         message.success("删除成功");
         setLoading(true);
       })
-      .catch((error) => message.error(error.message));
+      .catch((error) => {
+        hide();
+        message.error(error.message);
+      });
   };
  
   const search = debounce(
@@ -162,6 +168,32 @@ export default function UsingList() {
             display: innerParams.standardId ? "flex" : "none",
           }}
         />
+        <SelectBrandOrSeries
+          useFilter
+          value={{
+            type: pagination.innerParams.adapterType,
+            list:
+              pagination.innerParams.adapterId &&
+              pagination.innerParams.adapterName
+                ? [
+                    {
+                      value: pagination.innerParams.adapterId,
+                      label: pagination.innerParams.adapterName,
+                    },
+                  ]
+                : undefined,
+          }}
+          onChange={(value: any) => {
+            pagination.setParams(
+              {
+                adapterType: value?.type,
+                adapterId: value?.list?.[0]?.value,
+                adapterName: value?.list?.[0]?.label,
+              },
+              true
+            );
+          }}
+        />
         {/* </Row> */}
         {/* <Button icon={(<PlusOutlined />)} type="primary" onClick={() => { setCurrentItem(undefined); setVisible(true); }}>添加题库</Button> */}
       </Row>
@@ -172,12 +204,6 @@ export default function UsingList() {
         loading={loading || getDraftLoading}
       >
         <Table.Column
-          title="题库编号"
-          dataIndex="id"
-          align="left"
-          render={(id: number, record: QuestionBank.List, index: number) => index + 1 + (current! - 1) * pageSize!}
-        />
-        <Table.Column
           title="题库名称"
           dataIndex="name"
           align="left"
@@ -197,26 +223,44 @@ export default function UsingList() {
         <Table.Column
           title="适用角色"
           align="left"
-          render={(record: QuestionBank.List) => (
-            <span
-              style={{ color: record.scopeType === 1 ? "orange" : "purple" }}
-            >
-              {record.scopeType === 1 ? (
-                "全部角色"
-              ) : record.roleList?.length ? (
+          render={(record: QuestionBank.List) => (record.scopeType === 1 ? (
+              "全部角色"
+            ) : record.roleList?.length ? (
+              <a
+                onClick={() => {
+                  setCurrentItem(record);
+                  setDetailModalInfo({ visible: true, type: "适用角色" });
+                }}
+              >
+                部分角色
+              </a>
+            ) : (
+              "-"
+            ))}
+        />
+        <Table.Column
+          title="适用范围"
+          align="left"
+          render={(record: QuestionBank.List) => (record.adapterType ? (
+              record.adapterType === AdapterType.全部门店 ? (
+                "全部门店"
+              ) : (
                 <a
                   onClick={() => {
                     setCurrentItem(record);
-                    setRoleVisible(true);
+                    setDetailModalInfo({
+                      visible: true,
+                      type: "适用范围",
+                      typeName: AdapterType[record.adapterType!],
+                    });
                   }}
                 >
-                  部分角色
+                  {AdapterType[record.adapterType]}
                 </a>
-              ) : (
-                "-"
-              )}
-            </span>
-          )}
+              )
+            ) : (
+              "-"
+            ))}
         />
         <Table.Column
           title="操作"
@@ -251,22 +295,37 @@ export default function UsingList() {
       </Table>
       <QuestionBankModal />
       <Modal
-        title={currentItem && `【${currentItem.name}】适用角色`}
-        visible={roleVisible}
+        title={
+          currentItem &&
+          `【${currentItem.name}】-${detailModalInfo.type}${
+            detailModalInfo.typeName ? `-${detailModalInfo.typeName}` : ""
+          }`
+        }
+        visible={detailModalInfo.visible}
         maskClosable={false}
-        onOk={() => setRoleVisible(false)}
-        onCancel={() => setRoleVisible(false)}
+        onOk={() => setDetailModalInfo({ visible: false, type: "适用角色" })}
+        onCancel={() => setDetailModalInfo({ visible: false, type: "适用角色" })}
         footer={[
-          <Button key="1" onClick={() => setRoleVisible(false)}>
+          <Button
+            key="1"
+            onClick={() => setDetailModalInfo({ visible: false, type: "适用角色" })}
+          >
             关闭
           </Button>,
         ]}
         afterClose={() => setCurrentItem(undefined)}
       >
         <div style={{ flex: 1, maxHeight: 550, overflowY: "auto" }}>
-          {currentItem?.roleList?.map((role, index) => (
-            <p key={role.roleCode}>{role.roleName}</p>
-          ))}
+          {detailModalInfo.type === "适用角色"
+            ? currentItem?.roleList?.map((role, index) => (
+              <p key={role.roleCode}>{role.roleName}</p>
+              ))
+            : null}
+          {detailModalInfo.type === "适用范围"
+            ? currentItem?.adapterList?.map((adapter, index) => (
+              <p key={adapter.adapterId}>{adapter.adapterName}</p>
+              ))
+            : null}
         </div>
       </Modal>
     </>
 /*
  * @Date: 2021-07-14 10:54:47
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2021-07-27 17:08:02
+ * @LastEditTime: 2023-02-09 17:00:20
  */
-import React, { useEffect, useState } from 'react';
-import { Card, ConfigProvider, Breadcrumb } from 'antd';
-import zhCN from 'antd/lib/locale-provider/zh_CN';
-import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import List from './components/QuestionBankList';
-import Item from './components/QuestionBankItem';
-import { createStore } from '@/hooks/moz';
-import store, { BreadcrumbItem } from './store';
-import './style.less';
+import React, { useEffect, useState } from "react";
+import { Card, ConfigProvider, Breadcrumb } from "antd";
+import zhCN from "antd/lib/locale-provider/zh_CN";
+import { PageHeaderWrapper } from "@ant-design/pro-layout";
+import List from "./components/QuestionBankList";
+import Item from "./components/QuestionBankItem";
+import { createStore } from "@/hooks/moz";
+import store, { BreadcrumbItem } from "./store";
+import "./style.less";
  
 export const { Provider, useStore } = createStore(store);
  
@@ -25,17 +25,17 @@ function QuestionBank() {
     setCurrentBreadcrumb,
     currentItem,
     setCurrentItem,
-    TYPE
+    TYPE,
   } = useStore();
   const { setLoading } = pagination;
   const [IndexDOM, setIndexDOM] = useState(<List />);
  
   useEffect(() => {
     switch (currentBreadcrumb.key) {
-      case 'list':
+      case "list":
         setIndexDOM(<List />);
         break;
-      case 'detail':
+      case "detail":
         setIndexDOM(<Item />);
         break;
       default:
@@ -45,32 +45,51 @@ function QuestionBank() {
  
   const breadcrumbClick = (breadcrumb: BreadcrumbItem, index: number) => {
     if (breadcrumb.key === currentBreadcrumb.key) return;
-    if (breadcrumb.key === 'list') {
+    if (breadcrumb.key === "list") {
       setCurrentItem(undefined);
       setLoading(true);
       setFactoryId(0);
     }
     setCurrentBreadcrumb(breadcrumb);
     setBreadcrumbs(breadcrumbs.slice(0, index + 1));
-  }
+  };
  
   return (
-    <PageHeaderWrapper title={(
-      <div>
-        <span>题库设置{currentBreadcrumb.key === 'detail' ? `-${currentItem ? `编辑${TYPE === 2 ? '草稿' : ''}(${currentItem.name})` : `添加${TYPE === 2 ? '草稿' : ''}`}` : null}</span>
-        <Breadcrumb separator='>' style={{ marginTop: 10 }}>
-          {breadcrumbs.map((breadcrumb, index) =>
-            <Breadcrumb.Item onClick={() => breadcrumbClick(breadcrumb, index)} key={breadcrumb.key}><a>{breadcrumb.name}</a></Breadcrumb.Item>)}
-        </Breadcrumb>
-      </div>
-    )}>
+    <PageHeaderWrapper
+      title={
+        <div>
+          <span>
+            题库设置
+            {currentBreadcrumb.key === "detail"
+              ? `-${
+                  currentItem
+                    ? `编辑${TYPE === 2 ? "草稿" : ""}(${currentItem.name})`
+                    : `添加${TYPE === 2 ? "草稿" : ""}`
+                }`
+              : null}
+          </span>
+          <Breadcrumb separator=">" style={{ marginTop: 10 }}>
+            {breadcrumbs.map((breadcrumb, index) => (
+              <Breadcrumb.Item
+                onClick={() => breadcrumbClick(breadcrumb, index)}
+                key={breadcrumb.key}
+              >
+                <a>{breadcrumb.name}</a>
+              </Breadcrumb.Item>
+            ))}
+          </Breadcrumb>
+        </div>
+      }
+    >
       <ConfigProvider locale={zhCN}>
-        <Card bordered={false}>
-          {IndexDOM}
-        </Card>
+        <Card bordered={false}>{IndexDOM}</Card>
       </ConfigProvider>
     </PageHeaderWrapper>
-  )
+  );
 }
  
-export default () => <Provider><QuestionBank /></Provider>
+export default () => (
+  <Provider>
+    <QuestionBank />
+  </Provider>
+);
 /*
  * @Date: 2021-02-24 09:57:33
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2022-11-21 19:50:00
+ * @LastEditTime: 2023-02-09 17:42:00
  */
 declare namespace QuestionBank {
   interface QueryParams {
@@ -10,6 +10,9 @@ declare namespace QuestionBank {
     standardId?: number; // 业务类型ID
     scopeType?: number; // 适配范围 1通用 2部分
     roleCode?: string; // 角色码
+    adapterType?: number; // 适配类型 1品牌 2车系 3门店 4通用
+    adapterId?: number;
+    adapterName?: string;
   }
  
   interface List {
@@ -21,7 +24,15 @@ declare namespace QuestionBank {
     roleList?: RoleVO[];
     standardId?: number; //业务类型ID
     standardName?: string; //业务类型名称
+    adapterType?: number; // 适配类型 1品牌 2车系 3门店 4通用
+    adapterList?: AdapterVO[]; // 适配列表
     status?: 1 | 2; //状态 1草稿 2审批中 3审批拒绝
+    auditNo?: string; // 审批编号
+  }
+
+  interface AdapterVO {
+    adapterId?: number;
+    adapterName?: string;
   }
  
   interface RoleVO {
 /*
  * @Date: 2021-02-24 09:57:33
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2022-12-09 17:50:05
+ * @LastEditTime: 2023-02-09 17:50:44
  */
 import useInitial from "@/hooks/useInitail";
 import usePagination from "@/hooks/usePagination";
-import { getUserAbilityTypeListApi } from '@/pages/ehr/ProgramOfStudy/api';
+import { getUserAbilityTypeListApi } from "@/pages/ehr/ProgramOfStudy/api";
 import { useState, ReactNode } from "react";
 import {
   getQuestionBankListApi,
@@ -68,11 +68,7 @@ export default function useStore() {
   const [isAddFinish, setIsAddFinish] = useState(true);
   const [currentItem, setCurrentItem] = useState<QuestionBank.List>();
   // 列表项
-  const pagination = usePagination<QuestionBank.List[]>(
-    getQuestionBankListApi,
-    {},
-    {}
-  );
+  const pagination = usePagination(getQuestionBankListApi, {});
   const [delay, setQuestionDelay] = useState(true);
   const [factoryId, setFactoryId] = useState(0);
   const [draftId, setDraftId] = useState(0);
@@ -86,7 +82,11 @@ export default function useStore() {
     { node: ReactNode; index: number }[]
   >([]);
   const [abilityAttachVisible, setAbilityAttachVisible] = useState(false);
-  const [roleVisible, setRoleVisible] = useState(false);
+  const [detailModalInfo, setDetailModalInfo] = useState<{
+    visible: boolean;
+    type: "适用角色" | "适用范围";
+    typeName?: string;
+  }>({ visible: false, type: "适用角色" });
  
   const draftPagination = usePagination(getDraftListApi);
   const draftQuestionInitial = useInitial(
@@ -104,6 +104,8 @@ export default function useStore() {
     [],
     undefined
   );
+  const [approvalProgressModalInfo, setApprovalProgressModalInfo] =
+    useState<PublicNotice.ApprovalProgressModalInfo>({ visible: false });
  
   // useEffect(() => {
   //   if (factoryId > 0) {
@@ -145,8 +147,8 @@ export default function useStore() {
     setAddModalContents,
     abilityAttachVisible,
     setAbilityAttachVisible,
-    roleVisible,
-    setRoleVisible,
+    detailModalInfo,
+    setDetailModalInfo,
     draftPagination,
     draftQuestionInitial,
     isBatchDelete,
@@ -156,5 +158,7 @@ export default function useStore() {
     isDraft,
     setIsDraft,
     abilityTypeInitial,
+    approvalProgressModalInfo,
+    setApprovalProgressModalInfo,
   };
 }
@@ -2,7 +2,7 @@
  * @Author: wangqiang@feewee.cn
  * @Date: 2022-10-26 09:24:59
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2022-10-26 17:56:29
+ * @LastEditTime: 2023-02-09 17:43:52
  */
 import ApprovalProgress from "@/components/ApprovalProgress";
 import { Button, Modal } from "antd";
@@ -25,6 +25,7 @@ export default function ApprovalProgressModal() {
       open={approvalProgressModalInfo.visible}
       onCancel={onCancel}
       maskClosable={false}
+      destroyOnClose
       footer={[
         <Button key="cancel" onClick={onCancel}>
           关闭