Merge branch 'master' of http://39.108.227.113:8001/zhusen/canrd-erp-front

凌世锦
2 parents b559cda3 8496500b
Showing 6 changed files with 737 additions and 72 deletions
.umirc.ts
src/pages/Client/index.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/index.tsx
src/services/definition.ts
src/services/request.ts
@@ -86,6 +86,12 @@ export default defineConfig({
       icon: 'BookOutlined',
       access: 'canReadAdmin',
     },
+    /*{
+      name: '客户管理',
+      path: '/client',
+      component: './Client',
+      icon: 'BookOutlined',
+    },*/
     {
       name: '打印',
       path: '/print',
+import { EllipsisOutlined, PlusOutlined } from '@ant-design/icons';
+import type { ActionType, ProColumns } from '@ant-design/pro-components';
+import { ProTable, TableDropdown } from '@ant-design/pro-components';
+import { request } from '@umijs/max';
+import { Button, Dropdown, Space, Tag } from 'antd';
+import { useRef } from 'react';
+
+export const waitTimePromise = async (time: number = 100) => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve(true);
+    }, time);
+  });
+};
+
+export const waitTime = async (time: number = 100) => {
+  await waitTimePromise(time);
+};
+
+type GithubIssueItem = {
+  url: string;
+  id: number;
+  number: number;
+  title: string;
+  labels: {
+    name: string;
+    color: string;
+  }[];
+  state: string;
+  comments: number;
+  created_at: string;
+  updated_at: string;
+  closed_at?: string;
+};
+
+const columns: ProColumns<GithubIssueItem>[] = [
+  {
+    dataIndex: 'index',
+    valueType: 'indexBorder',
+    width: 48,
+  },
+  {
+    title: '标题',
+    dataIndex: 'title',
+    copyable: true,
+    ellipsis: true,
+    tooltip: '标题过长会自动收缩',
+    formItemProps: {
+      rules: [
+        {
+          required: true,
+          message: '此项为必填项',
+        },
+      ],
+    },
+  },
+  {
+    disable: true,
+    title: '状态',
+    dataIndex: 'state',
+    filters: true,
+    onFilter: true,
+    ellipsis: true,
+    valueType: 'select',
+    valueEnum: {
+      all: { text: '超长'.repeat(50) },
+      open: {
+        text: '未解决',
+        status: 'Error',
+      },
+      closed: {
+        text: '已解决',
+        status: 'Success',
+        disabled: true,
+      },
+      processing: {
+        text: '解决中',
+        status: 'Processing',
+      },
+    },
+  },
+  {
+    disable: true,
+    title: '标签',
+    dataIndex: 'labels',
+    search: false,
+    renderFormItem: (_, { defaultRender }) => {
+      return defaultRender(_);
+    },
+    render: (_, record) => (
+      <Space>
+        {record.labels.map(({ name, color }) => (
+          <Tag color={color} key={name}>
+            {name}
+          </Tag>
+        ))}
+      </Space>
+    ),
+  },
+  {
+    title: '创建时间',
+    key: 'showTime',
+    dataIndex: 'created_at',
+    valueType: 'date',
+    sorter: true,
+    hideInSearch: true,
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'created_at',
+    valueType: 'dateRange',
+    hideInTable: true,
+    search: {
+      transform: (value) => {
+        return {
+          startTime: value[0],
+          endTime: value[1],
+        };
+      },
+    },
+  },
+  {
+    title: '操作',
+    valueType: 'option',
+    key: 'option',
+    render: (text, record, _, action) => [
+      <a
+        key="editable"
+        onClick={() => {
+          action?.startEditable?.(record.id);
+        }}
+      >
+        编辑
+      </a>,
+      <a href={record.url} target="_blank" rel="noopener noreferrer" key="view">
+        查看
+      </a>,
+      <TableDropdown
+        key="actionGroup"
+        onSelect={() => action?.reload()}
+        menus={[
+          { key: 'copy', name: '复制' },
+          { key: 'delete', name: '删除' },
+        ]}
+      />,
+    ],
+  },
+];
+
+export default () => {
+  const actionRef = useRef<ActionType>();
+  return (
+    <ProTable<GithubIssueItem>
+      columns={columns}
+      actionRef={actionRef}
+      cardBordered
+      request={async (params, sort, filter) => {
+        console.log(sort, filter);
+        await waitTime(2000);
+        return request<{
+          data: GithubIssueItem[];
+        }>('https://proapi.azurewebsites.net/github/issues', {
+          params,
+        });
+      }}
+      editable={{
+        type: 'multiple',
+      }}
+      columnsState={{
+        persistenceKey: 'pro-table-singe-demos',
+        persistenceType: 'localStorage',
+        defaultValue: {
+          option: { fixed: 'right', disable: true },
+        },
+        onChange(value) {
+          console.log('value: ', value);
+        },
+      }}
+      rowKey="id"
+      search={{
+        labelWidth: 'auto',
+      }}
+      options={{
+        setting: {
+          listsHeight: 400,
+        },
+      }}
+      form={{
+        // 由于配置了 transform，提交的参与与定义的不同这里需要转化一下
+        syncToUrl: (values, type) => {
+          if (type === 'get') {
+            return {
+              ...values,
+              created_at: [values.startTime, values.endTime],
+            };
+          }
+          return values;
+        },
+      }}
+      pagination={{
+        pageSize: 5,
+        onChange: (page) => console.log(page),
+      }}
+      dateFormatter="string"
+      headerTitle="高级表格"
+      toolBarRender={() => [
+        <Button
+          key="button"
+          icon={<PlusOutlined />}
+          onClick={() => {
+            actionRef.current?.reload();
+          }}
+          type="primary"
+        >
+          新建
+        </Button>,
+        <Dropdown
+          key="menu"
+          menu={{
+            items: [
+              {
+                label: '1st item',
+                key: '1',
+              },
+              {
+                label: '2nd item',
+                key: '1',
+              },
+              {
+                label: '3rd item',
+                key: '1',
+              },
+            ],
+          }}
+        >
+          <Button>
+            <EllipsisOutlined />
+          </Button>
+        </Dropdown>,
+      ]}
+    />
+  );
+};
@@ -1683,7 +1683,10 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                       optionItemRender(item) {
                         if (item.type === 'add') {
                           return (
-                            <div title={item.name + '（新增商品信息）'}>
+                            <div
+                              style={{ fontSize: '11px' }}
+                              title={item.name + '（新增商品信息）'}
+                            >
                               <span style={{ color: '#333333' }}>
                                 {item.label}
                               </span>
@@ -1694,6 +1697,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                         }
                         return (
                           <div
+                            style={{ fontSize: '11px' }}
                             title={
                               item.label +
                               ' | ' +
@@ -7,6 +7,7 @@ import {
   postKingdeeRepSalBillOutbound,
   postKingdeeRepSalOrderSave,
   postServiceOrderCancelSend,
+  postServiceOrderGetCurrentOptNode,
   postServiceOrderNoNeedSend,
   postServiceOrderOrderCancel,
   postServiceOrderProcureOrder,
@@ -66,6 +67,7 @@ import {
   Popconfirm,
   Radio,
   Space,
+  Spin,
   Tag,
   Tooltip,
   message,
@@ -196,8 +198,18 @@ const OrderPage = () =&gt; {
     setShippingWarehouseChangeModalVisible,
   ] = useState(false);
   const [ids, setIds] = useState([]);
+  const [recordOptNode, setRecordOptNode] = useState(null);
   const roleCode = userInfo?.roleSmallVO?.code;
+  const triggerRecordOptNode = async (id) => {
+    const res = await postServiceOrderGetCurrentOptNode({
+      query: {
+        id,
+      },
+    });
+    setRecordOptNode(res.data);
+  };
+
   const exportLoading = () => {
     messageApi.open({
       type: 'loading',
@@ -1190,10 +1202,16 @@ const OrderPage = () =&gt; {
               optRecord.modifiedAuditStatus !== 'AUDIT_FAILURE' ? (
                 <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
                   <Tooltip
-                    title={enumValueToLabel(
-                      optRecord.modifiedAuditStatus,
-                      MODIFIED_AUDIT_STATUS_OPTIONS,
-                    )}
+                    title={recordOptNode ? recordOptNode : <Spin />}
+                    onOpenChange={(open) => {
+                      console.log('open:' + open);
+                      console.log('id:' + optRecord.id);
+                      if (open) {
+                        triggerRecordOptNode(optRecord.id);
+                      } else {
+                        setRecordOptNode(null);
+                      }
+                    }}
                   >
                     <Tag color={TAGS_COLOR.get(optRecord.modifiedAuditStatus)}>
                       {enumValueToLabel(
@@ -1232,6 +1250,39 @@ const OrderPage = () =&gt; {
             </div>
           </Flex>
           <Flex className="w-[18%]" wrap="wrap" gap="small">
+            {optRecord.subPath?.includes('postAudit') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  createOptObject(optRecord.id, record.id);
+                  setCheckVisible(true);
+                  setOrderCheckType(CHECK_TYPE.WAITING_FOR_POST_AUDIT);
+                }}
+              >
+                后置审核
+              </Button>
+            ) : (
+              ''
+            )}
+            {/* 加急审核 */}
+            {optRecord.subPath?.includes('URGENT_INVOICE_AUDITING') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  console.log('here');
+                  setCurrentMainId(record.id);
+                  setCurretnOptSubId(optRecord.id);
+                  setCheckVisible(true);
+                  setOrderCheckType(CHECK_TYPE.URGENT_INVOICE_AUDITING);
+                }}
+              >
+                加急审核
+              </Button>
+            ) : (
+              ''
+            )}
             {optRecord.subPath?.includes('salesConfirm') && (
               <ButtonConfirm
                 className="p-0"
@@ -1351,41 +1402,6 @@ const OrderPage = () =&gt; {
               ''
             )}
-            {/* 加急审核 */}
-            {optRecord.subPath?.includes('URGENT_INVOICE_AUDITING') ? (
-              <Button
-                className="p-0"
-                type="link"
-                onClick={() => {
-                  console.log('here');
-                  setCurrentMainId(record.id);
-                  setCurretnOptSubId(optRecord.id);
-                  setCheckVisible(true);
-                  setOrderCheckType(CHECK_TYPE.URGENT_INVOICE_AUDITING);
-                }}
-              >
-                加急审核
-              </Button>
-            ) : (
-              ''
-            )}
-
-            {optRecord.subPath?.includes('postAudit') ? (
-              <Button
-                className="p-0"
-                type="link"
-                onClick={() => {
-                  createOptObject(optRecord.id, record.id);
-                  setCheckVisible(true);
-                  setOrderCheckType(CHECK_TYPE.WAITING_FOR_POST_AUDIT);
-                }}
-              >
-                后置审核
-              </Button>
-            ) : (
-              ''
-            )}
-
             {optRecord.subPath?.includes('modifiedAuditRequest') ? (
               <Button
                 className="p-0"
@@ -2545,6 +2561,37 @@ const OrderPage = () =&gt; {
             <Flex justify="flex-end">
               <Space.Compact direction="vertical" align="end">
                 <Space wrap>
+                  {record.mainPath?.includes('postAudit') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        setCurrentMainId(record.id);
+                        setCurretnOptSubId(null);
+                        setCheckVisible(true);
+                        setOrderCheckType(CHECK_TYPE.WAITING_FOR_POST_AUDIT);
+                      }}
+                    >
+                      后置审核
+                    </Button>
+                  ) : (
+                    ''
+                  )}
+                  {record.mainPath?.includes('URGENT_INVOICE_AUDITING') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        createOptObject(null, record.id);
+                        setCheckVisible(true);
+                        setOrderCheckType(CHECK_TYPE.URGENT_INVOICE_AUDITING);
+                      }}
+                    >
+                      加急审核
+                    </Button>
+                  ) : (
+                    ''
+                  )}
                   {record.mainPath?.includes('salesConfirm') && (
                     <ButtonConfirm
                       className="p-0"
@@ -2607,22 +2654,6 @@ const OrderPage = () =&gt; {
                     ''
                   )}
-                  {record.mainPath?.includes('URGENT_INVOICE_AUDITING') ? (
-                    <Button
-                      className="p-0"
-                      type="link"
-                      onClick={() => {
-                        createOptObject(null, record.id);
-                        setCheckVisible(true);
-                        setOrderCheckType(CHECK_TYPE.URGENT_INVOICE_AUDITING);
-                      }}
-                    >
-                      加急审核
-                    </Button>
-                  ) : (
-                    ''
-                  )}
-
                   {record.mainPath?.includes('auditPaymentReceipt') ? (
                     <Button
                       className="p-0"
@@ -2705,22 +2736,6 @@ const OrderPage = () =&gt; {
                   ) : (
                     ''
                   )}
-                  {record.mainPath?.includes('postAudit') ? (
-                    <Button
-                      className="p-0"
-                      type="link"
-                      onClick={() => {
-                        setCurrentMainId(record.id);
-                        setCurretnOptSubId(null);
-                        setCheckVisible(true);
-                        setOrderCheckType(CHECK_TYPE.WAITING_FOR_POST_AUDIT);
-                      }}
-                    >
-                      后置审核
-                    </Button>
-                  ) : (
-                    ''
-                  )}
                   {record.mainPath?.includes('procureOrder') ? (
                     <ButtonConfirm
@@ -1074,6 +1074,10 @@ export interface ItemSaItem {
 export interface MainOrderqueryRequest {
   afterInvoicingStatusIsNull?: boolean;
+  /** @format date-time */
+  invoicingTimeGe?: string;
+  /** @format date-time */
+  invoicingTimeLe?: string;
   orderStatusNotIn?: Array<string>;
   /** @format int32 */
   pageNumber?: number;
@@ -1888,6 +1892,326 @@ export interface ReissueInvoiceDto {
   /** @format int64 */
   invoiceId?: number;
   notes?: string;
+  purchaser?: string;
+}
+
+export interface ResearchGroupAccountAddRequest {
+  /**
+   * @description
+   *   关联的账号id
+   * @format int64
+   */
+  accountId?: number;
+  /**
+   * @description
+   *   关联的账号名称
+   */
+  accountName?: string;
+  /**
+   * @description
+   *   关联的账号手机号
+   */
+  accountPhone?: string;
+  /**
+   * @description
+   *   课题组id
+   * @format int64
+   */
+  groupId?: number;
+}
+
+export interface ResearchGroupAccountEditRequest {
+  /**
+   * @description
+   *   关联的账号id
+   * @format int64
+   */
+  accountId?: number;
+  /**
+   * @description
+   *   关联的账号名称
+   */
+  accountName?: string;
+  /**
+   * @description
+   *   关联的账号手机号
+   */
+  accountPhone?: string;
+  /**
+   * @description
+   *   课题组id
+   * @format int64
+   */
+  groupId?: number;
+  /**
+   * @description
+   *   主键id
+   * @format int64
+   */
+  id?: number;
+}
+
+export interface ResearchGroupAddRequest {
+  accounts?: Array<ResearchGroupAccountAddRequest>;
+  /**
+   * @description
+   *   课题组名称
+   */
+  group?: string;
+  /**
+   * @description
+   *   课题组负责人
+   */
+  leader?: string;
+  members?: Array<ResearchGroupMemberAddRequest>;
+}
+
+export interface ResearchGroupDeleteRequest {
+  /**
+   * @description
+   *   主键id
+   */
+  ids?: Array<number>;
+}
+
+export interface ResearchGroupDetailRequest {
+  /**
+   * @description
+   *   主键id
+   * @format int64
+   */
+  id?: number;
+}
+
+export interface ResearchGroupEditRequest {
+  /**
+   * @description
+   *   课题组预存账号
+   */
+  accounts?: Array<ResearchGroupAccountEditRequest>;
+  /**
+   * @description
+   *   课题组名称
+   */
+  group?: string;
+  /**
+   * @description
+   *   主键id
+   * @format int64
+   */
+  id?: number;
+  /**
+   * @description
+   *   课题组负责人
+   */
+  leader?: string;
+  /**
+   * @description
+   *   课题组成员集合
+   */
+  members?: Array<ResearchGroupMemberEditRequest>;
+}
+
+export interface ResearchGroupListRequest {
+  /**
+   * @description
+   *   预存账号手机号
+   */
+  accountPhone?: string;
+  /** @format int32 */
+  current?: number;
+  /** @format int32 */
+  end?: number;
+  /**
+   * @description
+   *   课题组名称
+   */
+  groupName?: string;
+  /**
+   * @description
+   *   课题组负责人
+   */
+  leaderName?: string;
+  /**
+   * @description
+   *   课题组成员名称
+   */
+  memberName?: string;
+  /**
+   * @description
+   *   课题组成员手机号
+   */
+  memberPhone?: string;
+  /** @format int32 */
+  pageSize?: number;
+  /** @format int32 */
+  start?: number;
+  /** @format int32 */
+  total?: number;
+}
+
+export interface ResearchGroupMemberAddRequest {
+  /**
+   * @description
+   *   课题组ID
+   * @format int64
+   */
+  groupId?: number;
+  /**
+   * @description
+   *   成员名称
+   */
+  memberName?: string;
+  /**
+   * @description
+   *   成员手机号
+   */
+  memberPhone?: string;
+}
+
+export interface ResearchGroupMemberEditRequest {
+  /**
+   * @description
+   *   课题组ID
+   * @format int64
+   */
+  groupId?: number;
+  /**
+   * @description
+   *   主键id
+   * @format int64
+   */
+  id?: number;
+  /**
+   * @description
+   *   成员名称
+   */
+  memberName?: string;
+  /**
+   * @description
+   *   成员手机号
+   */
+  memberPhone?: string;
+}
+
+export interface ResearchGroupMemberRequestAddRequest {
+  /**
+   * @description
+   *   课题组ID
+   * @format int64
+   */
+  groupId?: number;
+  /**
+   * @description
+   *   课题组名称
+   */
+  groupName?: string;
+  members?: Array<ResearchGroupMemberAddRequest>;
+  /**
+   * @description
+   *   申请备注
+   */
+  requestNotes?: string;
+}
+
+export interface ResearchGroupMemberRequestDeleteRequest {
+  /**
+   * @description
+   *   主键id
+   */
+  ids?: Array<number>;
+}
+
+export interface ResearchGroupMemberRequestDetailRequest {
+  /**
+   * @description
+   *   主键id
+   * @format int64
+   */
+  id?: number;
+}
+
+export interface ResearchGroupMemberRequestEditRequest {
+  /**
+   * @description
+   *   课题组ID
+   * @format int64
+   */
+  groupId?: number;
+  /**
+   * @description
+   *   课题组名称
+   */
+  groupName?: string;
+  /**
+   * @description
+   *   主键id
+   * @format int64
+   */
+  id?: number;
+  /**
+   * @description
+   *   成员名称
+   */
+  memberName?: string;
+  /**
+   * @description
+   *   成员手机号
+   */
+  memberPhone?: string;
+  /**
+   * @description
+   *   申请备注
+   */
+  requestNotes?: string;
+}
+
+export interface ResearchGroupMemberRequestsRequest {
+  /**
+   * @description
+   *   审核备注
+   */
+  auditNotes?: string;
+  /**
+   * @description
+   *   审核状态
+   */
+  auditStatus?: string;
+  /**
+   * @description
+   *   创建人
+   */
+  createByName?: string;
+  /** @format int32 */
+  current?: number;
+  /** @format int32 */
+  end?: number;
+  /**
+   * @description
+   *   课题组名称
+   */
+  groupName?: string;
+  /**
+   * @description
+   *   成员名称
+   */
+  memberName?: string;
+  /**
+   * @description
+   *   成员手机号
+   */
+  memberPhone?: string;
+  /** @format int32 */
+  pageSize?: number;
+  /**
+   * @description
+   *   申请备注
+   */
+  requestNotes?: string;
+  /** @format int32 */
+  start?: number;
+  /** @format int32 */
+  total?: number;
 }
 export interface ResearchGroupAccountAddRequest {
@@ -12495,6 +12495,79 @@ export const postServiceOrderFindServiceOrder = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderGetCurrentOptNode */
+export interface PostServiceOrderGetCurrentOptNodeOption {
+  /**
+   * @description
+   *   id
+   * @format int64
+   */
+  query?: {
+    /**
+        @description
+          id
+        @format int64 */
+    id?: number;
+  };
+}
+
+/** @description response type for postServiceOrderGetCurrentOptNode */
+export interface PostServiceOrderGetCurrentOptNodeResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderGetCurrentOptNodeResponseSuccess =
+  PostServiceOrderGetCurrentOptNodeResponse[200];
+/**
+ * @description
+ *   获取当前节点的操作人
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderGetCurrentOptNode = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/getCurrentOptNode';
+  function request(
+    option?: PostServiceOrderGetCurrentOptNodeOption,
+  ): Promise<PostServiceOrderGetCurrentOptNodeResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderGetCurrentOptNodeResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderImportExcel */
 export interface PostServiceOrderImportExcelOption {
   /**