Commit 045f5905671941003f1b5f30f1b5d9dc0a532885

Authored by 曾国涛
1 parent 1a3bab69

feat(research-group): add unit name field in modal and constant

Add a new unit name field in the ResearchGroupAddModal.tsx component and update the
constant.tsx file to include the unit name in the form fields. This enhancement
allows users to input the unit name for research groups, improving data

Too many changes to show.

To preserve performance only 3 of 4 files are displayed.

src/pages/ResearchGroup/components/ResearchGroupAddModal.tsx
... ... @@ -285,8 +285,9 @@ export default ({ setVisible, researchGroupId, onClose }) => {
285 285 form.setFieldValue('accounts', accountIds);
286 286 }
287 287  
288   - form.setFieldValue('group', researchGroupInfo.groupName);
289   - form.setFieldValue('leader', researchGroupInfo.leaderName);
  288 + form.setFieldValue('groupName', researchGroupInfo.groupName);
  289 + form.setFieldValue('leaderName', researchGroupInfo.leaderName);
  290 + form.setFieldValue('companyName', researchGroupInfo.companyName);
290 291 };
291 292  
292 293 useEffect(() => {
... ... @@ -337,14 +338,14 @@ export default ({ setVisible, researchGroupId, onClose }) => {
337 338 <Spin spinning={modalLoading} tip="加载中...">
338 339 <ProForm.Group>
339 340 <ProFormText
340   - name="group"
  341 + name="groupName"
341 342 label="课题组名称"
342 343 placeholder="请输入课题组名称"
343 344 rules={[{ required: true, message: '请输入课题组名称' }]}
344 345 />
345 346 <ProFormSelect
346   - name="leader"
347   - key="leader"
  347 + name="leaderName"
  348 + key="leaderName"
348 349 width="lg"
349 350 showSearch
350 351 label="负责人"
... ... @@ -352,6 +353,12 @@ export default ({ setVisible, researchGroupId, onClose }) =&gt; {
352 353 rules={[{ required: true, message: '请输入课题组负责人' }]}
353 354 options={salesCodeOptions}
354 355 />
  356 + <ProFormText
  357 + name="companyName"
  358 + label="单位名称"
  359 + placeholder="请输入单位名称"
  360 + rules={[{ required: true, message: '请输入单位名称' }]}
  361 + />
355 362 </ProForm.Group>
356 363  
357 364 <ProFormSelect
... ...
src/pages/ResearchGroup/constant.tsx
... ... @@ -28,6 +28,15 @@ export const RESEARCH_GROUP_COLUMNS = [
28 28 },
29 29 },
30 30 {
  31 + title: '单位名称',
  32 + dataIndex: 'companyName',
  33 + key: 'companyName',
  34 + fieldProps: {
  35 + placeholder: '请输入单位名称',
  36 + },
  37 + hideInSearch: true,
  38 + },
  39 + {
31 40 title: '预存账号',
32 41 dataIndex: 'accounts',
33 42 key: 'accounts',
... ... @@ -85,6 +94,12 @@ export const RESEARCH_GROUP_COLUMNS = [
85 94 },
86 95 hideInSearch: true,
87 96 },
  97 + {
  98 + title: '公司名称',
  99 + dataIndex: 'companyNameLike',
  100 + key: 'companyNameLike',
  101 + hideInTable: true,
  102 + },
88 103 ];
89 104  
90 105 export const RESEARCH_GROUP_MEMBER_REQUEST_COLUMNS = [
... ...
src/services/definition.ts
... ... @@ -83,6 +83,117 @@ export interface AdminAuthUserVO {
83 83 userId?: number;
84 84 }
85 85  
  86 +export interface AdminClientDto {
  87 + /**
  88 + * @description
  89 + * 市
  90 + */
  91 + city?: string;
  92 + /**
  93 + * @description
  94 + * 单位地址
  95 + */
  96 + companyAddress?: string;
  97 + /**
  98 + * @description
  99 + * 单位地址
  100 + */
  101 + companyAddressText?: string;
  102 + companyId?: string;
  103 + /**
  104 + * @description
  105 + * 单位名称
  106 + */
  107 + companyName?: string;
  108 + contacts?: string;
  109 + createBy?: string;
  110 + /** @format date-time */
  111 + createTime?: string;
  112 + /**
  113 + * @description
  114 + * 区
  115 + */
  116 + district?: string;
  117 + /** @format int32 */
  118 + enableFlag?: number;
  119 + /**
  120 + * @description
  121 + * 是否已报方案
  122 + */
  123 + hasScheme?: boolean;
  124 + hasSchemeText?: string;
  125 + /** @format int64 */
  126 + id?: number;
  127 + /** @format date-time */
  128 + latestCommunicationTime?: string;
  129 + /**
  130 + * @description
  131 + * 客户等级
  132 + */
  133 + level?: string;
  134 + /**
  135 + * @description
  136 + * 客户等级
  137 + */
  138 + levelText?: string;
  139 + modifyBy?: string;
  140 + /** @format date-time */
  141 + modifyTime?: string;
  142 + /**
  143 + * @description
  144 + * 名称
  145 + */
  146 + name?: string;
  147 + /**
  148 + * @description
  149 + * 备注
  150 + */
  151 + notes?: string;
  152 + /**
  153 + * @description
  154 + * 电话号码
  155 + */
  156 + phoneNumber?: string;
  157 + /**
  158 + * @description
  159 + * 省
  160 + */
  161 + province?: string;
  162 + /**
  163 + * @description
  164 + * 报价时间
  165 + * @format date-time
  166 + */
  167 + quoteDatetime?: string;
  168 + /**
  169 + * @description
  170 + * 推荐人
  171 + */
  172 + referrers?: string;
  173 + /**
  174 + * @description
  175 + * 需求
  176 + */
  177 + requirements?: string;
  178 + /**
  179 + * @description
  180 + * 来源
  181 + */
  182 + source?: string;
  183 + /**
  184 + * @description
  185 + * 跟进状态
  186 + */
  187 + tradeStatus?: string;
  188 + /**
  189 + * @description
  190 + * 跟进状态
  191 + */
  192 + tradeStatusText?: string;
  193 + /** @format int32 */
  194 + version?: number;
  195 +}
  196 +
86 197 export interface AdminDeptQueryVO {
87 198 /** @format int32 */
88 199 current?: number;
... ... @@ -572,6 +683,222 @@ export interface ApiQueryOrderStatusCountsRequest {
572 683 uid?: number;
573 684 }
574 685  
  686 +export interface ApplyInvoiceDto {
  687 + /**
  688 + * @description
  689 + * 备注
  690 + */
  691 + applyInvoicingNotes?: string;
  692 + /**
  693 + * @description
  694 + * 开票备注
  695 + */
  696 + comment?: string;
  697 + /**
  698 + * @description
  699 + * 联系人
  700 + */
  701 + contacts?: string;
  702 + /**
  703 + * @description
  704 + * 开票内容
  705 + */
  706 + content?: string;
  707 + createByName?: string;
  708 + /** @format date-time */
  709 + createTime?: string;
  710 + failureReason?: string;
  711 + /**
  712 + * @description
  713 + * id
  714 + * @format int64
  715 + */
  716 + id?: number;
  717 + /**
  718 + * @description
  719 + * 发票地址
  720 + */
  721 + invoiceAddress?: string;
  722 + /**
  723 + * @description
  724 + * 发票明细
  725 + */
  726 + invoiceDetails?: Array<InvoiceDetail>;
  727 + /**
  728 + * @description
  729 + * 关联发票id
  730 + */
  731 + invoiceId?: string;
  732 + /**
  733 + * @description
  734 + * 发票号码
  735 + */
  736 + invoiceNumber?: string;
  737 + /**
  738 + * @description
  739 + * 开票人
  740 + */
  741 + invoicingPerson?: string;
  742 + /**
  743 + * @description
  744 + * 开票时间
  745 + * @format date-time
  746 + */
  747 + invoicingTime?: string;
  748 + /**
  749 + * @description
  750 + * 开具类型
  751 + */
  752 + invoicingType?: string;
  753 + /**
  754 + * @description
  755 + * 开具类型
  756 + */
  757 + invoicingTypeText?: string;
  758 + /** @format date */
  759 + invoicingdate?: string;
  760 + /**
  761 + * @description
  762 + * 是否加急
  763 + */
  764 + isUrgent?: boolean;
  765 + /**
  766 + * @description
  767 + * 是否加急文本
  768 + */
  769 + isUrgentText?: string;
  770 + logicDelete?: boolean;
  771 + /**
  772 + * @description
  773 + * 买方注册地址
  774 + */
  775 + partyAAddress?: string;
  776 + /**
  777 + * @description
  778 + * 买方开户行账号
  779 + */
  780 + partyABankAccount?: string;
  781 + /**
  782 + * @description
  783 + * 买方名称
  784 + */
  785 + partyAName?: string;
  786 + /**
  787 + * @description
  788 + * 买方开户行
  789 + */
  790 + partyAOpenBank?: string;
  791 + /**
  792 + * @description
  793 + * 买方电话号码
  794 + */
  795 + partyAPhoneNumber?: string;
  796 + /**
  797 + * @description
  798 + * 买方税号
  799 + */
  800 + partyATaxid?: string;
  801 + /**
  802 + * @description
  803 + * 抬头类型
  804 + */
  805 + partyAType?: string;
  806 + partyB?: string;
  807 + /**
  808 + * @description
  809 + * 卖方注册地址
  810 + */
  811 + partyBAddress?: string;
  812 + /**
  813 + * @description
  814 + * 卖方开户行账号
  815 + */
  816 + partyBBankAccount?: string;
  817 + /**
  818 + * @description
  819 + * 卖方名称
  820 + */
  821 + partyBName?: string;
  822 + /**
  823 + * @description
  824 + * 卖方开户行
  825 + */
  826 + partyBOpenBank?: string;
  827 + /**
  828 + * @description
  829 + * 卖方电话号码
  830 + */
  831 + partyBPhoneNumber?: string;
  832 + /**
  833 + * @description
  834 + * 卖方税号
  835 + */
  836 + partyBTaxid?: string;
  837 + paths?: Array<string>;
  838 + /**
  839 + * @description
  840 + * 发票金额
  841 + * @format double
  842 + */
  843 + price?: number;
  844 + /**
  845 + * @description
  846 + * 接收邮箱地址
  847 + */
  848 + receiveEmail?: string;
  849 + /**
  850 + * @description
  851 + * 订单来源
  852 + */
  853 + salesCodes?: Array<string>;
  854 + /**
  855 + * @description
  856 + * 订单来源
  857 + */
  858 + salesCodesText?: string;
  859 + /**
  860 + * @description
  861 + * 开票状态
  862 + */
  863 + status?: string;
  864 + /**
  865 + * @description
  866 + * 开票状态
  867 + */
  868 + statusText?: string;
  869 + /**
  870 + * @description
  871 + * 子订单id
  872 + */
  873 + subOrderIds?: Array<number>;
  874 + /**
  875 + * @description
  876 + * 关联订单
  877 + */
  878 + subOrders?: Array<SubOrder>;
  879 + /** @format double */
  880 + totalPrice?: number;
  881 + totalPriceText?: string;
  882 + /**
  883 + * @description
  884 + * 开票类型
  885 + */
  886 + type?: string;
  887 + /**
  888 + * @description
  889 + * 开票类型文本
  890 + */
  891 + typeText?: string;
  892 + /**
  893 + * @description
  894 + * 用户id
  895 + */
  896 + uid?: string;
  897 + updateByName?: string;
  898 + /** @format date-time */
  899 + updateTime?: string;
  900 +}
  901 +
575 902 export interface AuditDto {
576 903 /**
577 904 * @description
... ... @@ -700,10 +1027,54 @@ export interface CommonAuditRequest {
700 1027 type?: string;
701 1028 }
702 1029  
703   -export interface Contactperson {
704   - birthday?: string;
705   - contactAddress?: string;
706   - contactCityId?: string;
  1030 +export interface CompanyInfoDto {
  1031 + address?: string;
  1032 + bank?: string;
  1033 + bankAccount?: string;
  1034 + /**
  1035 + * @description
  1036 + * 创建字段的用户的名字
  1037 + */
  1038 + createByName?: string;
  1039 + /**
  1040 + * @description
  1041 + * 创建时间
  1042 + * @format date-time
  1043 + */
  1044 + createTime?: string;
  1045 + /** @format int64 */
  1046 + id?: number;
  1047 + /**
  1048 + * @description
  1049 + * 逻辑删除 默认为1表示未删除,为0表示已经删除
  1050 + */
  1051 + logicDelete?: boolean;
  1052 + name?: string;
  1053 + phoneNumber?: string;
  1054 + taxId?: string;
  1055 + /**
  1056 + * @description
  1057 + * 更新字段的用户的名字
  1058 + */
  1059 + updateByName?: string;
  1060 + /**
  1061 + * @description
  1062 + * 更新时间
  1063 + * @format date-time
  1064 + */
  1065 + updateTime?: string;
  1066 + /**
  1067 + * @description
  1068 + * 版本号
  1069 + * @format int32
  1070 + */
  1071 + version?: number;
  1072 +}
  1073 +
  1074 +export interface Contactperson {
  1075 + birthday?: string;
  1076 + contactAddress?: string;
  1077 + contactCityId?: string;
707 1078 contactCountryId?: string;
708 1079 contactDistrictId?: string;
709 1080 contactPerson?: string;
... ... @@ -1041,19 +1412,398 @@ export interface InvoiceDto {
1041 1412 * 状态
1042 1413 */
1043 1414 status?: string;
  1415 + /**
  1416 + * @description
  1417 + * 关联子订单id
  1418 + */
  1419 + subOrderIds?: Array<number>;
1044 1420 }
1045 1421  
1046   -export interface InvoiceRecordQueryRequest {
  1422 +export interface InvoiceRecordDto {
  1423 + applyInvoicingNotes?: string;
  1424 + /**
  1425 + * @description
  1426 + * 开票备注
  1427 + */
  1428 + comment?: string;
  1429 + /**
  1430 + * @description
  1431 + * 联系人
  1432 + */
  1433 + contacts?: string;
  1434 + /**
  1435 + * @description
  1436 + * 开票内容
  1437 + */
  1438 + content?: string;
  1439 + createByName?: string;
  1440 + /** @format date-time */
  1441 + createTime?: string;
  1442 + failureReason?: string;
  1443 + /**
  1444 + * @description
  1445 + * id
  1446 + * @format int64
  1447 + */
  1448 + id?: number;
  1449 + /**
  1450 + * @description
  1451 + * 发票地址
  1452 + */
  1453 + invoiceAddress?: string;
  1454 + /**
  1455 + * @description
  1456 + * 发票明细
  1457 + */
  1458 + invoiceDetails?: Array<InvoiceDetail>;
  1459 + /**
  1460 + * @description
  1461 + * 关联发票id
  1462 + */
  1463 + invoiceId?: string;
  1464 + /**
  1465 + * @description
  1466 + * 发票号码
  1467 + */
  1468 + invoiceNumber?: string;
  1469 + /**
  1470 + * @description
  1471 + * 开票人
  1472 + */
  1473 + invoicingPerson?: string;
  1474 + /**
  1475 + * @description
  1476 + * 开票时间
  1477 + * @format date-time
  1478 + */
  1479 + invoicingTime?: string;
  1480 + /**
  1481 + * @description
  1482 + * 开具类型
  1483 + */
  1484 + invoicingType?: string;
  1485 + /**
  1486 + * @description
  1487 + * 开具类型
  1488 + */
  1489 + invoicingTypeText?: string;
1047 1490 /** @format date */
  1491 + invoicingdate?: string;
  1492 + /**
  1493 + * @description
  1494 + * 是否加急
  1495 + */
  1496 + isUrgent?: boolean;
  1497 + /**
  1498 + * @description
  1499 + * 是否加急文本
  1500 + */
  1501 + isUrgentText?: string;
  1502 + logicDelete?: boolean;
  1503 + /**
  1504 + * @description
  1505 + * 买方注册地址
  1506 + */
  1507 + partyAAddress?: string;
  1508 + /**
  1509 + * @description
  1510 + * 买方开户行账号
  1511 + */
  1512 + partyABankAccount?: string;
  1513 + /**
  1514 + * @description
  1515 + * 买方名称
  1516 + */
  1517 + partyAName?: string;
  1518 + /**
  1519 + * @description
  1520 + * 买方开户行
  1521 + */
  1522 + partyAOpenBank?: string;
  1523 + /**
  1524 + * @description
  1525 + * 买方电话号码
  1526 + */
  1527 + partyAPhoneNumber?: string;
  1528 + /**
  1529 + * @description
  1530 + * 买方税号
  1531 + */
  1532 + partyATaxid?: string;
  1533 + /**
  1534 + * @description
  1535 + * 抬头类型
  1536 + */
  1537 + partyAType?: string;
  1538 + partyB?: string;
  1539 + /**
  1540 + * @description
  1541 + * 卖方注册地址
  1542 + */
  1543 + partyBAddress?: string;
  1544 + /**
  1545 + * @description
  1546 + * 卖方开户行账号
  1547 + */
  1548 + partyBBankAccount?: string;
  1549 + /**
  1550 + * @description
  1551 + * 卖方名称
  1552 + */
  1553 + partyBName?: string;
  1554 + /**
  1555 + * @description
  1556 + * 卖方开户行
  1557 + */
  1558 + partyBOpenBank?: string;
  1559 + /**
  1560 + * @description
  1561 + * 卖方电话号码
  1562 + */
  1563 + partyBPhoneNumber?: string;
  1564 + /**
  1565 + * @description
  1566 + * 卖方税号
  1567 + */
  1568 + partyBTaxid?: string;
  1569 + paths?: Array<string>;
  1570 + /**
  1571 + * @description
  1572 + * 发票金额
  1573 + * @format double
  1574 + */
  1575 + price?: number;
  1576 + /**
  1577 + * @description
  1578 + * 接收邮箱地址
  1579 + */
  1580 + receiveEmail?: string;
  1581 + /**
  1582 + * @description
  1583 + * 订单来源
  1584 + */
  1585 + salesCodes?: Array<string>;
  1586 + /**
  1587 + * @description
  1588 + * 订单来源
  1589 + */
  1590 + salesCodesText?: string;
  1591 + /**
  1592 + * @description
  1593 + * 开票状态
  1594 + */
  1595 + status?: string;
  1596 + /**
  1597 + * @description
  1598 + * 开票状态
  1599 + */
  1600 + statusText?: string;
  1601 + /**
  1602 + * @description
  1603 + * 子订单id
  1604 + */
  1605 + subOrderIds?: Array<number>;
  1606 + /**
  1607 + * @description
  1608 + * 关联订单
  1609 + */
  1610 + subOrders?: Array<SubOrder>;
  1611 + /** @format double */
  1612 + totalPrice?: number;
  1613 + totalPriceText?: string;
  1614 + /**
  1615 + * @description
  1616 + * 开票类型
  1617 + */
  1618 + type?: string;
  1619 + /**
  1620 + * @description
  1621 + * 开票类型文本
  1622 + */
  1623 + typeText?: string;
  1624 + /**
  1625 + * @description
  1626 + * 用户id
  1627 + */
  1628 + uid?: string;
  1629 + updateByName?: string;
  1630 + /** @format date-time */
  1631 + updateTime?: string;
  1632 +}
  1633 +
  1634 +export interface InvoiceRecordQueryRequest {
  1635 + /**
  1636 + * @description
  1637 + * 联系人
  1638 + */
  1639 + contactsLike?: string;
  1640 + /** @format date-time */
1048 1641 createTimeGe?: string;
1049   - /** @format date */
  1642 + /** @format date-time */
1050 1643 createTimeLe?: string;
1051 1644 /** @format int32 */
1052   - pageNumber?: number;
  1645 + current?: number;
  1646 + /** @format int32 */
  1647 + end?: number;
  1648 + /**
  1649 + * @description
  1650 + * id
  1651 + * @format int64
  1652 + */
  1653 + id?: number;
  1654 + /**
  1655 + * @description
  1656 + * IdIn
  1657 + */
  1658 + idIn?: Array<number>;
  1659 + /**
  1660 + * @description
  1661 + * 关联发票id
  1662 + */
  1663 + invoiceId?: string;
  1664 + /**
  1665 + * @description
  1666 + * 发票号码
  1667 + */
  1668 + invoiceNumber?: string;
  1669 + /**
  1670 + * @description
  1671 + * 发票号码
  1672 + */
  1673 + invoiceNumberLike?: string;
  1674 + /**
  1675 + * @description
  1676 + * 开票时间
  1677 + * @format date-time
  1678 + */
  1679 + invoicingTimeGe?: string;
  1680 + /**
  1681 + * @description
  1682 + * 开票时间
  1683 + * @format date-time
  1684 + */
  1685 + invoicingTimeLe?: string;
  1686 + /**
  1687 + * @description
  1688 + * 开票类型
  1689 + */
  1690 + invoicingType?: string;
  1691 + /**
  1692 + * @description
  1693 + * 是否加急
  1694 + */
  1695 + isUrgent?: boolean;
  1696 + /**
  1697 + * @description
  1698 + * 订单号
  1699 + * @format int64
  1700 + */
  1701 + mainOrderId?: number;
  1702 + /**
  1703 + * @description
  1704 + * 主订单idIn
  1705 + */
  1706 + mainOrderIdIn?: Array<number>;
  1707 + /**
  1708 + * @description
  1709 + * 订单号
  1710 + */
  1711 + mainOrderIdLike?: string;
  1712 + /**
  1713 + * @description
  1714 + * 是否需要构建发票明细
  1715 + */
  1716 + needBuildDetails?: boolean;
  1717 + /**
  1718 + * @description
  1719 + * 是否需要构建发票明细
  1720 + */
  1721 + needBuildSubOrders?: boolean;
1053 1722 /** @format int32 */
1054 1723 pageSize?: number;
1055 1724 /**
1056 1725 * @description
  1726 + * 买方名称
  1727 + */
  1728 + partyANameLike?: string;
  1729 + /**
  1730 + * @description
  1731 + * 买方电话号码
  1732 + */
  1733 + partyAPhoneNumberLike?: string;
  1734 + /**
  1735 + * @description
  1736 + * 买方税号
  1737 + */
  1738 + partyATaxid?: string;
  1739 + /**
  1740 + * @description
  1741 + * 买方税号
  1742 + */
  1743 + partyATaxidLike?: string;
  1744 + partyB?: string;
  1745 + /**
  1746 + * @description
  1747 + * 卖方名称
  1748 + */
  1749 + partyBName?: string;
  1750 + /**
  1751 + * @description
  1752 + * 销售代表
  1753 + */
  1754 + salesCode?: string;
  1755 + /**
  1756 + * @description
  1757 + * 销售代表
  1758 + */
  1759 + salesCodeLike?: string;
  1760 + /** @format int32 */
  1761 + start?: number;
  1762 + /**
  1763 + * @description
  1764 + * 发票状态
  1765 + */
  1766 + status?: string;
  1767 + /**
  1768 + * @description
  1769 + * 状态非空
  1770 + */
  1771 + statusIn?: Array<string>;
  1772 + /**
  1773 + * @description
  1774 + * 状态非空
  1775 + */
  1776 + statusIsNotNull?: boolean;
  1777 + /**
  1778 + * @description
  1779 + * 状态为空
  1780 + */
  1781 + statusIsNull?: boolean;
  1782 + /**
  1783 + * @description
  1784 + * 子订单
  1785 + * @format int64
  1786 + */
  1787 + subOrderId?: number;
  1788 + /**
  1789 + * @description
  1790 + * 子订单idIn
  1791 + */
  1792 + subOrderIdIn?: Array<number>;
  1793 + /**
  1794 + * @description
  1795 + * 子订单
  1796 + */
  1797 + subOrderIdLike?: string;
  1798 + /** @format int32 */
  1799 + total?: number;
  1800 + /**
  1801 + * @description
  1802 + * 开票类型
  1803 + */
  1804 + type?: string;
  1805 + /**
  1806 + * @description
1057 1807 * 用户id
1058 1808 */
1059 1809 uid?: string;
... ... @@ -1074,10 +1824,14 @@ export interface ItemSaItem {
1074 1824  
1075 1825 export interface MainOrderqueryRequest {
1076 1826 afterInvoicingStatusIsNull?: boolean;
  1827 + /** @format date */
  1828 + createDateGe?: string;
  1829 + /** @format date */
  1830 + createDateLe?: string;
1077 1831 /** @format date-time */
1078   - invoicingTimeGe?: string;
  1832 + createTimeGe?: string;
1079 1833 /** @format date-time */
1080   - invoicingTimeLe?: string;
  1834 + createTimeLe?: string;
1081 1835 orderStatusNotIn?: Array<string>;
1082 1836 /** @format int32 */
1083 1837 pageNumber?: number;
... ... @@ -1693,186 +2447,399 @@ export interface OrderZoNingProvinceUserDo {
1693 2447 export interface ProcureConvertProcureDto {
1694 2448 /**
1695 2449 * @description
1696   - * 采购转发备注
  2450 + * 采购转发备注
  2451 + */
  2452 + procureConvertNotes?: string;
  2453 + /**
  2454 + * @description
  2455 + * 采购人名称
  2456 + */
  2457 + procureName?: string;
  2458 + /**
  2459 + * @description
  2460 + * 子订单id集合
  2461 + */
  2462 + subIds?: Array<number>;
  2463 +}
  2464 +
  2465 +export interface ProcureOrderDto {
  2466 + /**
  2467 + * @description
  2468 + * 子订单id集合
  2469 + */
  2470 + subIds?: Array<number>;
  2471 +}
  2472 +
  2473 +export interface ProcurePrintDto {
  2474 + /**
  2475 + * @description
  2476 + * 子订单id集合
  2477 + */
  2478 + ids?: Array<number>;
  2479 +}
  2480 +
  2481 +export interface ProductInformationDto {
  2482 + /**
  2483 + * @description
  2484 + * 货品编码
  2485 + */
  2486 + productCode?: string;
  2487 + /**
  2488 + * @description
  2489 + * 货品名称
  2490 + */
  2491 + productName?: string;
  2492 +}
  2493 +
  2494 +export interface QueryAfterSalesInfoSnapshotDto {
  2495 + /**
  2496 + * @description
  2497 + * 子订单id集合
  2498 + */
  2499 + subOrderIds?: Array<number>;
  2500 +}
  2501 +
  2502 +export interface QueryAnnexDto {
  2503 + /**
  2504 + * @description
  2505 + * 附件集合
  2506 + */
  2507 + filePaths?: Array<FilePathDto>;
  2508 + /**
  2509 + * @description
  2510 + * 子订单id
  2511 + * @format int64
  2512 + */
  2513 + subId?: number;
  2514 +}
  2515 +
  2516 +export interface QueryBankStatementDto {
  2517 + /**
  2518 + * @description
  2519 + * amount
  2520 + * @format double
  2521 + */
  2522 + amount?: number;
  2523 + /**
  2524 + * @description
  2525 + * collection_date
  2526 + * @format date
  2527 + */
  2528 + collectionDatetimeBegin?: string;
  2529 + /**
  2530 + * @description
  2531 + * collection_date
  2532 + * @format date
  2533 + */
  2534 + collectionDatetimeEnd?: string;
  2535 + /** @format int32 */
  2536 + current?: number;
  2537 + /** @format int32 */
  2538 + end?: number;
  2539 + /** @format int64 */
  2540 + id?: number;
  2541 + /** @format int32 */
  2542 + pageSize?: number;
  2543 + /**
  2544 + * @description
  2545 + * payee
  2546 + */
  2547 + payee?: string;
  2548 + /**
  2549 + * @description
  2550 + * payer
  2551 + */
  2552 + payer?: string;
  2553 + /**
  2554 + * @description
  2555 + * remark
  2556 + */
  2557 + remark?: string;
  2558 + remarkNote?: string;
  2559 + serialNumber?: string;
  2560 + /** @format int32 */
  2561 + start?: number;
  2562 + status?: string;
  2563 + /** @format int32 */
  2564 + total?: number;
  2565 +}
  2566 +
  2567 +export interface QueryClientDto {
  2568 + companyAddressLike?: string;
  2569 + companyIds?: Array<number>;
  2570 + companyNameLike?: string;
  2571 + /** @format date-time */
  2572 + createTimeGe?: string;
  2573 + /** @format date-time */
  2574 + createTimeLe?: string;
  2575 + /** @format int32 */
  2576 + current?: number;
  2577 + /** @format int32 */
  2578 + end?: number;
  2579 + hasScheme?: boolean;
  2580 + level?: string;
  2581 + namelike?: string;
  2582 + /** @format int32 */
  2583 + pageSize?: number;
  2584 + phoneNumber?: string;
  2585 + /** @format int32 */
  2586 + start?: number;
  2587 + /** @format int32 */
  2588 + total?: number;
  2589 + tradeStatus?: string;
  2590 +}
  2591 +
  2592 +export interface QueryCommunicationInfoDto {
  2593 + /** @format int64 */
  2594 + clientId?: number;
  2595 + content?: string;
  2596 + /** @format int32 */
  2597 + current?: number;
  2598 + /** @format date-time */
  2599 + datetime?: string;
  2600 + /** @format int32 */
  2601 + end?: number;
  2602 + /** @format int64 */
  2603 + id?: number;
  2604 + /** @format int32 */
  2605 + pageSize?: number;
  2606 + /** @format int32 */
  2607 + start?: number;
  2608 + /** @format int32 */
  2609 + total?: number;
  2610 + way?: string;
  2611 +}
  2612 +
  2613 +export interface QueryCustomerInformationDto {
  2614 + /**
  2615 + * @description
  2616 + * 单位
  2617 + */
  2618 + institution?: string;
  2619 + /**
  2620 + * @description
  2621 + * 单位联系人
  2622 + */
  2623 + institutionContactName?: string;
  2624 + /**
  2625 + * @description
  2626 + * 名称
  2627 + */
  2628 + name?: string;
  2629 +}
  2630 +
  2631 +export interface QueryHistoryRecordDto {
  2632 + /**
  2633 + * @description
  2634 + * 子订单id集合
  2635 + */
  2636 + ids?: Array<number>;
  2637 + /**
  2638 + * @description
  2639 + * 查看已经删除的订单,false表示查看未删除的订单,true表示查看删除的订单
  2640 + */
  2641 + isDeleteQueryOrder?: boolean;
  2642 +}
  2643 +
  2644 +export interface QueryInvoiceDetailDto {
  2645 + /**
  2646 + * @description
  2647 + * 发票id
  2648 + * @format int64
  2649 + */
  2650 + invoiceId?: number;
  2651 +}
  2652 +
  2653 +export interface QueryInvoiceProjectDto {
  2654 + /** @format int32 */
  2655 + current?: number;
  2656 + /** @format int32 */
  2657 + end?: number;
  2658 + nameLike?: string;
  2659 + /** @format int32 */
  2660 + pageSize?: number;
  2661 + /** @format int32 */
  2662 + start?: number;
  2663 + /** @format int32 */
  2664 + total?: number;
  2665 +}
  2666 +
  2667 +export interface QueryInvoiceRecordDto {
  2668 + /**
  2669 + * @description
  2670 + * 联系人
  2671 + */
  2672 + contactsLike?: string;
  2673 + /** @format date-time */
  2674 + createTimeGe?: string;
  2675 + /** @format date-time */
  2676 + createTimeLe?: string;
  2677 + /** @format int32 */
  2678 + current?: number;
  2679 + /** @format int32 */
  2680 + end?: number;
  2681 + /**
  2682 + * @description
  2683 + * id
  2684 + * @format int64
  2685 + */
  2686 + id?: number;
  2687 + /**
  2688 + * @description
  2689 + * IdIn
  2690 + */
  2691 + idIn?: Array<number>;
  2692 + /**
  2693 + * @description
  2694 + * 关联发票id
  2695 + */
  2696 + invoiceId?: string;
  2697 + /**
  2698 + * @description
  2699 + * 发票号码
  2700 + */
  2701 + invoiceNumber?: string;
  2702 + /**
  2703 + * @description
  2704 + * 发票号码
  2705 + */
  2706 + invoiceNumberLike?: string;
  2707 + /**
  2708 + * @description
  2709 + * 开票时间
  2710 + * @format date-time
  2711 + */
  2712 + invoicingTimeGe?: string;
  2713 + /**
  2714 + * @description
  2715 + * 开票时间
  2716 + * @format date-time
  2717 + */
  2718 + invoicingTimeLe?: string;
  2719 + /**
  2720 + * @description
  2721 + * 开票类型
1697 2722 */
1698   - procureConvertNotes?: string;
  2723 + invoicingType?: string;
1699 2724 /**
1700 2725 * @description
1701   - * 采购人名称
  2726 + * 是否加急
1702 2727 */
1703   - procureName?: string;
  2728 + isUrgent?: boolean;
1704 2729 /**
1705 2730 * @description
1706   - * 子订单id集合
  2731 + * 订单号
  2732 + * @format int64
1707 2733 */
1708   - subIds?: Array<number>;
1709   -}
1710   -
1711   -export interface ProcureOrderDto {
  2734 + mainOrderId?: number;
1712 2735 /**
1713 2736 * @description
1714   - * 子订单id集合
  2737 + * 主订单idIn
1715 2738 */
1716   - subIds?: Array<number>;
1717   -}
1718   -
1719   -export interface ProcurePrintDto {
  2739 + mainOrderIdIn?: Array<number>;
1720 2740 /**
1721 2741 * @description
1722   - * 子订单id集合
  2742 + * 订单号
1723 2743 */
1724   - ids?: Array<number>;
1725   -}
1726   -
1727   -export interface ProductInformationDto {
  2744 + mainOrderIdLike?: string;
1728 2745 /**
1729 2746 * @description
1730   - * 货品编码
  2747 + * 是否需要构建发票明细
1731 2748 */
1732   - productCode?: string;
  2749 + needBuildDetails?: boolean;
1733 2750 /**
1734 2751 * @description
1735   - * 货品名称
  2752 + * 是否需要构建发票明细
1736 2753 */
1737   - productName?: string;
1738   -}
1739   -
1740   -export interface QueryAfterSalesInfoSnapshotDto {
  2754 + needBuildSubOrders?: boolean;
  2755 + /** @format int32 */
  2756 + pageSize?: number;
1741 2757 /**
1742 2758 * @description
1743   - * 子订单id集合
  2759 + * 买方名称
1744 2760 */
1745   - subOrderIds?: Array<number>;
1746   -}
1747   -
1748   -export interface QueryAnnexDto {
  2761 + partyANameLike?: string;
1749 2762 /**
1750 2763 * @description
1751   - * 附件集合
  2764 + * 买方电话号码
1752 2765 */
1753   - filePaths?: Array<FilePathDto>;
  2766 + partyAPhoneNumberLike?: string;
1754 2767 /**
1755 2768 * @description
1756   - * 子订单id
1757   - * @format int64
  2769 + * 买方税号
1758 2770 */
1759   - subId?: number;
1760   -}
1761   -
1762   -export interface QueryBankStatementDto {
  2771 + partyATaxid?: string;
1763 2772 /**
1764 2773 * @description
1765   - * amount
1766   - * @format double
  2774 + * 买方税号
1767 2775 */
1768   - amount?: number;
  2776 + partyATaxidLike?: string;
  2777 + partyB?: string;
1769 2778 /**
1770 2779 * @description
1771   - * collection_date
1772   - * @format date
  2780 + * 卖方名称
1773 2781 */
1774   - collectionDatetimeBegin?: string;
  2782 + partyBName?: string;
1775 2783 /**
1776 2784 * @description
1777   - * collection_date
1778   - * @format date
  2785 + * 销售代表
1779 2786 */
1780   - collectionDatetimeEnd?: string;
1781   - /** @format int32 */
1782   - current?: number;
1783   - /** @format int32 */
1784   - end?: number;
1785   - /** @format int64 */
1786   - id?: number;
  2787 + salesCode?: string;
  2788 + /**
  2789 + * @description
  2790 + * 销售代表
  2791 + */
  2792 + salesCodeLike?: string;
1787 2793 /** @format int32 */
1788   - pageSize?: number;
  2794 + start?: number;
1789 2795 /**
1790 2796 * @description
1791   - * payee
  2797 + * 发票状态
1792 2798 */
1793   - payee?: string;
  2799 + status?: string;
1794 2800 /**
1795 2801 * @description
1796   - * payer
  2802 + * 状态非空
1797 2803 */
1798   - payer?: string;
  2804 + statusIn?: Array<string>;
1799 2805 /**
1800 2806 * @description
1801   - * remark
  2807 + * 状态非空
1802 2808 */
1803   - remark?: string;
1804   - remarkNote?: string;
1805   - serialNumber?: string;
1806   - /** @format int32 */
1807   - start?: number;
1808   - status?: string;
1809   - /** @format int32 */
1810   - total?: number;
1811   -}
1812   -
1813   -export interface QueryClientDto {
1814   - companyAddressLike?: string;
1815   - companyIds?: Array<number>;
1816   - companyNameLike?: string;
1817   - /** @format date-time */
1818   - createTimeGe?: string;
1819   - /** @format date-time */
1820   - createTimeLe?: string;
1821   - /** @format int32 */
1822   - current?: number;
1823   - /** @format int32 */
1824   - end?: number;
1825   - hasScheme?: string;
1826   - level?: string;
1827   - namelike?: string;
1828   - /** @format int32 */
1829   - pageSize?: number;
1830   - phoneNumber?: string;
1831   - /** @format int32 */
1832   - start?: number;
1833   - /** @format int32 */
1834   - total?: number;
1835   - tradeStatus?: string;
1836   -}
1837   -
1838   -export interface QueryCustomerInformationDto {
  2809 + statusIsNotNull?: boolean;
1839 2810 /**
1840 2811 * @description
1841   - * 单位
  2812 + * 状态为空
1842 2813 */
1843   - institution?: string;
  2814 + statusIsNull?: boolean;
1844 2815 /**
1845 2816 * @description
1846   - * 单位联系人
  2817 + * 子订单
  2818 + * @format int64
1847 2819 */
1848   - institutionContactName?: string;
  2820 + subOrderId?: number;
1849 2821 /**
1850 2822 * @description
1851   - * 名称
  2823 + * 子订单idIn
1852 2824 */
1853   - name?: string;
1854   -}
1855   -
1856   -export interface QueryHistoryRecordDto {
  2825 + subOrderIdIn?: Array<number>;
1857 2826 /**
1858 2827 * @description
1859   - * 子订单id集合
  2828 + * 子订单
1860 2829 */
1861   - ids?: Array<number>;
  2830 + subOrderIdLike?: string;
  2831 + /** @format int32 */
  2832 + total?: number;
1862 2833 /**
1863 2834 * @description
1864   - * 查看已经删除的订单,false表示查看未删除的订单,true表示查看删除的订单
  2835 + * 开票类型
1865 2836 */
1866   - isDeleteQueryOrder?: boolean;
1867   -}
1868   -
1869   -export interface QueryInvoiceDetailDto {
  2837 + type?: string;
1870 2838 /**
1871 2839 * @description
1872   - * 发票id
1873   - * @format int64
  2840 + * 用户id
1874 2841 */
1875   - invoiceId?: number;
  2842 + uid?: string;
1876 2843 }
1877 2844  
1878 2845 export interface QueryMainOrderDto {
... ... @@ -2278,6 +3245,129 @@ export interface ShippingWarehouseChangeDto {
2278 3245 shippingWarehouse?: string;
2279 3246 }
2280 3247  
  3248 +export interface SubOrder {
  3249 + afterInvoicingStatus?: string;
  3250 + /** @format date-time */
  3251 + afterInvoicingStatusUpdateTime?: string;
  3252 + afterSalesAnnex?: string;
  3253 + afterSalesNotes?: string;
  3254 + afterSalesPlan?: string;
  3255 + annex?: string;
  3256 + applyInvoicingAnnex?: string;
  3257 + applyInvoicingNotes?: string;
  3258 + /** @format date-time */
  3259 + applyTime?: string;
  3260 + /** @format int32 */
  3261 + attrId?: number;
  3262 + checkNotes?: string;
  3263 + /** @format date-time */
  3264 + collectMoneyTime?: string;
  3265 + confirmDeliverNotes?: string;
  3266 + confirmReissueNotes?: string;
  3267 + createByName?: string;
  3268 + /** @format date-time */
  3269 + createTime?: string;
  3270 + /** @format date-time */
  3271 + deadline?: string;
  3272 + ext?: string;
  3273 + extendField?: string;
  3274 + /** @format date-time */
  3275 + financialReceiptIssuanceTime?: string;
  3276 + fullPaymentStatus?: string;
  3277 + /** @format double */
  3278 + goodsVolume?: number;
  3279 + /** @format double */
  3280 + goodsWeight?: number;
  3281 + /** @format int64 */
  3282 + id?: number;
  3283 + image?: string;
  3284 + invoiceApplyUsername?: string;
  3285 + invoiceInformation?: string;
  3286 + /** @format int64 */
  3287 + invoiceRecordId?: number;
  3288 + invoicingCheckAnnex?: string;
  3289 + invoicingNotes?: string;
  3290 + invoicingStatus?: string;
  3291 + /** @format date-time */
  3292 + invoicingTime?: string;
  3293 + invoicingUrgentCause?: string;
  3294 + isUrgent?: boolean;
  3295 + kingdeeErrorMessage?: string;
  3296 + logicDelete?: boolean;
  3297 + logisticsMethod?: string;
  3298 + logisticsNotes?: string;
  3299 + /** @format int64 */
  3300 + mainOrderAmountProportion?: number;
  3301 + /** @format int64 */
  3302 + mainOrderId?: number;
  3303 + materialId?: string;
  3304 + modified?: boolean;
  3305 + modifiedAuditNotes?: string;
  3306 + modifiedAuditStatus?: string;
  3307 + modifiedOptFlag?: string;
  3308 + nextOrderStatus?: string;
  3309 + notes?: string;
  3310 + orderStatus?: string;
  3311 + orderStatusBeforeModify?: string;
  3312 + /** @format date-time */
  3313 + orderStatusUpdateTime?: string;
  3314 + /** @format int32 */
  3315 + packageNumber?: number;
  3316 + parameters?: string;
  3317 + paymentChannel?: string;
  3318 + paymentMethod?: string;
  3319 + paymentReceiptAnnex?: string;
  3320 + paymentReceiptNotes?: string;
  3321 + paymentReceiptStatus?: string;
  3322 + paymentStatus?: string;
  3323 + paymentTransactionId?: string;
  3324 + postAuditNotes?: string;
  3325 + postAuditStatus?: string;
  3326 + /** @format date-time */
  3327 + postAuditStatusUpdateTime?: string;
  3328 + preAfterInvoicingStatus?: string;
  3329 + procureConvertNotes?: string;
  3330 + procureNotes?: string;
  3331 + /** @format date-time */
  3332 + procureOrderDatetime?: string;
  3333 + procureOrderStatus?: string;
  3334 + productBelongBusiness?: string;
  3335 + productCode?: string;
  3336 + /** @format int32 */
  3337 + productId?: number;
  3338 + productName?: string;
  3339 + /** @format int64 */
  3340 + productPrice?: number;
  3341 + /** @format date-time */
  3342 + productionEndTime?: string;
  3343 + /** @format date-time */
  3344 + productionStartTime?: string;
  3345 + productionTimePushStatus?: string;
  3346 + purchaser?: string;
  3347 + /** @format int32 */
  3348 + quantity?: number;
  3349 + receivingCompany?: string;
  3350 + reissueNotes?: string;
  3351 + serialNumber?: string;
  3352 + shippingWarehouse?: string;
  3353 + /** @format int64 */
  3354 + subOrderPayment?: number;
  3355 + supplierName?: string;
  3356 + supplierNotes?: string;
  3357 + /** @format int64 */
  3358 + totalPayment?: number;
  3359 + /** @format int32 */
  3360 + uid?: number;
  3361 + unit?: string;
  3362 + unitId?: string;
  3363 + updateByName?: string;
  3364 + /** @format date-time */
  3365 + updateTime?: string;
  3366 + urgentInvoiceAuditNotes?: string;
  3367 + /** @format int32 */
  3368 + version?: number;
  3369 +}
  3370 +
2281 3371 export interface SysLogQueryVO {
2282 3372 address?: string;
2283 3373 browser?: string;
... ... @@ -2604,6 +3694,42 @@ export interface ApiOrderConfirmReceiveRequest {
2604 3694 subOrderIds?: Array<number>;
2605 3695 }
2606 3696  
  3697 +export interface ClientCommunicationInfo {
  3698 + /** @format int64 */
  3699 + clientId?: number;
  3700 + /**
  3701 + * @description
  3702 + * 内容
  3703 + */
  3704 + content?: string;
  3705 + createByName?: string;
  3706 + /** @format date-time */
  3707 + createTime?: string;
  3708 + /**
  3709 + * @description
  3710 + * 跟进时间
  3711 + * @format date-time
  3712 + */
  3713 + datetime?: string;
  3714 + /** @format int64 */
  3715 + id?: number;
  3716 + logicDelete?: boolean;
  3717 + updateByName?: string;
  3718 + /** @format date-time */
  3719 + updateTime?: string;
  3720 + /**
  3721 + * @description
  3722 + * 方式
  3723 + */
  3724 + way?: string;
  3725 +}
  3726 +
  3727 +export interface CompanyInfo {
  3728 + addressLike?: string;
  3729 + nameLike?: string;
  3730 + taxIdIsNotNull?: boolean;
  3731 +}
  3732 +
2607 3733 export interface TsgFile {
2608 3734 absolute?: boolean;
2609 3735 absoluteFile?: TsgFile;
... ... @@ -2630,6 +3756,44 @@ export interface TsgFile {
2630 3756 writable?: boolean;
2631 3757 }
2632 3758  
  3759 +export interface InvoiceDetail {
  3760 + /** @format int64 */
  3761 + id?: number;
  3762 + /**
  3763 + * @description
  3764 + * 发票id
  3765 + * @format int64
  3766 + */
  3767 + invoiceRecordId?: number;
  3768 + /**
  3769 + * @description
  3770 + * 单价
  3771 + * @format double
  3772 + */
  3773 + price?: number;
  3774 + projectName?: string;
  3775 + /** @format double */
  3776 + quantity?: number;
  3777 + /**
  3778 + * @description
  3779 + * 型号
  3780 + */
  3781 + specification?: string;
  3782 + /** @format int64 */
  3783 + subOrderId?: number;
  3784 + /** @format double */
  3785 + taxPrice?: number;
  3786 + /** @format double */
  3787 + taxRate?: number;
  3788 + /**
  3789 + * @description
  3790 + * 总价
  3791 + * @format double
  3792 + */
  3793 + totalPrice?: number;
  3794 + unit?: string;
  3795 +}
  3796 +
2633 3797 export interface SalesRechargePrepaymentAuditRequest {
2634 3798 /**
2635 3799 * @description
... ...