Merge branch 'master' into warning

# Conflicts: # src/pages/Invoice/Invoice/components/AddBankStatementModal.tsx # src/pages/Invoice/Invoice/components/InvoiceVerificationModal.tsx # src/pages/Invoice/Invoice/components/invoiceWriteOffModal.tsx # src/pages/Invoice/InvoiceVerification/index.tsx # src/pages/Order/Order/index.tsx # src/services/request.ts

Merge branch 'master' into warning
# Conflicts: # src/pages/Invoice/Invoice/components/AddBankStatementModal.tsx # src/pages/Invoice/Invoice/components/InvoiceVerificationModal.tsx # src/pages/Invoice/Invoice/components/invoiceWriteOffModal.tsx # src/pages/Invoice/InvoiceVerification/index.tsx # src/pages/Order/Order/index.tsx # src/services/request.ts
曾国涛
2 parents 80092cd1 e0b4e44b
Showing 9 changed files with 265 additions and 94 deletions
src/pages/Invoice/Invoice/components/AddBankStatementModal.tsx
src/pages/Invoice/Invoice/components/InvoiceVerificationModal.tsx
src/pages/Invoice/Invoice/components/invoiceWriteOffModal.tsx
src/pages/Invoice/Invoice/index.tsx
src/pages/Invoice/InvoiceVerification/index.tsx
src/pages/Invoice/constant.tsx
src/pages/Order/Order/index.tsx
src/pages/ResearchGroup/components/ResearchGroupAddModal.tsx
src/services/definition.ts
@@ -14,11 +14,21 @@ export default ({ getRows, onFinish }) =&gt; {
       dataIndex: 'id',
     },
     {
+      title: '编号',
+      hideInTable: true,
+      dataIndex: 'id',
+    },
+    {
       title: '流水号',
       hideInSearch: true,
       dataIndex: 'serialNumber',
     },
     {
+      title: '流水号',
+      hideInTable: true,
+      dataIndex: 'serialNumber',
+    },
+    {
       title: '收款时间',
       dataIndex: 'collectionDatetime',
       hideInSearch: true,
@@ -26,7 +36,7 @@ export default ({ getRows, onFinish }) =&gt; {
     },
     {
       title: '收款方',
-      hideInTable: true,
+      hideInSearch: true,
       dataIndex: 'payeeText',
     },
     {
@@ -20,7 +20,6 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
   const [bankChooseModalVisible, setBankChooseModalVisible] = useState(false);
   const [invoiceInfo, setInvoiceInfo] = useState({});
   const [relationOrderIds, setRelationOrderIds] = useState([]);
-  const [setRelationBankStatements] = useState([]);
   const actionRef = useRef<ActionType>();
   const loadInvoiceData = async () => {
@@ -31,7 +30,6 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
       setInvoiceInfo(res.data);
       setRelationOrderIds(res.data.mainOrderIds);
       console.log('bs:' + res.data.bankStatementDtos);
-      setRelationBankStatements(res.data.bankStatementDtos);
     }
   };
@@ -117,6 +115,18 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
     },
     {
       key: '11',
+      label: '订单类型',
+      children: invoiceInfo?.orderTypeText,
+      span: 12,
+    },
+    {
+      key: '12',
+      label: '绑定流水号',
+      children: invoiceInfo?.serialNumbersTextByOrder,
+      span: 12,
+    },
+    {
+      key: '13',
       label: '备注',
       children: invoiceInfo?.notes,
       span: 24,
@@ -30,24 +30,29 @@ export default ({ getData, triggerButton, readOnly }) =&gt; {
       {
         title: '发票号码',
         dataIndex: 'invoiceNumber',
+        ellipsis: true,
       },
       {
         title: '收款方',
         dataIndex: 'payeeText',
+        ellipsis: true,
       },
       {
         title: '付款方',
         dataIndex: 'purchaser',
+        ellipsis: true,
       },
       {
         title: '金额',
         dataIndex: 'money',
         valueType: 'money',
+        ellipsis: true,
       },
       {
         title: '日期',
         dataIndex: 'invoicingTime',
         valueType: 'date',
+        ellipsis: true,
       },
     ];
     if (!readOnly) {
@@ -84,24 +89,29 @@ export default ({ getData, triggerButton, readOnly }) =&gt; {
       {
         title: '流水号',
         dataIndex: 'serialNumber',
+        ellipsis: true,
       },
       {
         title: '收款方',
         dataIndex: 'payeeText',
+        ellipsis: true,
       },
       {
         title: '付款方',
         dataIndex: 'payer',
+        ellipsis: true,
       },
       {
         title: '金额',
         dataIndex: 'amount',
         valueType: 'money',
+        ellipsis: true,
       },
       {
         title: '日期',
         dataIndex: 'collectionDatetime',
         valueType: 'date',
+        ellipsis: true,
       },
     ];
     columns.push({
@@ -153,9 +163,9 @@ export default ({ getData, triggerButton, readOnly }) =&gt; {
         return getData();
       }}
       /*initialValues={{
-                invoiceWriteOffId:invoiceWriteOffId,
-                invoices:originInvoices,
-            }}*/
+                    invoiceWriteOffId:invoiceWriteOffId,
+                    invoices:originInvoices,
+                }}*/
     >
       <ProFormText name={'invoiceWriteOffId'} hidden={true}></ProFormText>
@@ -11,6 +11,7 @@ import {
   postServiceInvoiceGetWriteOffRecord,
   postServiceInvoiceQueryInvoice,
 } from '@/services';
+import { orderExport } from '@/services/order';
 import { enumValueToLabel, formatDateTime } from '@/utils';
 import { formatDate } from '@/utils/time';
 import { ActionType, ProTable } from '@ant-design/pro-components';
@@ -23,6 +24,7 @@ const InvoiceRecord = () =&gt; {
   const [invoiceVerificationVisible, setInvoiceVerificationVisible] =
     useState(false);
   const [invoiceId, setInvoiceId] = useState(undefined);
+  const [messageApi, contextHolder] = message.useMessage();
   const reloadInvoiceTable = () => {
     invoiceActionRef.current?.reload();
   };
@@ -216,6 +218,31 @@ const InvoiceRecord = () =&gt; {
         rowKey="id"
         search={{
           labelWidth: 'auto',
+          optionRender: (searchConfig, formProps, dom) => [
+            ...dom.reverse(),
+            <Button
+              key="out"
+              onClick={() => {
+                const values = searchConfig?.form?.getFieldsValue();
+                messageApi.open({
+                  type: 'loading',
+                  content: '导出中...',
+                  duration: 0,
+                });
+                orderExport(
+                  '/api/service/invoice/exportInvoices',
+                  '发票.xlsx',
+                  'POST',
+                  values,
+                  () => {
+                    messageApi.destroy();
+                  },
+                );
+              }}
+            >
+              导出
+            </Button>,
+          ],
         }}
         options={{
           setting: {
@@ -265,6 +292,7 @@ const InvoiceRecord = () =&gt; {
       ) : (
         ''
       )}
+      {contextHolder}
     </div>
   );
 };
@@ -16,6 +16,7 @@ import {
   postServiceBankStatementQueryBankStatement,
   postServiceInvoiceGetWriteOffRecord,
 } from '@/services';
+import { orderExport } from '@/services/order';
 import { enumValueToLabel, formatDateTime } from '@/utils';
 import { formatDate } from '@/utils/time';
 import { PlusOutlined } from '@ant-design/icons';
@@ -29,6 +30,7 @@ const InvoiceRecord = () =&gt; {
   const [bankImportModalVisible, setBankImportModalVisible] = useState(false);
   const [invoiceVerificationVisible, setInvoiceVerificationVisible] =
     useState(false);
+  const [messageApi, contextHolder] = message.useMessage();
   const [invoiceId] = useState(undefined);
   const [invoiceRecordDetailVisible, setInvoiceRecordDetailVisible] =
     useState(false);
@@ -139,6 +141,7 @@ const InvoiceRecord = () =&gt; {
           btns.push(
             <InvoiceWriteOffModal
               getData={async () => {
+                console.log(record.writeOffId);
                 const res = await postServiceInvoiceGetWriteOffRecord({
                   data: { id: record.writeOffId },
                 });
@@ -225,6 +228,31 @@ const InvoiceRecord = () =&gt; {
         rowKey="id"
         search={{
           labelWidth: 'auto',
+          optionRender: (searchConfig, formProps, dom) => [
+            ...dom.reverse(),
+            <Button
+              key="out"
+              onClick={() => {
+                const values = searchConfig?.form?.getFieldsValue();
+                messageApi.open({
+                  type: 'loading',
+                  content: '导出中...',
+                  duration: 0,
+                });
+                orderExport(
+                  '/api/service/invoice/exportBankStatements',
+                  '银行流水.xlsx',
+                  'POST',
+                  values,
+                  () => {
+                    messageApi.destroy();
+                  },
+                );
+              }}
+            >
+              导出
+            </Button>,
+          ],
         }}
         options={{
           setting: {
@@ -283,6 +311,7 @@ const InvoiceRecord = () =&gt; {
       ) : (
         ''
       )}
+      {contextHolder}
     </div>
   );
 };
@@ -78,6 +78,43 @@ export const INVOICE_COLUMNS = [
     hideInTable: true,
   },
   {
+    title: '订单状态',
+    dataIndex: 'orderTypeText',
+    valueType: 'text',
+    width: 180,
+  },
+  {
+    title: '绑定流水号',
+    dataIndex: 'serialNumbersTextByOrder',
+
+    valueType: 'text',
+    width: 180,
+  },
+  {
+    title: '是否预付款',
+    dataIndex: 'orderIsPrePay',
+    valueType: 'select',
+    valueEnum: {
+      true: {
+        text: '是',
+        status: true,
+      },
+      false: {
+        text: '否',
+        status: false,
+      },
+    },
+    hideInTable: true,
+    width: 180,
+  },
+  {
+    title: '绑定流水号',
+    dataIndex: 'serialNumberLike',
+    hideInTable: true,
+    valueType: 'text',
+    width: 180,
+  },
+  {
     title: '购买方',
     dataIndex: 'purchaser',
     valueType: 'text',
@@ -211,6 +211,7 @@ const OrderPage = () =&gt; {
   const [ids, setIds] = useState([]);
   const [recordOptNode, setRecordOptNode] = useState(null);
   const roleCode = userInfo?.roleSmallVO?.code;
+  const roles = userInfo?.roles;
   const canMergeInvoicing = useMemo(() => {
     if (subOrderSelectedMap.size === 0) {
       return false;
@@ -224,6 +225,7 @@ const OrderPage = () =&gt; {
       .every((subItem) => subItem.paths.includes('applyInvoicing_old'));
   }, [selectedSubOrderKeys]);
+  console.log(JSON.stringify(userInfo));
   const triggerRecordOptNode = async (id) => {
     const res = await postServiceOrderGetCurrentOptNode({
       query: {
@@ -2092,8 +2094,9 @@ const OrderPage = () =&gt; {
                 title="已和客户确认发票？？"
                 text="确认发票"
                 onConfirm={async () => {
+                  let body = { ids: [optRecord.id] };
                   const data = await postServiceOrderConfirmInvoice({
-                    data: [optRecord.id],
+                    data: body,
                   });
                   if (data.result === RESPONSE_CODE.SUCCESS) {
                     message.success(data.message);
@@ -2104,7 +2107,6 @@ const OrderPage = () =&gt; {
             ) : (
               ''
             )}
-
             {optRecord.paths?.includes('orderCancel') ? (
               <ButtonConfirm
                 className="p-0"
@@ -3885,12 +3887,15 @@ const OrderPage = () =&gt; {
                       title="已和客户确认发票？"
                       text="确认发票"
                       onConfirm={async () => {
-                        const data = await postServiceOrderConfirmInvoice({
-                          data: [
+                        let body = {
+                          ids: [
                             ...record.subOrderInformationLists.map(
                               (subOrder) => subOrder.id,
                             ),
                           ],
+                        };
+                        const data = await postServiceOrderConfirmInvoice({
+                          data: body,
                         });
                         if (data.result === RESPONSE_CODE.SUCCESS) {
                           message.success(data.message);
@@ -4038,7 +4043,7 @@ const OrderPage = () =&gt; {
       /**
        * 采购的订单状态筛选内容
        */
-      if (roleCode === 'procure' && item.dataIndex === 'orderStatus') {
+      if (roles.includes('PROCURE') && item.dataIndex === 'orderStatus') {
         item.valueEnum = enumToProTableEnumValue(
           PROCURE_PRIMARY_ORDER_STATUS_OPTIONS,
         );
@@ -4050,7 +4055,12 @@ const OrderPage = () =&gt; {
   /**
    * 采购可以筛选供应商备注
    */
-  if ((roleCode === 'procure' || roleCode === 'admin') && !isSupplier()) {
+  if (
+    (roleCode === 'procure' ||
+      roles.includes('PROCURE') ||
+      roleCode === 'admin') &&
+    !isSupplier()
+  ) {
     mainOrdersColumns.push({
       title: '供应商备注',
       width: 120,
@@ -4063,7 +4073,12 @@ const OrderPage = () =&gt; {
   /**
    * 采购可以筛选其他采购
    */
-  if ((roleCode === 'procure' || roleCode === 'admin') && !isSupplier()) {
+  if (
+    (roleCode === 'procure' ||
+      roles.includes('PROCURE') ||
+      roleCode === 'admin') &&
+    !isSupplier()
+  ) {
     mainOrdersColumns.push({
       title: '采购名称',
       width: 120,
@@ -4083,7 +4098,12 @@ const OrderPage = () =&gt; {
   /**
    * 排除采购
    */
-  if ((roleCode === 'procure' || roleCode === 'admin') && !isSupplier()) {
+  if (
+    (roleCode === 'procure' ||
+      roles.includes('PROCURE') ||
+      roleCode === 'admin') &&
+    !isSupplier()
+  ) {
     mainOrdersColumns.push({
       title: '采购排除',
       width: 120,
@@ -4118,7 +4138,11 @@ const OrderPage = () =&gt; {
   }
   //判断是否是采购，是的话新增一个筛选条件
-  if (roleCode === 'procure' || roleCode === 'admin') {
+  if (
+    roleCode === 'procure' ||
+    roles.includes('PROCURE') ||
+    roleCode === 'admin'
+  ) {
     mainOrdersColumns.push({
       title: isSupplier() ? '下单状态' : '采购下单状态',
       dataIndex: 'procureOrderStatus',
@@ -4147,7 +4171,7 @@ const OrderPage = () =&gt; {
     }
     //采购可以筛选出需要处理的订单
-    if (roleCode === 'procure' && !isSupplier()) {
+    if (roles.includes('PROCURE') && !isSupplier()) {
       radios.push(<Radio value={60}>其他采购</Radio>);
       radios.push(<Radio value={10}>待处理</Radio>);
     }
@@ -4331,7 +4355,7 @@ const OrderPage = () =&gt; {
           key="out"
           onClick={() => {
             setIsMainOrder(true);
-            if (roleCode === 'procure') {
+            if (roles.includes('PROCURE')) {
               setProcureCheckModalVisible(true);
             }
@@ -267,9 +267,15 @@ export default ({ setVisible, researchGroupId, onClose }) =&gt; {
       let uidIdMap = new Map(
         accounts.map((item: any) => [item.accountId, item.id]),
       );
-      let res = await postCanrdApiUserList({
-        data: { uids: accountIds, phones: phones },
-      });
+      let data = {};
+      if (accountIds.length > 0) {
+        data = { ...data, uids: accountIds };
+      }
+      if (phones.length > 0) {
+        data = { ...data, phones: phones };
+      }
+
+      let res = await postCanrdApiUserList({ data });
       if (res && res.result === RESPONSE_CODE.SUCCESS) {
         let accountList = res?.data?.data;
         console.log(accountList);
@@ -3,82 +3,82 @@
 /** Do not modify manually.
 content is generated automatically by `ts-gear`. */
 export type ModelAndViewStatus =
-  | "100 CONTINUE"
-  | "101 SWITCHING_PROTOCOLS"
-  | "102 PROCESSING"
-  | "103 CHECKPOINT"
-  | "200 OK"
-  | "201 CREATED"
-  | "202 ACCEPTED"
-  | "203 NON_AUTHORITATIVE_INFORMATION"
-  | "204 NO_CONTENT"
-  | "205 RESET_CONTENT"
-  | "206 PARTIAL_CONTENT"
-  | "207 MULTI_STATUS"
-  | "208 ALREADY_REPORTED"
-  | "226 IM_USED"
-  | "300 MULTIPLE_CHOICES"
-  | "301 MOVED_PERMANENTLY"
-  | "302 FOUND"
-  | "302 MOVED_TEMPORARILY"
-  | "303 SEE_OTHER"
-  | "304 NOT_MODIFIED"
-  | "305 USE_PROXY"
-  | "307 TEMPORARY_REDIRECT"
-  | "308 PERMANENT_REDIRECT"
-  | "400 BAD_REQUEST"
-  | "401 UNAUTHORIZED"
-  | "402 PAYMENT_REQUIRED"
-  | "403 FORBIDDEN"
-  | "404 NOT_FOUND"
-  | "405 METHOD_NOT_ALLOWED"
-  | "406 NOT_ACCEPTABLE"
-  | "407 PROXY_AUTHENTICATION_REQUIRED"
-  | "408 REQUEST_TIMEOUT"
-  | "409 CONFLICT"
-  | "410 GONE"
-  | "411 LENGTH_REQUIRED"
-  | "412 PRECONDITION_FAILED"
-  | "413 PAYLOAD_TOO_LARGE"
-  | "413 REQUEST_ENTITY_TOO_LARGE"
-  | "414 URI_TOO_LONG"
-  | "414 REQUEST_URI_TOO_LONG"
-  | "415 UNSUPPORTED_MEDIA_TYPE"
-  | "416 REQUESTED_RANGE_NOT_SATISFIABLE"
-  | "417 EXPECTATION_FAILED"
-  | "418 I_AM_A_TEAPOT"
-  | "419 INSUFFICIENT_SPACE_ON_RESOURCE"
-  | "420 METHOD_FAILURE"
-  | "421 DESTINATION_LOCKED"
-  | "422 UNPROCESSABLE_ENTITY"
-  | "423 LOCKED"
-  | "424 FAILED_DEPENDENCY"
-  | "425 TOO_EARLY"
-  | "426 UPGRADE_REQUIRED"
-  | "428 PRECONDITION_REQUIRED"
-  | "429 TOO_MANY_REQUESTS"
-  | "431 REQUEST_HEADER_FIELDS_TOO_LARGE"
-  | "451 UNAVAILABLE_FOR_LEGAL_REASONS"
-  | "500 INTERNAL_SERVER_ERROR"
-  | "501 NOT_IMPLEMENTED"
-  | "502 BAD_GATEWAY"
-  | "503 SERVICE_UNAVAILABLE"
-  | "504 GATEWAY_TIMEOUT"
-  | "505 HTTP_VERSION_NOT_SUPPORTED"
-  | "506 VARIANT_ALSO_NEGOTIATES"
-  | "507 INSUFFICIENT_STORAGE"
-  | "508 LOOP_DETECTED"
-  | "509 BANDWIDTH_LIMIT_EXCEEDED"
-  | "510 NOT_EXTENDED"
-  | "511 NETWORK_AUTHENTICATION_REQUIRED";
+  | '100 CONTINUE'
+  | '101 SWITCHING_PROTOCOLS'
+  | '102 PROCESSING'
+  | '103 CHECKPOINT'
+  | '200 OK'
+  | '201 CREATED'
+  | '202 ACCEPTED'
+  | '203 NON_AUTHORITATIVE_INFORMATION'
+  | '204 NO_CONTENT'
+  | '205 RESET_CONTENT'
+  | '206 PARTIAL_CONTENT'
+  | '207 MULTI_STATUS'
+  | '208 ALREADY_REPORTED'
+  | '226 IM_USED'
+  | '300 MULTIPLE_CHOICES'
+  | '301 MOVED_PERMANENTLY'
+  | '302 FOUND'
+  | '302 MOVED_TEMPORARILY'
+  | '303 SEE_OTHER'
+  | '304 NOT_MODIFIED'
+  | '305 USE_PROXY'
+  | '307 TEMPORARY_REDIRECT'
+  | '308 PERMANENT_REDIRECT'
+  | '400 BAD_REQUEST'
+  | '401 UNAUTHORIZED'
+  | '402 PAYMENT_REQUIRED'
+  | '403 FORBIDDEN'
+  | '404 NOT_FOUND'
+  | '405 METHOD_NOT_ALLOWED'
+  | '406 NOT_ACCEPTABLE'
+  | '407 PROXY_AUTHENTICATION_REQUIRED'
+  | '408 REQUEST_TIMEOUT'
+  | '409 CONFLICT'
+  | '410 GONE'
+  | '411 LENGTH_REQUIRED'
+  | '412 PRECONDITION_FAILED'
+  | '413 PAYLOAD_TOO_LARGE'
+  | '413 REQUEST_ENTITY_TOO_LARGE'
+  | '414 URI_TOO_LONG'
+  | '414 REQUEST_URI_TOO_LONG'
+  | '415 UNSUPPORTED_MEDIA_TYPE'
+  | '416 REQUESTED_RANGE_NOT_SATISFIABLE'
+  | '417 EXPECTATION_FAILED'
+  | '418 I_AM_A_TEAPOT'
+  | '419 INSUFFICIENT_SPACE_ON_RESOURCE'
+  | '420 METHOD_FAILURE'
+  | '421 DESTINATION_LOCKED'
+  | '422 UNPROCESSABLE_ENTITY'
+  | '423 LOCKED'
+  | '424 FAILED_DEPENDENCY'
+  | '425 TOO_EARLY'
+  | '426 UPGRADE_REQUIRED'
+  | '428 PRECONDITION_REQUIRED'
+  | '429 TOO_MANY_REQUESTS'
+  | '431 REQUEST_HEADER_FIELDS_TOO_LARGE'
+  | '451 UNAVAILABLE_FOR_LEGAL_REASONS'
+  | '500 INTERNAL_SERVER_ERROR'
+  | '501 NOT_IMPLEMENTED'
+  | '502 BAD_GATEWAY'
+  | '503 SERVICE_UNAVAILABLE'
+  | '504 GATEWAY_TIMEOUT'
+  | '505 HTTP_VERSION_NOT_SUPPORTED'
+  | '506 VARIANT_ALSO_NEGOTIATES'
+  | '507 INSUFFICIENT_STORAGE'
+  | '508 LOOP_DETECTED'
+  | '509 BANDWIDTH_LIMIT_EXCEEDED'
+  | '510 NOT_EXTENDED'
+  | '511 NETWORK_AUTHENTICATION_REQUIRED';
 export type ProcureReturnBillDtoSendStore =
-  | "DALANG_WAREHOUSE"
-  | "HOUJIE_WAREHOUSE";
+  | 'DALANG_WAREHOUSE'
+  | 'HOUJIE_WAREHOUSE';
 export type ProcureReturnBillDtoStatus =
-  | "AUDIT_NOTPASS"
-  | "WAIT_SEND"
-  | "SENDED"
-  | "WAIT_AUDIT";
+  | 'AUDIT_NOTPASS'
+  | 'WAIT_SEND'
+  | 'SENDED'
+  | 'WAIT_AUDIT';
 export interface AdminAuthRoleVO {
   menuIds?: Array<number>;
   /** @format int64 */
@@ -1465,11 +1465,20 @@ export interface InvoiceDto {
   invoiceStatus?: string;
   /**
    * @description
+   *   发票类型
+   */
+  invoiceStatusText?: string;
+  /**
+   * @description
    *   开票日期
    * @format date-time
    */
   invoicingTime?: string;
   invoicingType?: string;
+  /**
+   * @description
+   *   开具类型
+   */
   invoicingTypeText?: string;
   logicDelete?: boolean;
   /**
@@ -1501,6 +1510,11 @@ export interface InvoiceDto {
   payeeText?: string;
   /**
    * @description
+   *   收款单位
+   */
+  payeeText?: string;
+  /**
+   * @description
    *   购买方
    */
   purchaser?: string;
@@ -3693,6 +3707,9 @@ export interface SubOrder {
   id?: number;
   image?: string;
   invoiceApplyUsername?: string;
+  invoiceConfirmStatus?: string;
+  /** @format date-time */
+  invoiceConfirmStatusDatetime?: string;
   invoiceInformation?: string;
   /** @format int64 */
   invoiceRecordId?: number;