canrd-main / canrd-erp-front · Commits

Commit bff8eafa23cdbceab70ca8227dc59e51f14186af

Authored by zhongnanhuang
1 parent c6137ba4

feat: update 销售确认商城订单

Inline Side-by-side
Showing 6 changed files with 346 additions and 55 deletions
src/pages/Order/components/CheckModal.tsx
  View file @bff8eaf
... ... @@ -621,17 +621,6 @@ export default ({
621 621 ''
622 622 )}
623 623  
624   - <div>请特别注意订单总金额与订单金额。</div>
625   - {!checkType(CHECK_TYPE.CONFIRM_DELIVER) ? (
626   - <ProFormTextArea
627   - width="lg"
628   - name="name"
629   - placeholder="若驳回，请填写驳回理由"
630   - />
631   - ) : (
632   - <></>
633   - )}
634   -
635 624 {checkType(CHECK_TYPE.PREPAID_AUDIT) && (
636 625 <>
637 626 <Divider orientation="center">
... ... @@ -659,11 +648,15 @@ export default ({
659 648 ) : (
660 649 <div>请特别注意订单总金额与订单金额。</div>
661 650 )}
662   - <ProFormTextArea
663   - width="lg"
664   - name="name"
665   - placeholder="若驳回，请填写驳回理由"
666   - />
  651 + {!checkType(CHECK_TYPE.CONFIRM_DELIVER) ? (
  652 + <ProFormTextArea
  653 + width="lg"
  654 + name="name"
  655 + placeholder="若驳回，请填写驳回理由"
  656 + />
  657 + ) : (
  658 + <></>
  659 + )}
667 660 {checkType(CHECK_TYPE.FINALCIAL) ? (
668 661 <>
669 662 <div className="pb-4 text-xs decoration-gray-50">
... ...
src/pages/Order/components/OrderDrawer.tsx
  View file @bff8eaf
... ... @@ -991,6 +991,9 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
991 991 debounceTime={1000}
992 992 request={async (value, {}) => {
993 993 const keywords = value.keyWords;
  994 + if (keywords === '') {
  995 + return [];
  996 + }
994 997 const res = await postCanrdApiUserAddressList({
995 998 data: { keywords: keywords },
996 999 });
... ... @@ -1078,18 +1081,18 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
1078 1081 label="支付总额（￥）"
1079 1082 rules={[
1080 1083 { required: true, message: '支付总额必填' },
1081   - {
1082   - validator: (_, value) => {
1083   - if (value <= 0) {
1084   - return Promise.reject(
1085   - new Error(
1086   - '支付总额必须大于0 （扣预存的订单现在也必须填写实际金额）',
1087   - ),
1088   - );
1089   - }
1090   - return Promise.resolve();
1091   - },
1092   - },
  1084 + // {
  1085 + // validator: (_, value) => {
  1086 + // if (value <= 0) {
  1087 + // return Promise.reject(
  1088 + // new Error(
  1089 + // '支付总额必须大于0 （扣预存的订单现在也必须填写实际金额）',
  1090 + // ),
  1091 + // );
  1092 + // }
  1093 + // return Promise.resolve();
  1094 + // },
  1095 + // },
1093 1096 ]}
1094 1097 tooltip="点击计算，合计所有子订单金额"
1095 1098 fieldProps={{
... ... @@ -1516,8 +1519,20 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
1516 1519 label="商品数量"
1517 1520 fieldProps={{
1518 1521 onChange: (value) => {
1519   - listMeta.record.quantity = value;
1520   - computeSubOrderPayment(listMeta);
  1522 + // 确保变更后的值为整数
  1523 + const intValue = parseInt(value, 10);
  1524 + if (!isNaN(intValue)) {
  1525 + listMeta.record.quantity = intValue;
  1526 + computeSubOrderPayment(listMeta);
  1527 + }
  1528 + },
  1529 + parser: (value) => {
  1530 + // 将输入的值转换为整数，如果不是合法数字则返回空字符串触发校验错误
  1531 + return value ? parseInt(value, 10) : '';
  1532 + },
  1533 + formatter: (value) => {
  1534 + // 在显示时始终将其格式化为不带小数部分的整数字符串
  1535 + return value ? value.toString() : '';
1521 1536 },
1522 1537 }}
1523 1538 placeholder="请输入商品数量"
... ...
src/pages/Order/constant.ts
  View file @bff8eaf
... ... @@ -28,6 +28,7 @@ export const PAYMENT_METHOD_OPTIONS = {
28 28 CASH_ON_DELIVERY: '货到付款',
29 29 HIRE_PURCHASE: '分期付款',
30 30 PAYMENT_RECEIPT: '已回款',
  31 + PREPAID_NO_NEED_SEND: '预存款无需发货',
31 32 };
32 33  
33 34 export const PRODUCT_BELONG_DEPARTMENT_OPTIONS = {
... ... @@ -170,6 +171,7 @@ export const PAYMENT_RECEIPTS_STATUS_OPTIONS = {
170 171  
171 172 export const ORDER_STATUS_OPTIONS = {
172 173 WAIT_CONFIRM_DELIVER_AFTER_INVOICE: '待开票后确认发货',
  174 + SALES_CONFIRM: '销售待确认',
173 175 UNAUDITED: '未审核',
174 176 LEADER_PROCESS: '领导待审核',
175 177 MODIFY_APPLY_WAIT_FOR_AUDIT: '修改待审核',
... ... @@ -271,6 +273,7 @@ export const TAGS_COLOR = new Map&lt;string, string&gt;([
271 273 ['AUDIT_PASS', 'success'],
272 274 ['AUDIT_NOTPASS', 'error'],
273 275 ['WAIT_CONFIRM_DELIVER_AFTER_INVOICE', 'processing'],
  276 + ['SALES_CONFIRM', 'warning'],
274 277 ]);
275 278 export const SALES_CODE_OPTIONS = [
276 279 { label: 'D-Linda', value: 'D-Linda' },
... ...
src/pages/Order/index.tsx
  View file @bff8eaf
... ... @@ -12,6 +12,7 @@ import {
12 12 postServiceOrderProvideProcurementRoles,
13 13 postServiceOrderQueryServiceOrder,
14 14 postServiceOrderSaleCancelInvoicing,
  15 + postServiceOrderSalesConfirm,
15 16 } from '@/services';
16 17 import { orderExport } from '@/services/order';
17 18 import {
... ... @@ -764,7 +765,7 @@ const OrderPage = () =&gt; {
764 765 key={index}
765 766 onConfirm={() => {
766 767 window.open(
767   - '/previewApi/onlinePreview?url=' +
  768 + '/onlinePreview?url=' +
768 769 encodeURIComponent(Base64.encode(item.url)),
769 770 );
770 771 }}
... ... @@ -1227,6 +1228,25 @@ const OrderPage = () =&gt; {
1227 1228 </div>
1228 1229 </Flex>
1229 1230 <Flex className="w-[18%]" wrap="wrap" gap="small">
  1231 + {optRecord.subPath?.includes('salesConfirm') && (
  1232 + <ButtonConfirm
  1233 + className="p-0"
  1234 + title="是否确认此商城订单信息无误？确认无误之后订单将进入审核流程。"
  1235 + text="订单确认"
  1236 + onConfirm={async () => {
  1237 + let res = await postServiceOrderSalesConfirm({
  1238 + data: {
  1239 + subOrderIds: [optRecord.id],
  1240 + },
  1241 + });
  1242 +
  1243 + if (res && res.result === RESPONSE_CODE.SUCCESS) {
  1244 + message.success(res.message);
  1245 + refreshTable();
  1246 + }
  1247 + }}
  1248 + />
  1249 + )}
1230 1250 {optRecord.subPath?.includes('uploadPaymentReceiptBill') ? (
1231 1251 <Button
1232 1252 className="p-0"
... ... @@ -2469,6 +2489,37 @@ const OrderPage = () =&gt; {
2469 2489 <Flex justify="flex-end">
2470 2490 <Space.Compact direction="vertical" align="end">
2471 2491 <Space wrap>
  2492 + {record.mainPath?.includes('salesConfirm') && (
  2493 + <ButtonConfirm
  2494 + className="p-0"
  2495 + title="是否确认此商城订单信息无误？确认无误之后订单将进入审核流程。"
  2496 + text="订单确认"
  2497 + onConfirm={async () => {
  2498 + let subIds = subOrderSelectedMap
  2499 + .get(record.id)
  2500 + ?.map((item) => {
  2501 + return item.id;
  2502 + });
  2503 + if (subIds === null || subIds === undefined) {
  2504 + subIds = record.subOrderInformationLists.map(
  2505 + (item) => {
  2506 + return item.id;
  2507 + },
  2508 + );
  2509 + }
  2510 + let res = await postServiceOrderSalesConfirm({
  2511 + data: {
  2512 + subOrderIds: subIds,
  2513 + },
  2514 + });
  2515 +
  2516 + if (res && res.result === RESPONSE_CODE.SUCCESS) {
  2517 + message.success(res.message);
  2518 + refreshTable();
  2519 + }
  2520 + }}
  2521 + />
  2522 + )}
2472 2523 {record.mainPath?.includes('uploadPaymentReceiptBill') ? (
2473 2524 <Button
2474 2525 className="p-0"
... ...
src/services/definition.ts
  View file @bff8eaf
... ... @@ -889,6 +889,77 @@ export interface InventoryMaterialStockReq {
889 889 materialId?: string;
890 890 }
891 891  
  892 +export interface InvoiceDto {
  893 + /**
  894 + * @description
  895 + * 收款时间
  896 + * @format date-time
  897 + */
  898 + collectionTime?: string;
  899 + /**
  900 + * @description
  901 + * 联系人
  902 + */
  903 + contacts?: string;
  904 + /**
  905 + * @description
  906 + * id
  907 + * @format int64
  908 + */
  909 + id?: number;
  910 + /**
  911 + * @description
  912 + * 发票号码
  913 + */
  914 + invoiceNumber?: string;
  915 + /**
  916 + * @description
  917 + * 发票类型
  918 + */
  919 + invoiceStatus?: string;
  920 + /**
  921 + * @description
  922 + * 开票日期
  923 + * @format date-time
  924 + */
  925 + invoicingTime?: string;
  926 + /**
  927 + * @description
  928 + * 关联主订单id
  929 + */
  930 + mainOrderIds?: Array<number>;
  931 + /**
  932 + * @description
  933 + * 金额
  934 + */
  935 + money?: number;
  936 + /**
  937 + * @description
  938 + * 备注
  939 + */
  940 + notes?: string;
  941 + /**
  942 + * @description
  943 + * 收款单位
  944 + */
  945 + payee?: string;
  946 + /**
  947 + * @description
  948 + * 购买方
  949 + */
  950 + purchaser?: string;
  951 + /**
  952 + * @description
  953 + * 销售
  954 + */
  955 + sale?: string;
  956 + /**
  957 + * @description
  958 + * 状态
  959 + */
  960 + status?: string;
  961 +}
  962 +
892 963 export interface InvoiceRecordQueryRequest {
893 964 /** @format date */
894 965 createTimeGe?: string;
... ... @@ -1478,13 +1549,13 @@ export interface QueryBankStatementDto {
1478 1549 * collection_date
1479 1550 * @format date
1480 1551 */
1481   - collectionDateBegin?: string;
  1552 + collectionDatetimeBegin?: string;
1482 1553 /**
1483 1554 * @description
1484 1555 * collection_date
1485 1556 * @format date
1486 1557 */
1487   - collectionDateEnd?: string;
  1558 + collectionDatetimeEnd?: string;
1488 1559 /** @format int32 */
1489 1560 current?: number;
1490 1561 /** @format int64 */
... ... @@ -1773,6 +1844,8 @@ export interface UpdatePwdVO {
1773 1844  
1774 1845 export interface UserAddressListRequest {
1775 1846 keywords?: string;
  1847 + /** @format int32 */
  1848 + limit?: number;
1776 1849 }
1777 1850  
1778 1851 export interface UserCenterInfoRequest {
... ...
src/services/request.ts
  View file @bff8eaf
... ... @@ -44,6 +44,7 @@ import type {
44 44 DictionaryVO,
45 45 Dto,
46 46 InventoryMaterialStockReq,
  47 + InvoiceDto,
47 48 InvoiceRecordQueryRequest,
48 49 MainOrderqueryRequest,
49 50 MaterialListReply,
... ... @@ -52,7 +53,6 @@ import type {
52 53 MaterialUnitListRes,
53 54 MeasureUnitListRes,
54 55 MessageQueryDTO,
55   - ModelAndView,
56 56 OrderAddVO,
57 57 OrderAuditLogQueryVO,
58 58 OrderBaseInfoQueryVO,
... ... @@ -1537,7 +1537,9 @@ export interface GetErrorResponse {
1537 1537 * @description
1538 1538 * OK
1539 1539 */
1540   - 200: ModelAndView;
  1540 + 200: {
  1541 + [propertyName: string]: any;
  1542 + };
1541 1543 /**
1542 1544 * @description
1543 1545 * Unauthorized
... ... @@ -1558,9 +1560,9 @@ export interface GetErrorResponse {
1558 1560 export type GetErrorResponseSuccess = GetErrorResponse[200];
1559 1561 /**
1560 1562 * @description
1561   - * errorHtml
  1563 + * error
1562 1564 * @tags basic-error-controller
1563   - * @produces text/html
  1565 + * @produces *
1564 1566 */
1565 1567 export const getError = /* #__PURE__ */ (() => {
1566 1568 const method = 'get';
... ... @@ -1584,7 +1586,9 @@ export interface PutErrorResponse {
1584 1586 * @description
1585 1587 * OK
1586 1588 */
1587   - 200: ModelAndView;
  1589 + 200: {
  1590 + [propertyName: string]: any;
  1591 + };
1588 1592 /**
1589 1593 * @description
1590 1594 * Created
... ... @@ -1610,9 +1614,9 @@ export interface PutErrorResponse {
1610 1614 export type PutErrorResponseSuccess = PutErrorResponse[200];
1611 1615 /**
1612 1616 * @description
1613   - * errorHtml
  1617 + * error
1614 1618 * @tags basic-error-controller
1615   - * @produces text/html
  1619 + * @produces *
1616 1620 * @consumes application/json
1617 1621 */
1618 1622 export const putError = /* #__PURE__ */ (() => {
... ... @@ -1637,7 +1641,9 @@ export interface PostErrorResponse {
1637 1641 * @description
1638 1642 * OK
1639 1643 */
1640   - 200: ModelAndView;
  1644 + 200: {
  1645 + [propertyName: string]: any;
  1646 + };
1641 1647 /**
1642 1648 * @description
1643 1649 * Created
... ... @@ -1663,9 +1669,9 @@ export interface PostErrorResponse {
1663 1669 export type PostErrorResponseSuccess = PostErrorResponse[200];
1664 1670 /**
1665 1671 * @description
1666   - * errorHtml
  1672 + * error
1667 1673 * @tags basic-error-controller
1668   - * @produces text/html
  1674 + * @produces *
1669 1675 * @consumes application/json
1670 1676 */
1671 1677 export const postError = /* #__PURE__ */ (() => {
... ... @@ -1690,7 +1696,9 @@ export interface DeleteErrorResponse {
1690 1696 * @description
1691 1697 * OK
1692 1698 */
1693   - 200: ModelAndView;
  1699 + 200: {
  1700 + [propertyName: string]: any;
  1701 + };
1694 1702 /**
1695 1703 * @description
1696 1704 * No Content
... ... @@ -1711,9 +1719,9 @@ export interface DeleteErrorResponse {
1711 1719 export type DeleteErrorResponseSuccess = DeleteErrorResponse[200];
1712 1720 /**
1713 1721 * @description
1714   - * errorHtml
  1722 + * error
1715 1723 * @tags basic-error-controller
1716   - * @produces text/html
  1724 + * @produces *
1717 1725 */
1718 1726 export const deleteError = /* #__PURE__ */ (() => {
1719 1727 const method = 'delete';
... ... @@ -1737,7 +1745,9 @@ export interface OptionsErrorResponse {
1737 1745 * @description
1738 1746 * OK
1739 1747 */
1740   - 200: ModelAndView;
  1748 + 200: {
  1749 + [propertyName: string]: any;
  1750 + };
1741 1751 /**
1742 1752 * @description
1743 1753 * No Content
... ... @@ -1758,9 +1768,9 @@ export interface OptionsErrorResponse {
1758 1768 export type OptionsErrorResponseSuccess = OptionsErrorResponse[200];
1759 1769 /**
1760 1770 * @description
1761   - * errorHtml
  1771 + * error
1762 1772 * @tags basic-error-controller
1763   - * @produces text/html
  1773 + * @produces *
1764 1774 * @consumes application/json
1765 1775 */
1766 1776 export const optionsError = /* #__PURE__ */ (() => {
... ... @@ -1785,7 +1795,9 @@ export interface HeadErrorResponse {
1785 1795 * @description
1786 1796 * OK
1787 1797 */
1788   - 200: ModelAndView;
  1798 + 200: {
  1799 + [propertyName: string]: any;
  1800 + };
1789 1801 /**
1790 1802 * @description
1791 1803 * No Content
... ... @@ -1806,9 +1818,9 @@ export interface HeadErrorResponse {
1806 1818 export type HeadErrorResponseSuccess = HeadErrorResponse[200];
1807 1819 /**
1808 1820 * @description
1809   - * errorHtml
  1821 + * error
1810 1822 * @tags basic-error-controller
1811   - * @produces text/html
  1823 + * @produces *
1812 1824 * @consumes application/json
1813 1825 */
1814 1826 export const headError = /* #__PURE__ */ (() => {
... ... @@ -1833,7 +1845,9 @@ export interface PatchErrorResponse {
1833 1845 * @description
1834 1846 * OK
1835 1847 */
1836   - 200: ModelAndView;
  1848 + 200: {
  1849 + [propertyName: string]: any;
  1850 + };
1837 1851 /**
1838 1852 * @description
1839 1853 * No Content
... ... @@ -1854,9 +1868,9 @@ export interface PatchErrorResponse {
1854 1868 export type PatchErrorResponseSuccess = PatchErrorResponse[200];
1855 1869 /**
1856 1870 * @description
1857   - * errorHtml
  1871 + * error
1858 1872 * @tags basic-error-controller
1859   - * @produces text/html
  1873 + * @produces *
1860 1874 * @consumes application/json
1861 1875 */
1862 1876 export const patchError = /* #__PURE__ */ (() => {
... ... @@ -7879,6 +7893,77 @@ export const postServiceBankStatementQueryBankStatement =
7879 7893 return request;
7880 7894 })();
7881 7895  
  7896 +/** @description request parameter type for postServiceInvoiceAddInvoice */
  7897 +export interface PostServiceInvoiceAddInvoiceOption {
  7898 + /**
  7899 + * @description
  7900 + * dto
  7901 + */
  7902 + body: {
  7903 + /**
  7904 + @description
  7905 + dto */
  7906 + dto: InvoiceDto;
  7907 + };
  7908 +}
  7909 +
  7910 +/** @description response type for postServiceInvoiceAddInvoice */
  7911 +export interface PostServiceInvoiceAddInvoiceResponse {
  7912 + /**
  7913 + * @description
  7914 + * OK
  7915 + */
  7916 + 200: ServerResult;
  7917 + /**
  7918 + * @description
  7919 + * Created
  7920 + */
  7921 + 201: any;
  7922 + /**
  7923 + * @description
  7924 + * Unauthorized
  7925 + */
  7926 + 401: any;
  7927 + /**
  7928 + * @description
  7929 + * Forbidden
  7930 + */
  7931 + 403: any;
  7932 + /**
  7933 + * @description
  7934 + * Not Found
  7935 + */
  7936 + 404: any;
  7937 +}
  7938 +
  7939 +export type PostServiceInvoiceAddInvoiceResponseSuccess =
  7940 + PostServiceInvoiceAddInvoiceResponse[200];
  7941 +/**
  7942 + * @description
  7943 + * 添加发票
  7944 + * @tags 发票
  7945 + * @produces *
  7946 + * @consumes application/json
  7947 + */
  7948 +export const postServiceInvoiceAddInvoice = /* #__PURE__ */ (() => {
  7949 + const method = 'post';
  7950 + const url = '/service/invoice/addInvoice';
  7951 + function request(
  7952 + option: PostServiceInvoiceAddInvoiceOption,
  7953 + ): Promise<PostServiceInvoiceAddInvoiceResponseSuccess> {
  7954 + return requester(request.url, {
  7955 + method: request.method,
  7956 + ...option,
  7957 + }) as unknown as Promise<PostServiceInvoiceAddInvoiceResponseSuccess>;
  7958 + }
  7959 +
  7960 + /** http method */
  7961 + request.method = method;
  7962 + /** request url */
  7963 + request.url = url;
  7964 + return request;
  7965 +})();
  7966 +
7882 7967 /** @description request parameter type for postServiceInvoiceCancelInvoiceAndBankStatement */
7883 7968 export interface PostServiceInvoiceCancelInvoiceAndBankStatementOption {
7884 7969 /**
... ... @@ -12104,6 +12189,77 @@ export const postServiceOrderSaleCancelInvoicing = /* #__PURE__ */ (() =&gt; {
12104 12189 return request;
12105 12190 })();
12106 12191  
  12192 +/** @description request parameter type for postServiceOrderSalesConfirm */
  12193 +export interface PostServiceOrderSalesConfirmOption {
  12194 + /**
  12195 + * @description
  12196 + * dto
  12197 + */
  12198 + body: {
  12199 + /**
  12200 + @description
  12201 + dto */
  12202 + dto: Dto;
  12203 + };
  12204 +}
  12205 +
  12206 +/** @description response type for postServiceOrderSalesConfirm */
  12207 +export interface PostServiceOrderSalesConfirmResponse {
  12208 + /**
  12209 + * @description
  12210 + * OK
  12211 + */
  12212 + 200: ServerResult;
  12213 + /**
  12214 + * @description
  12215 + * Created
  12216 + */
  12217 + 201: any;
  12218 + /**
  12219 + * @description
  12220 + * Unauthorized
  12221 + */
  12222 + 401: any;
  12223 + /**
  12224 + * @description
  12225 + * Forbidden
  12226 + */
  12227 + 403: any;
  12228 + /**
  12229 + * @description
  12230 + * Not Found
  12231 + */
  12232 + 404: any;
  12233 +}
  12234 +
  12235 +export type PostServiceOrderSalesConfirmResponseSuccess =
  12236 + PostServiceOrderSalesConfirmResponse[200];
  12237 +/**
  12238 + * @description
  12239 + * 销售订单确认
  12240 + * @tags 内部订单
  12241 + * @produces *
  12242 + * @consumes application/json
  12243 + */
  12244 +export const postServiceOrderSalesConfirm = /* #__PURE__ */ (() => {
  12245 + const method = 'post';
  12246 + const url = '/service/order/salesConfirm';
  12247 + function request(
  12248 + option: PostServiceOrderSalesConfirmOption,
  12249 + ): Promise<PostServiceOrderSalesConfirmResponseSuccess> {
  12250 + return requester(request.url, {
  12251 + method: request.method,
  12252 + ...option,
  12253 + }) as unknown as Promise<PostServiceOrderSalesConfirmResponseSuccess>;
  12254 + }
  12255 +
  12256 + /** http method */
  12257 + request.method = method;
  12258 + /** request url */
  12259 + request.url = url;
  12260 + return request;
  12261 +})();
  12262 +
12107 12263 /** @description request parameter type for postServiceOrderSendProduct */
12108 12264 export interface PostServiceOrderSendProductOption {
12109 12265 /**
... ...