@@ -455,8 +445,8 @@ export default function BoxProductList(props: IBoxProductListProps) {
/>
-
- )}
+ )}
+
);
}}
diff --git a/packages/app-operation/src/components/NotifyMessage/NotificationMessage.module.less b/packages/app-operation/src/components/NotifyMessage/NotificationMessage.module.less
new file mode 100644
index 0000000..db62086
--- /dev/null
+++ b/packages/app-operation/src/components/NotifyMessage/NotificationMessage.module.less
@@ -0,0 +1,157 @@
+.bellIcon {
+ font-size: 20px;
+ cursor: pointer;
+ padding: 8px;
+ transition: all 0.3s;
+ color: rgba(0, 0, 0, 65%);
+
+ &:hover {
+ color: #1890ff;
+ }
+}
+
+// 确保红点样式明显
+:global {
+ .ant-badge-count,
+ .ant-badge-dot {
+ box-shadow: 0 0 0 1px #fff;
+ }
+}
+
+.dropdownContent {
+ width: 380px;
+ max-height: 500px;
+ background: #fff;
+ border-radius: 8px;
+ box-shadow: 0 2px 8px rgba(0, 0, 0, 15%);
+ display: flex;
+ flex-direction: column;
+}
+
+.header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 16px;
+ border-bottom: 1px solid #f0f0f0;
+
+ .title {
+ font-size: 16px;
+ font-weight: 500;
+ color: #262626;
+ }
+
+ .count {
+ font-size: 14px;
+ color: #ff4d4f;
+ }
+}
+
+.messageList {
+ flex: 1;
+ overflow-y: auto;
+ max-height: 400px;
+ padding: 8px;
+
+ &::-webkit-scrollbar {
+ width: 6px;
+ }
+
+ &::-webkit-scrollbar-thumb {
+ background-color: rgba(0, 0, 0, 20%);
+ border-radius: 3px;
+
+ &:hover {
+ background-color: rgba(0, 0, 0, 30%);
+ }
+ }
+}
+
+.messageItem {
+ cursor: pointer;
+ padding: 12px 16px;
+ transition: background-color 0.3s;
+ border-bottom: none;
+
+ &:hover {
+ background-color: #f5f5f5;
+ }
+
+ &.unread {
+ background-color: #f6ffed;
+ }
+}
+
+.messageContent {
+ flex: 1;
+}
+
+.messageTitle {
+ display: flex;
+ align-items: center;
+ font-size: 14px;
+ font-weight: 500;
+ color: #262626;
+ margin-bottom: 4px;
+ position: relative;
+}
+
+.unreadDot {
+ display: inline-block;
+ width: 6px;
+ height: 6px;
+ background-color: #ff4d4f;
+ border-radius: 50%;
+ margin-left: 8px;
+}
+
+.messageDesc {
+ font-size: 13px;
+ color: #595959;
+ line-height: 1.5;
+ margin-bottom: 4px;
+ display: box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
+.messageTime {
+ font-size: 12px;
+ color: #8c8c8c;
+}
+
+.loadingWrapper {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding: 40px 0;
+}
+
+.emptyWrapper {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding: 40px 0;
+}
+
+.footer {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding: 12px 16px;
+ border-top: 1px solid #f0f0f0;
+ cursor: pointer;
+ transition: background-color 0.3s;
+ font-size: 14px;
+ color: #1890ff;
+
+ &:hover {
+ background-color: #f5f5f5;
+ }
+
+ span {
+ margin-right: 4px;
+ }
+}
diff --git a/packages/app-operation/src/components/NotifyMessage/NotificationMessage.tsx b/packages/app-operation/src/components/NotifyMessage/NotificationMessage.tsx
new file mode 100644
index 0000000..78b3b67
--- /dev/null
+++ b/packages/app-operation/src/components/NotifyMessage/NotificationMessage.tsx
@@ -0,0 +1,189 @@
+import { business } from '@/services';
+import { BellOutlined, LoadingOutlined, MoreOutlined } from '@ant-design/icons';
+import { history, useIntl } from '@umijs/max';
+import { useRequest } from 'ahooks';
+import { Badge, Dropdown, Empty, List, message, Spin } from 'antd';
+import React, { useMemo, useState } from 'react';
+import styles from './NotificationMessage.module.less';
+
+interface NotificationMessageProps {
+ adminId?: string;
+}
+
+const NotificationMessage: React.FC
= ({
+ adminId,
+}) => {
+ const intl = useIntl();
+ const [dropdownOpen, setDropdownOpen] = useState(false);
+
+ // 获取未读消息数量
+ const { data: unreadCountData, refresh: refreshUnreadCount } = useRequest(
+ () =>
+ business.messageReceiver.getUnreadCount({
+ messageReceiverUnreadCountQry: {
+ adminId: adminId || '',
+ },
+ }),
+ {
+ ready: !!adminId,
+ refreshDeps: [adminId],
+ },
+ );
+
+ const unreadCount = unreadCountData?.data || 0;
+
+ // 获取消息列表(只获取前5条未读消息)
+ const {
+ data: messageListData,
+ loading: messageListLoading,
+ refresh: refreshMessageList,
+ } = useRequest(
+ () =>
+ business.messageReceiver.pageMessageReceiver({
+ messageReceiverPageQry: {
+ pageIndex: 1,
+ pageSize: 5,
+ },
+ }),
+ {
+ ready: dropdownOpen && !!adminId,
+ refreshDeps: [dropdownOpen, adminId],
+ },
+ );
+
+ const messageList = messageListData?.data || [];
+
+ // 标记已读
+ const { run: markAsRead } = useRequest(
+ (messageReceiverId: string) =>
+ business.messageReceiver.markReadMessageReceiver({
+ messageReceiverId: messageReceiverId,
+ }),
+ {
+ manual: true,
+ onSuccess: () => {
+ refreshUnreadCount();
+ refreshMessageList();
+ },
+ onError: (error) => {
+ message.error(
+ intl.formatMessage({ id: 'notification.markReadFailed' }),
+ );
+ console.error('标记已读失败:', error);
+ },
+ },
+ );
+
+ // 点击消息项
+ const handleMessageClick = (item: BusinessAPI.MessageReceiverVO) => {
+ if (!item.isRead) {
+ markAsRead(item.messageReceiverId);
+ }
+ // 可以跳转到消息详情页面
+ // history.push(`/message/detail/${item.messageReceiverId}`);
+ };
+
+ // 查看更多消息
+ const handleViewMore = () => {
+ setDropdownOpen(false);
+ history.push('/message');
+ };
+
+ // 下拉菜单内容
+ const dropdownContent = useMemo(() => {
+ return (
+
+
+
+ {intl.formatMessage({ id: 'notification.title' })}
+
+ {unreadCount > 0 && (
+
+ {intl.formatMessage(
+ { id: 'notification.unreadCount' },
+ { count: unreadCount },
+ )}
+
+ )}
+
+
+
+ {messageListLoading ? (
+
+ } />
+
+ ) : messageList.length > 0 ? (
+
(
+ handleMessageClick(item)}
+ >
+
+
+ {item.messageVO?.title || '消息通知'}
+ {!item.isRead && }
+
+
+ {item.messageVO?.content || ''}
+
+
{item.createdAt}
+
+
+ )}
+ />
+ ) : (
+
+
+
+ )}
+
+
+ {messageList.length > 0 && (
+
+ {intl.formatMessage({ id: 'notification.viewMore' })}
+
+
+ )}
+
+ );
+ }, [
+ messageList,
+ messageListLoading,
+ unreadCount,
+ intl,
+ markAsRead,
+ handleMessageClick,
+ handleViewMore,
+ ]);
+
+ return (
+ dropdownContent}
+ >
+
+
+
+
+ );
+};
+
+export default NotificationMessage;
diff --git a/packages/app-operation/src/components/NotifyMessage/NotifyMessageTemplateList.tsx b/packages/app-operation/src/components/NotifyMessage/NotifyMessageTemplateList.tsx
new file mode 100644
index 0000000..b01df59
--- /dev/null
+++ b/packages/app-operation/src/components/NotifyMessage/NotifyMessageTemplateList.tsx
@@ -0,0 +1,433 @@
+import { BizContainer, BizValueType, ModeType } from '@/components';
+import { business } from '@/services';
+import { useIntl } from '@@/exports';
+import {
+ ProColumns,
+ ProFormDependency,
+ ProFormItem,
+ ProFormSelect,
+ ProFormText,
+ ProFormTextArea,
+} from '@ant-design/pro-components';
+import { ProDescriptionsItemProps } from '@ant-design/pro-descriptions';
+import { Button, Space, Tag, Typography } from 'antd';
+import React from 'react';
+
+interface INotifyMessageTemplateListProps {
+ ghost?: boolean;
+ search?: boolean;
+ onValueChange?: () => void;
+ mode?: ModeType;
+ trigger?: () => React.ReactNode;
+}
+
+const variables = [
+ // 采购单
+ '经销商简称',
+ '车次号',
+ '车牌号',
+ '目的地',
+ '利润金额',
+ '瓜农姓名',
+ '瓜农货款',
+ '录入员姓名',
+ '录入员提审时间',
+ // 采购单审核
+ '审核员姓名',
+ '审核员审核时间',
+ '审核员驳回原因',
+ // 采购单审批
+ '审批员姓名',
+ '审批员审批时间',
+ '审批员驳回原因',
+];
+
+export default function NotifyMessageTemplateList(
+ props: INotifyMessageTemplateListProps,
+) {
+ const {
+ ghost = false,
+ search = true,
+ mode = 'page',
+ trigger,
+ onValueChange,
+ } = props;
+ const intl = useIntl();
+ const intlPrefix = 'notifyMessageTemplate';
+
+ // 模板分类映射
+ const templateCategoryMap: Record = {
+ PURCHASE_ORDER_MESSAGE_TEMPLATE: {
+ label: intl.formatMessage({
+ id: intlPrefix + '.templateCategory.purchaseOrderMessageTemplate',
+ }),
+ },
+ };
+ // 模板事件映射
+ const templateSceneMap: Record = {
+ WAIT_AUDIT: {
+ label: intl.formatMessage({
+ id: intlPrefix + '.templateScene.waitAudit',
+ }),
+ },
+ WAIT_APPROVE: {
+ label: intl.formatMessage({
+ id: intlPrefix + '.templateScene.waitApprove',
+ }),
+ },
+ APPROVE_PASS: {
+ label: intl.formatMessage({
+ id: intlPrefix + '.templateScene.approvePass',
+ }),
+ },
+ AUDIT_REJECT: {
+ label: intl.formatMessage({
+ id: intlPrefix + '.templateScene.auditReject',
+ }),
+ },
+ APPROVE_REJECT: {
+ label: intl.formatMessage({
+ id: intlPrefix + '.templateScene.approveReject',
+ }),
+ },
+ };
+
+ // 表单上下文
+ const formContext = [
+ ,
+ ({
+ label: templateCategoryMap[key].label,
+ value: key,
+ }))}
+ />,
+ ({
+ label: templateSceneMap[key].label,
+ value: key,
+ }))}
+ />,
+ ,
+ ,
+ ,
+
+ {({ contentTemplate }, form) => (
+
+ <>
+ {variables.length === 0 ? (
+
+ {intl.formatMessage({
+ id: intlPrefix + '.form.contentTemplate.noVariables',
+ })}
+
+ ) : (
+
+ {variables.map((variable: string) => (
+
+ ))}
+
+ )}
+ >
+
+ )}
+ ,
+ {
+ const data = await business.role.listRole({
+ roleListQry: {
+ ...params,
+ },
+ });
+
+ return (
+ data?.data?.map((item) => ({
+ label: item.platformVO?.platformName + '-' + item.name,
+ value: item.roleId,
+ })) ?? []
+ );
+ }}
+ />,
+ ];
+
+ const columns: ProColumns[] = [
+ {
+ title: intl.formatMessage({
+ id: intlPrefix + '.column.templateCategory',
+ }),
+ dataIndex: 'templateCategory',
+ key: 'templateCategory',
+ valueType: 'select',
+ valueEnum: Object.entries(templateCategoryMap).reduce(
+ (acc, [key, value]) => ({
+ ...acc,
+ [key]: { text: value.label },
+ }),
+ {},
+ ),
+ render: (_, record) => {
+ const categoryInfo = templateCategoryMap[record.templateCategory];
+ return categoryInfo ? (
+ {categoryInfo.label}
+ ) : (
+ {record.templateCategory}
+ );
+ },
+ },
+ {
+ title: intl.formatMessage({
+ id: intlPrefix + '.column.templateScene',
+ }),
+ dataIndex: 'templateScene',
+ key: 'templateScene',
+ valueType: 'select',
+ valueEnum: Object.entries(templateSceneMap).reduce(
+ (acc, [key, value]) => ({
+ ...acc,
+ [key]: { text: value.label },
+ }),
+ {},
+ ),
+ render: (_, record) => {
+ const sceneInfo = templateSceneMap[record.templateScene];
+ return sceneInfo ? (
+ {sceneInfo.label}
+ ) : (
+ {record.templateScene}
+ );
+ },
+ },
+ {
+ title: intl.formatMessage({ id: intlPrefix + '.column.titleTemplate' }),
+ dataIndex: 'titleTemplate',
+ key: 'titleTemplate',
+ valueType: 'text',
+ ellipsis: true,
+ },
+ {
+ title: intl.formatMessage({ id: intlPrefix + '.column.contentTemplate' }),
+ dataIndex: 'contentTemplate',
+ key: 'contentTemplate',
+ valueType: 'text',
+ ellipsis: true,
+ render: (_, record) => {
+ return {record.contentTemplate};
+ },
+ },
+ {
+ title: intl.formatMessage({ id: intlPrefix + '.column.description' }),
+ dataIndex: 'description',
+ key: 'description',
+ valueType: 'text',
+ ellipsis: true,
+ search: false,
+ },
+ {
+ title: intl.formatMessage({ id: intlPrefix + '.column.role' }),
+ dataIndex: 'roleIds',
+ key: 'roleIds',
+ valueType: 'select',
+ request: async (params) => {
+ const data = await business.role.listRole({
+ roleListQry: {
+ ...params,
+ },
+ });
+
+ return (
+ data?.data?.map((item) => ({
+ label: item.platformVO?.platformName + '-' + item.name,
+ value: item.roleId,
+ })) ?? []
+ );
+ },
+ },
+ ];
+
+ const detailColumns: ProDescriptionsItemProps<
+ BusinessAPI.MessageTemplateVO,
+ BizValueType
+ >[] = columns as ProDescriptionsItemProps<
+ BusinessAPI.MessageTemplateVO,
+ BizValueType
+ >[];
+
+ return (
+
+ rowKey={'messageTemplateId'}
+ permission={'operation-notify-message-template'}
+ func={business.messageTemplate}
+ method={'messageTemplate'}
+ methodUpper={'MessageTemplate'}
+ intlPrefix={intlPrefix}
+ modeType={mode}
+ onValueChange={onValueChange}
+ container={{ ghost }}
+ remark={{
+ mode: 'editor',
+ }}
+ status={true}
+ page={{
+ fieldProps: {
+ bordered: true,
+ ghost,
+ //@ts-ignore
+ search,
+ },
+ columns,
+ options: () => [],
+ }}
+ create={{
+ formType: 'drawer',
+ formContext,
+ initValues: {
+ status: true,
+ },
+ }}
+ update={{
+ formType: 'drawer',
+ formContext,
+ }}
+ destroy={false}
+ detail={{
+ formType: 'drawer',
+ columns: detailColumns,
+ trigger,
+ }}
+ />
+ );
+}
diff --git a/packages/app-operation/src/components/NotifyMessage/index.ts b/packages/app-operation/src/components/NotifyMessage/index.ts
new file mode 100644
index 0000000..6c987da
--- /dev/null
+++ b/packages/app-operation/src/components/NotifyMessage/index.ts
@@ -0,0 +1,2 @@
+export { default as NotificationMessage } from './NotificationMessage';
+export { default as NotifyMessageTemplateList } from './NotifyMessageTemplateList';
diff --git a/packages/app-operation/src/components/PaymentTask/PaymentTaskList.tsx b/packages/app-operation/src/components/PaymentTask/PaymentTaskList.tsx
index fd676b7..5ab1458 100644
--- a/packages/app-operation/src/components/PaymentTask/PaymentTaskList.tsx
+++ b/packages/app-operation/src/components/PaymentTask/PaymentTaskList.tsx
@@ -7,8 +7,6 @@ import {
PaymentRecordList,
PaymentTaskCreate,
PaymentTaskPay,
- SupplierFarmerList,
- SupplierInvoiceList,
} from '@/components';
import { business } from '@/services';
import { calculateOrderSupplierStatistics } from '@/utils/calculateOrderSupplierStatistics';
@@ -20,7 +18,7 @@ import {
StatisticCard,
} from '@ant-design/pro-components';
import { ProDescriptionsItemProps } from '@ant-design/pro-descriptions';
-import { Image, Space } from 'antd';
+import { Image } from 'antd';
import React, { useEffect, useRef, useState } from 'react';
interface IPaymentTaskListProps {
@@ -254,59 +252,6 @@ export default function PaymentTaskList(props: IPaymentTaskListProps) {
{
- const supplierInvoiceVO =
- orderSupplierVO.supplierInvoiceVO;
- return (
- supplierInvoiceVO && (
- (
- {supplierInvoiceVO.supplierName}
- )}
- />
- )
- );
- },
- },
- {
- title: '发票编码',
- dataIndex: 'supplierInvoiceVO',
- key: 'invoiceSn',
- render: (
- _,
- orderSupplierVO: BusinessAPI.OrderSupplierVO,
- ) => {
- const supplierInvoiceVO =
- orderSupplierVO.supplierInvoiceVO;
- return (
- supplierInvoiceVO && (
- (
-
- {supplierInvoiceVO.invoiceSn}
-
- )}
- />
- )
- );
- },
- },
- ]}
pagination={false}
size="small"
/>
@@ -331,59 +276,6 @@ export default function PaymentTaskList(props: IPaymentTaskListProps) {
{
- const supplierInvoiceVO =
- orderSupplierVO.supplierInvoiceVO;
- return (
- supplierInvoiceVO && (
- (
- {supplierInvoiceVO.supplierName}
- )}
- />
- )
- );
- },
- },
- {
- title: '发票编码',
- dataIndex: 'supplierInvoiceVO',
- key: 'invoiceSn',
- render: (
- _,
- orderSupplierVO: BusinessAPI.OrderSupplierVO,
- ) => {
- const supplierInvoiceVO =
- orderSupplierVO.supplierInvoiceVO;
- return (
- supplierInvoiceVO && (
- (
-
- {supplierInvoiceVO.invoiceSn}
-
- )}
- />
- )
- );
- },
- },
- ]}
pagination={false}
size="small"
/>
diff --git a/packages/app-operation/src/components/PaymentTask/PaymentTaskPay.tsx b/packages/app-operation/src/components/PaymentTask/PaymentTaskPay.tsx
index dbafc5b..7107ab8 100644
--- a/packages/app-operation/src/components/PaymentTask/PaymentTaskPay.tsx
+++ b/packages/app-operation/src/components/PaymentTask/PaymentTaskPay.tsx
@@ -5,8 +5,6 @@ import {
InsertPosition,
OrderSupplierSelectList,
ProFormUploadMaterial,
- SupplierFarmerList,
- SupplierInvoiceList,
SupplierSelect,
} from '@/components';
import { business } from '@/services';
@@ -23,9 +21,8 @@ import {
RouteContext,
RouteContextType,
} from '@ant-design/pro-components';
-import { Col, message, Row, Space, Table } from 'antd';
+import { Col, message, Row, Table } from 'antd';
import dayjs from 'dayjs';
-import React from 'react';
export interface IPaymentTaskPayProps {
insertPosition?: InsertPosition;
@@ -224,58 +221,6 @@ export default function PaymentTaskPay(props: IPaymentTaskPayProps) {
{
- const supplierInvoiceVO =
- orderSupplierVO.supplierInvoiceVO;
- return (
- supplierInvoiceVO && (
- (
- {supplierInvoiceVO.supplierName}
- )}
- />
- )
- );
- },
- },
- {
- title: '发票编码',
- dataIndex: 'supplierInvoiceVO',
- render: (
- _,
- orderSupplierVO: BusinessAPI.OrderSupplierVO,
- ) => {
- const supplierInvoiceVO =
- orderSupplierVO.supplierInvoiceVO;
- return (
- supplierInvoiceVO && (
- (
-
- {supplierInvoiceVO.invoiceSn}
-
- )}
- />
- )
- );
- },
- },
- ]}
pagination={false}
size="small"
summary={(pageData) => {
diff --git a/packages/app-operation/src/components/index.ts b/packages/app-operation/src/components/index.ts
index 5f4aed5..648f284 100644
--- a/packages/app-operation/src/components/index.ts
+++ b/packages/app-operation/src/components/index.ts
@@ -21,6 +21,7 @@ export { default as LeftMenu } from './LeftMenu';
export * from './Material';
export * from './Menu';
export * from './Modal';
+export * from './NotifyMessage';
export { SelectModal, TMapModal } from './Modal';
export * from './Order';
export * from './PaymentRecord';
diff --git a/packages/app-operation/src/global.less b/packages/app-operation/src/global.less
index e28d9c3..9041fa5 100644
--- a/packages/app-operation/src/global.less
+++ b/packages/app-operation/src/global.less
@@ -9,6 +9,16 @@ body {
-ms-overflow-style: none; /* IE and Edge */
}
+/* 隐藏整个页面的滚动条 */
+html::-webkit-scrollbar {
+ display: none;
+}
+
+/* 或针对所有元素 */
+*::-webkit-scrollbar {
+ display: none;
+}
+
html::-webkit-scrollbar,
body::-webkit-scrollbar {
display: none; /* Chrome, Safari, Edge */
@@ -81,3 +91,26 @@ body::-webkit-scrollbar {
display: none;
}
}
+
+pre {
+ /* 基础样式 */
+ background-color: #f8f9fa;
+ border: 1px solid #e9ecef;
+ border-radius: 6px;
+ padding: 1rem;
+ margin: 0 !important;
+
+ /* 文本样式 */
+ font-family: Consolas, Monaco, 'Courier New', monospace;
+ font-size: 14px;
+ line-height: 1.5;
+ color: #333;
+
+ /* 滚动和溢出处理 */
+ overflow-x: auto;
+ white-space: pre-wrap;
+ word-wrap: break-word;
+
+ /* 可选阴影效果 */
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 5%);
+}
diff --git a/packages/app-operation/src/locales/zh-CN.ts b/packages/app-operation/src/locales/zh-CN.ts
index d3a8a5d..777593d 100644
--- a/packages/app-operation/src/locales/zh-CN.ts
+++ b/packages/app-operation/src/locales/zh-CN.ts
@@ -2753,6 +2753,15 @@ export default {
paidCredentials: {
label: '付款凭证',
},
+ paidAt: {
+ label: '付款时间',
+ placeholder: '请选择付款时间',
+ },
+ paidAmount: {
+ label: '付款金额(元)',
+ placeholder: '请输入付款金额',
+ required: '付款金额为必填项',
+ },
},
modal: {
create: {
@@ -3319,4 +3328,111 @@ export default {
},
},
},
+ notifyMessageTemplate: {
+ column: {
+ templateCategory: '模板分类',
+ templateScene: '触发事件',
+ titleTemplate: '模板标题',
+ description: '模板描述',
+ contentTemplate: '内容模板',
+ role: '关联角色',
+ status: '状态',
+ 'status.enum.enabled': '正常',
+ 'status.enum.disabled': '禁用',
+ 'status.placeholder': '请选择状态',
+ remark: '模板备注',
+ createdAt: '创建时间',
+ option: '操作',
+ },
+ templateCategory: {
+ purchaseOrderMessageTemplate: '采购单消息模板',
+ },
+ templateScene: {
+ waitAudit: '待审核',
+ waitApprove: '待审批',
+ approvePass: '审批通过',
+ auditReject: '审核驳回',
+ approveReject: '审批驳回',
+ },
+ form: {
+ templateCategory: {
+ label: '模板分类',
+ placeholder: '请选择模板分类',
+ required: '请选择模板分类',
+ },
+ templateScene: {
+ label: '触发事件',
+ placeholder: '请选择触发事件',
+ required: '请选择触发事件',
+ },
+ titleTemplate: {
+ label: '模板标题',
+ placeholder: '请输入模板标题',
+ required: '请输入模板标题',
+ },
+ contentTemplate: {
+ label: '内容模板',
+ placeholder: '请输入内容模板',
+ required: '请输入内容模板',
+ tooltip: '支持变量替换,如:{{车次号}}、{{提交人}}',
+ insertVariable: '选择变量插入到内容中',
+ noVariables: '请先在"模板变量"字段中定义变量',
+ },
+ description: {
+ label: '模板描述',
+ placeholder: '请输入模板描述',
+ },
+ variables: {
+ label: '模板变量',
+ placeholder: '请输入模板变量,多个变量用逗号分隔',
+ tooltip: '定义模板中可用的变量名,如:orderId, dealerId',
+ },
+ role: {
+ label: '关联角色',
+ },
+ status: {
+ label: '状态',
+ placeholder: '请选择状态',
+ required: '请选择状态',
+ },
+ remark: {
+ label: '模板备注',
+ placeholder: '请输入模板备注',
+ },
+ },
+ modal: {
+ create: {
+ title: '新增消息模板',
+ button: '新增模板',
+ success: '新增成功',
+ },
+ update: {
+ title: '编辑消息模板',
+ button: '编辑',
+ success: '编辑成功',
+ },
+ view: {
+ title: '查看详情',
+ button: '详情',
+ },
+ delete: {
+ success: '删除成功',
+ button: '删除',
+ confirm: {
+ title: '确认删除',
+ content: '您确定要删除该消息模板吗?',
+ okText: '确定',
+ cancelText: '取消',
+ },
+ },
+ },
+ },
+ notification: {
+ title: '通知消息',
+ unreadCount: '{count}条未读',
+ noMessages: '暂无消息',
+ viewMore: '查看更多消息',
+ markReadSuccess: '标记已读成功',
+ markReadFailed: '标记已读失败',
+ },
};
diff --git a/packages/app-operation/src/pages/NotifyMessageTemplate.tsx b/packages/app-operation/src/pages/NotifyMessageTemplate.tsx
new file mode 100644
index 0000000..4914d21
--- /dev/null
+++ b/packages/app-operation/src/pages/NotifyMessageTemplate.tsx
@@ -0,0 +1,5 @@
+import { NotifyMessageTemplateList } from '@/components';
+
+export default function Page() {
+ return ;
+}
diff --git a/packages/app-operation/src/services/business/index.ts b/packages/app-operation/src/services/business/index.ts
index baa1b68..0a111b0 100644
--- a/packages/app-operation/src/services/business/index.ts
+++ b/packages/app-operation/src/services/business/index.ts
@@ -25,6 +25,8 @@ import * as giftBox from './giftBox';
import * as material from './material';
import * as materialCategory from './materialCategory';
import * as menu from './menu';
+import * as messageReceiver from './messageReceiver';
+import * as messageTemplate from './messageTemplate';
import * as order from './order';
import * as orderCost from './orderCost';
import * as orderRebate from './orderRebate';
@@ -59,6 +61,8 @@ export default {
order,
orderSupplier,
orderShip,
+ messageTemplate,
+ messageReceiver,
menu,
material,
materialCategory,
diff --git a/packages/app-operation/src/services/business/messageReceiver.ts b/packages/app-operation/src/services/business/messageReceiver.ts
new file mode 100644
index 0000000..c60c6a8
--- /dev/null
+++ b/packages/app-operation/src/services/business/messageReceiver.ts
@@ -0,0 +1,167 @@
+// @ts-ignore
+/* eslint-disable */
+import request from '../request';
+
+/** 创建消息接收 POST /operation/createMessageReceiver */
+export async function createMessageReceiver(
+ body: BusinessAPI.MessageReceiverCreateCmd,
+ options?: { [key: string]: any },
+) {
+ return request(
+ '/operation/createMessageReceiver',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ },
+ );
+}
+
+/** 消息接收删除 DELETE /operation/destroyMessageReceiver */
+export async function destroyMessageReceiver(
+ body: BusinessAPI.MessageReceiverDestroyCmd,
+ options?: { [key: string]: any },
+) {
+ return request('/operation/destroyMessageReceiver', {
+ method: 'DELETE',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 获取未读消息数量 GET /operation/getUnreadCount */
+export async function getUnreadCount(
+ // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
+ params: BusinessAPI.getUnreadCountParams,
+ options?: { [key: string]: any },
+) {
+ return request(
+ '/operation/getUnreadCount',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ messageReceiverUnreadCountQry: undefined,
+ ...params['messageReceiverUnreadCountQry'],
+ },
+ ...(options || {}),
+ },
+ );
+}
+
+/** 消息接收列表 GET /operation/listMessageReceiver */
+export async function listMessageReceiver(
+ // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
+ params: BusinessAPI.listMessageReceiverParams,
+ options?: { [key: string]: any },
+) {
+ return request(
+ '/operation/listMessageReceiver',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ messageReceiverListQry: undefined,
+ ...params['messageReceiverListQry'],
+ },
+ ...(options || {}),
+ },
+ );
+}
+
+/** 标记消息已读 POST /operation/markReadMessageReceiver */
+export async function markReadMessageReceiver(
+ body: BusinessAPI.MessageReceiverMarkReadCmd,
+ options?: { [key: string]: any },
+) {
+ return request('/operation/markReadMessageReceiver', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 消息接收列表 GET /operation/pageMessageReceiver */
+export async function pageMessageReceiver(
+ // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
+ params: BusinessAPI.pageMessageReceiverParams,
+ options?: { [key: string]: any },
+) {
+ return request(
+ '/operation/pageMessageReceiver',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ messageReceiverPageQry: undefined,
+ ...params['messageReceiverPageQry'],
+ },
+ ...(options || {}),
+ },
+ );
+}
+
+/** 消息接收详情 GET /operation/showMessageReceiver */
+export async function showMessageReceiver(
+ // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
+ params: BusinessAPI.showMessageReceiverParams,
+ options?: { [key: string]: any },
+) {
+ return request(
+ '/operation/showMessageReceiver',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ messageReceiverShowQry: undefined,
+ ...params['messageReceiverShowQry'],
+ },
+ ...(options || {}),
+ },
+ );
+}
+
+/** 消息接收更新 PUT /operation/updateMessageReceiver */
+export async function updateMessageReceiver(
+ body: BusinessAPI.MessageReceiverUpdateCmd,
+ options?: { [key: string]: any },
+) {
+ return request(
+ '/operation/updateMessageReceiver',
+ {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ },
+ );
+}
+
+/** 消息接收更新 PATCH /operation/updateMessageReceiver */
+export async function updateMessageReceiver1(
+ body: BusinessAPI.MessageReceiverUpdateCmd,
+ options?: { [key: string]: any },
+) {
+ return request(
+ '/operation/updateMessageReceiver',
+ {
+ method: 'PATCH',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ },
+ );
+}
diff --git a/packages/app-operation/src/services/business/messageTemplate.ts b/packages/app-operation/src/services/business/messageTemplate.ts
new file mode 100644
index 0000000..e78b2f5
--- /dev/null
+++ b/packages/app-operation/src/services/business/messageTemplate.ts
@@ -0,0 +1,132 @@
+// @ts-ignore
+/* eslint-disable */
+import request from '../request';
+
+/** 创建消息模板 POST /operation/createMessageTemplate */
+export async function createMessageTemplate(
+ body: BusinessAPI.MessageTemplateCreateCmd,
+ options?: { [key: string]: any },
+) {
+ return request(
+ '/operation/createMessageTemplate',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ },
+ );
+}
+
+/** 消息模板删除 DELETE /operation/destroyMessageTemplate */
+export async function destroyMessageTemplate(
+ body: BusinessAPI.MessageTemplateDestroyCmd,
+ options?: { [key: string]: any },
+) {
+ return request('/operation/destroyMessageTemplate', {
+ method: 'DELETE',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 消息模板列表 GET /operation/listMessageTemplate */
+export async function listMessageTemplate(
+ // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
+ params: BusinessAPI.listMessageTemplateParams,
+ options?: { [key: string]: any },
+) {
+ return request(
+ '/operation/listMessageTemplate',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ messageTemplateListQry: undefined,
+ ...params['messageTemplateListQry'],
+ },
+ ...(options || {}),
+ },
+ );
+}
+
+/** 消息模板列表 GET /operation/pageMessageTemplate */
+export async function pageMessageTemplate(
+ // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
+ params: BusinessAPI.pageMessageTemplateParams,
+ options?: { [key: string]: any },
+) {
+ return request(
+ '/operation/pageMessageTemplate',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ messageTemplatePageQry: undefined,
+ ...params['messageTemplatePageQry'],
+ },
+ ...(options || {}),
+ },
+ );
+}
+
+/** 消息模板详情 GET /operation/showMessageTemplate */
+export async function showMessageTemplate(
+ // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
+ params: BusinessAPI.showMessageTemplateParams,
+ options?: { [key: string]: any },
+) {
+ return request(
+ '/operation/showMessageTemplate',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ messageTemplateShowQry: undefined,
+ ...params['messageTemplateShowQry'],
+ },
+ ...(options || {}),
+ },
+ );
+}
+
+/** 消息模板更新 PUT /operation/updateMessageTemplate */
+export async function updateMessageTemplate(
+ body: BusinessAPI.MessageTemplateUpdateCmd,
+ options?: { [key: string]: any },
+) {
+ return request(
+ '/operation/updateMessageTemplate',
+ {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ },
+ );
+}
+
+/** 消息模板更新 PATCH /operation/updateMessageTemplate */
+export async function updateMessageTemplate1(
+ body: BusinessAPI.MessageTemplateUpdateCmd,
+ options?: { [key: string]: any },
+) {
+ return request(
+ '/operation/updateMessageTemplate',
+ {
+ method: 'PATCH',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ },
+ );
+}
diff --git a/packages/app-operation/src/services/business/typings.d.ts b/packages/app-operation/src/services/business/typings.d.ts
index ee1af91..6b877e1 100644
--- a/packages/app-operation/src/services/business/typings.d.ts
+++ b/packages/app-operation/src/services/business/typings.d.ts
@@ -2292,6 +2292,10 @@ declare namespace BusinessAPI {
lastVehicleNoQry: LastVehicleNoQry;
};
+ type getUnreadCountParams = {
+ messageReceiverUnreadCountQry: MessageReceiverUnreadCountQry;
+ };
+
type GiftBoxCreateCmd = {
/** 礼盒ID */
boxId: string;
@@ -2469,6 +2473,14 @@ declare namespace BusinessAPI {
menuListQry: MenuListQry;
};
+ type listMessageReceiverParams = {
+ messageReceiverListQry: MessageReceiverListQry;
+ };
+
+ type listMessageTemplateParams = {
+ messageTemplateListQry: MessageTemplateListQry;
+ };
+
type listOrderParams = {
orderListQry: OrderListQry;
};
@@ -2762,6 +2774,230 @@ declare namespace BusinessAPI {
createdAt?: string;
};
+ type MessageReceiverCreateCmd = {
+ /** 消息接收ID */
+ messageReceiverId: string;
+ /** 消息ID */
+ messageId: string;
+ /** 接收用户ID */
+ userId: string;
+ /** 是否已读 */
+ isRead?: boolean;
+ /** 已读时间 */
+ readAt: string;
+ /** 创建时间 */
+ createdAt?: string;
+ };
+
+ type MessageReceiverDestroyCmd = {
+ /** 消息接收ID */
+ messageReceiverId: string;
+ };
+
+ type MessageReceiverListQry = {
+ /** 状态:1_启用;0_禁用; */
+ status?: boolean;
+ /** 消息接收ID */
+ messageReceiverId?: string;
+ };
+
+ type MessageReceiverMarkReadCmd = {
+ /** 消息接收ID */
+ messageReceiverId: string;
+ };
+
+ type MessageReceiverPageQry = {
+ pageSize?: number;
+ pageIndex?: number;
+ orderBy?: string;
+ orderDirection?: string;
+ groupBy?: string;
+ needTotalCount?: boolean;
+ /** 自定义字段key */
+ customFieldKey?: string;
+ /** 自定义字段value */
+ customFieldValue?: string;
+ /** 备注 */
+ remark?: string;
+ /** 状态:1_启用;0_禁用; */
+ status?: boolean;
+ /** 消息接收ID */
+ messageReceiverId?: string;
+ offset?: number;
+ };
+
+ type MessageReceiverShowQry = {
+ /** 状态:1_启用;0_禁用; */
+ status?: boolean;
+ /** 消息接收ID */
+ messageReceiverId?: string;
+ };
+
+ type MessageReceiverUnreadCountQry = {
+ /** 管理员ID */
+ adminId: string;
+ };
+
+ type MessageReceiverUpdateCmd = {
+ /** 消息接收ID */
+ messageReceiverId: string;
+ /** 消息ID */
+ messageId: string;
+ /** 接收用户ID */
+ userId: string;
+ /** 是否已读 */
+ isRead?: boolean;
+ /** 已读时间 */
+ readAt: string;
+ /** 创建时间 */
+ createdAt?: string;
+ };
+
+ type MessageReceiverVO = {
+ /** 消息接收ID */
+ messageReceiverId: string;
+ /** 消息ID */
+ messageId: string;
+ /** 接收用户ID */
+ userId: string;
+ /** 是否已读 */
+ isRead?: boolean;
+ /** 已读时间 */
+ readAt: string;
+ /** 创建时间 */
+ createdAt?: string;
+ messageVO?: MessageVO;
+ };
+
+ type MessageTemplateCreateCmd = {
+ /** 模板ID */
+ messageTemplateId: string;
+ /** 模板分类:1_采购单消息模板; */
+ templateCategory: 'PURCHASE_ORDER_MESSAGE_TEMPLATE';
+ /** 触发场景:1_待审核;2_待审批;3_审批通过;4_审核驳回;5_审批驳回 */
+ templateScene:
+ | 'WAIT_AUDIT'
+ | 'WAIT_APPROVE'
+ | 'APPROVE_PASS'
+ | 'AUDIT_REJECT'
+ | 'APPROVE_REJECT';
+ /** 模板标题 */
+ titleTemplate?: string;
+ /** 内容模板 */
+ contentTemplate?: string;
+ /** 模板描述 */
+ description?: string;
+ /** 模板变量定义 */
+ variables?: string;
+ /** 通知角色 */
+ roleIds?: string[];
+ /** 备注 */
+ remark?: string;
+ /** 状态:1_启用;0_禁用 */
+ status: boolean;
+ /** 创建时间 */
+ createdAt?: string;
+ };
+
+ type MessageTemplateDestroyCmd = {
+ /** 消息模板ID */
+ messageTemplateId: string;
+ };
+
+ type MessageTemplateListQry = {
+ /** 状态:1_启用;0_禁用; */
+ status?: boolean;
+ /** 消息模板ID */
+ messageTemplateId?: string;
+ };
+
+ type MessageTemplatePageQry = {
+ pageSize?: number;
+ pageIndex?: number;
+ orderBy?: string;
+ orderDirection?: string;
+ groupBy?: string;
+ needTotalCount?: boolean;
+ /** 自定义字段key */
+ customFieldKey?: string;
+ /** 自定义字段value */
+ customFieldValue?: string;
+ /** 备注 */
+ remark?: string;
+ /** 状态:1_启用;0_禁用; */
+ status?: boolean;
+ /** 消息模板ID */
+ messageTemplateId?: string;
+ offset?: number;
+ };
+
+ type MessageTemplateShowQry = {
+ /** 状态:1_启用;0_禁用; */
+ status?: boolean;
+ /** 消息模板ID */
+ messageTemplateId?: string;
+ };
+
+ type MessageTemplateUpdateCmd = {
+ /** 消息模板ID */
+ messageTemplateId: string;
+ /** 模板分类:1_采购单消息模板; */
+ templateCategory: 'PURCHASE_ORDER_MESSAGE_TEMPLATE';
+ /** 触发场景:1_待审核;2_待审批;3_审批通过;4_审核驳回;5_审批驳回 */
+ templateScene:
+ | 'WAIT_AUDIT'
+ | 'WAIT_APPROVE'
+ | 'APPROVE_PASS'
+ | 'AUDIT_REJECT'
+ | 'APPROVE_REJECT';
+ /** 模板标题 */
+ titleTemplate?: string;
+ /** 内容模板 */
+ contentTemplate?: string;
+ /** 模板描述 */
+ description?: string;
+ /** 模板变量定义 */
+ variables?: string;
+ /** 通知角色 */
+ roleIds?: string[];
+ /** 备注 */
+ remark?: string;
+ /** 状态:1_启用;0_禁用 */
+ status: boolean;
+ /** 创建时间 */
+ createdAt?: string;
+ };
+
+ type MessageTemplateVO = {
+ /** 模板ID */
+ messageTemplateId: string;
+ /** 模板分类:1_采购单消息模板; */
+ templateCategory: 'PURCHASE_ORDER_MESSAGE_TEMPLATE';
+ /** 触发场景:1_待审核;2_待审批;3_审批通过;4_审核驳回;5_审批驳回 */
+ templateScene:
+ | 'WAIT_AUDIT'
+ | 'WAIT_APPROVE'
+ | 'APPROVE_PASS'
+ | 'AUDIT_REJECT'
+ | 'APPROVE_REJECT';
+ /** 模板标题 */
+ titleTemplate?: string;
+ /** 内容模板 */
+ contentTemplate?: string;
+ /** 模板描述 */
+ description?: string;
+ /** 模板变量定义 */
+ variables?: string;
+ /** 通知角色 */
+ roleIds?: string[];
+ /** 备注 */
+ remark?: string;
+ /** 状态:1_启用;0_禁用 */
+ status: boolean;
+ /** 创建时间 */
+ createdAt?: string;
+ };
+
type MultiResponseAgreementVO = {
success?: boolean;
errCode?: string;
@@ -2933,6 +3169,24 @@ declare namespace BusinessAPI {
notEmpty?: boolean;
};
+ type MultiResponseMessageReceiverVO = {
+ success?: boolean;
+ errCode?: string;
+ errMessage?: string;
+ data?: MessageReceiverVO[];
+ empty?: boolean;
+ notEmpty?: boolean;
+ };
+
+ type MultiResponseMessageTemplateVO = {
+ success?: boolean;
+ errCode?: string;
+ errMessage?: string;
+ data?: MessageTemplateVO[];
+ empty?: boolean;
+ notEmpty?: boolean;
+ };
+
type MultiResponseOrderShipVO = {
success?: boolean;
errCode?: string;
@@ -4137,12 +4391,14 @@ declare namespace BusinessAPI {
status?: boolean;
/** 订单供应商ID */
orderSupplierId?: string;
+ /** 名称 */
+ name?: string;
/** 订单ID */
orderId?: string;
/** 供应商id */
supplierId?: string;
/** 发货日期 */
- deliveryTime?: string[];
+ shippingDate?: string[];
/** 瓜农发票上传 */
invoiceUpload?: boolean;
/** 订单状态 */
@@ -4155,6 +4411,8 @@ declare namespace BusinessAPI {
type?: 'FARMER' | 'STALL' | 'OTHER_STALL';
/** 发票ID */
invoiceId?: string;
+ /** 发票日期 */
+ invoiceDate?: string[];
offset?: number;
};
@@ -4467,6 +4725,14 @@ declare namespace BusinessAPI {
materialPageQry: MaterialPageQry;
};
+ type pageMessageReceiverParams = {
+ messageReceiverPageQry: MessageReceiverPageQry;
+ };
+
+ type pageMessageTemplateParams = {
+ messageTemplatePageQry: MessageTemplatePageQry;
+ };
+
type pageOrderCostParams = {
orderCostPageQry: OrderCostPageQry;
};
@@ -4766,6 +5032,32 @@ declare namespace BusinessAPI {
totalPages?: number;
};
+ type PageResponseMessageReceiverVO = {
+ success?: boolean;
+ errCode?: string;
+ errMessage?: string;
+ totalCount?: number;
+ pageSize?: number;
+ pageIndex?: number;
+ data?: MessageReceiverVO[];
+ empty?: boolean;
+ notEmpty?: boolean;
+ totalPages?: number;
+ };
+
+ type PageResponseMessageTemplateVO = {
+ success?: boolean;
+ errCode?: string;
+ errMessage?: string;
+ totalCount?: number;
+ pageSize?: number;
+ pageIndex?: number;
+ data?: MessageTemplateVO[];
+ empty?: boolean;
+ notEmpty?: boolean;
+ totalPages?: number;
+ };
+
type PageResponseOrderCostVO = {
success?: boolean;
errCode?: string;
@@ -5825,6 +6117,18 @@ declare namespace BusinessAPI {
status?: boolean;
/** 对账付款ID */
reconciliationPaymentId?: string;
+ /** 经销商ID */
+ dealerId?: string;
+ /** 公司ID */
+ companyId?: string;
+ /** 账户类型:1_银行卡;2_支付宝;3_微信 */
+ accountType?: string;
+ /** 账户类别:1_对公账户;2_私人账户 */
+ accountCategory?: string;
+ /** 开户公司名称/支付宝昵称/微信号 */
+ accountName?: string;
+ /** 银行账号/支付宝账号/微信账号 */
+ accountNumber?: string;
offset?: number;
};
@@ -5903,6 +6207,10 @@ declare namespace BusinessAPI {
remark?: string;
/** 创建时间 */
createdAt?: string;
+ /** 经销商 */
+ dealerVO?: DealerVO;
+ /** 公司 */
+ companyVO?: CompanyVO;
};
type ReconciliationShowQry = {
@@ -6280,6 +6588,14 @@ declare namespace BusinessAPI {
menuShowQry: MenuShowQry;
};
+ type showMessageReceiverParams = {
+ messageReceiverShowQry: MessageReceiverShowQry;
+ };
+
+ type showMessageTemplateParams = {
+ messageTemplateShowQry: MessageTemplateShowQry;
+ };
+
type showOrderCostParams = {
orderCostShowQry: OrderCostShowQry;
};
@@ -6484,6 +6800,13 @@ declare namespace BusinessAPI {
data?: GiftBoxVO;
};
+ type SingleResponseInteger = {
+ success?: boolean;
+ errCode?: string;
+ errMessage?: string;
+ data?: number;
+ };
+
type SingleResponseLong = {
success?: boolean;
errCode?: string;
@@ -6505,6 +6828,20 @@ declare namespace BusinessAPI {
data?: MenuVO;
};
+ type SingleResponseMessageReceiverVO = {
+ success?: boolean;
+ errCode?: string;
+ errMessage?: string;
+ data?: MessageReceiverVO;
+ };
+
+ type SingleResponseMessageTemplateVO = {
+ success?: boolean;
+ errCode?: string;
+ errMessage?: string;
+ data?: MessageTemplateVO;
+ };
+
type SingleResponseOrderCostVO = {
success?: boolean;
errCode?: string;
@@ -6769,6 +7106,12 @@ declare namespace BusinessAPI {
supplierId?: string;
/** 订单状态 */
poStates?: ('DRAFT' | 'AUDITING' | 'COMPLETED' | 'CLOSED')[];
+ /** 订单供应商ID */
+ orderSupplierId?: number;
+ /** 订单ID */
+ orderId?: number;
+ /** 登记时间 */
+ registrationTime?: string[];
offset?: number;
};
@@ -7025,6 +7368,8 @@ declare namespace BusinessAPI {
status?: boolean;
/** 用户ID */
userIdList?: string[];
+ /** 角色ID */
+ roleIdList?: string[];
/** 用户名 */
name?: string;
};
diff --git a/swagger/business.json b/swagger/business.json
index 925b848..6d47a61 100644
--- a/swagger/business.json
+++ b/swagger/business.json
@@ -35,6 +35,10 @@
"name": "OrderCost",
"description": "订单成本项管理"
},
+ {
+ "name": "MessageReceiver",
+ "description": "消息接收管理"
+ },
{
"name": "Employee",
"description": "员工信息管理"
@@ -135,6 +139,10 @@
"name": "Material",
"description": "素材管理"
},
+ {
+ "name": "MessageTemplate",
+ "description": "消息模板管理"
+ },
{
"name": "GiftBox",
"description": "礼盒管理"
@@ -1019,6 +1027,126 @@
}
}
},
+ "/operation/updateMessageTemplate": {
+ "put": {
+ "tags": [
+ "MessageTemplate"
+ ],
+ "summary": "消息模板更新",
+ "operationId": "updateMessageTemplate",
+ "requestBody": {
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/MessageTemplateUpdateCmd"
+ }
+ }
+ },
+ "required": true
+ },
+ "responses": {
+ "200": {
+ "description": "OK",
+ "content": {
+ "*/*": {
+ "schema": {
+ "$ref": "#/components/schemas/SingleResponseMessageTemplateVO"
+ }
+ }
+ }
+ }
+ }
+ },
+ "patch": {
+ "tags": [
+ "MessageTemplate"
+ ],
+ "summary": "消息模板更新",
+ "operationId": "updateMessageTemplate_1",
+ "requestBody": {
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/MessageTemplateUpdateCmd"
+ }
+ }
+ },
+ "required": true
+ },
+ "responses": {
+ "200": {
+ "description": "OK",
+ "content": {
+ "*/*": {
+ "schema": {
+ "$ref": "#/components/schemas/SingleResponseMessageTemplateVO"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "/operation/updateMessageReceiver": {
+ "put": {
+ "tags": [
+ "MessageReceiver"
+ ],
+ "summary": "消息接收更新",
+ "operationId": "updateMessageReceiver",
+ "requestBody": {
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/MessageReceiverUpdateCmd"
+ }
+ }
+ },
+ "required": true
+ },
+ "responses": {
+ "200": {
+ "description": "OK",
+ "content": {
+ "*/*": {
+ "schema": {
+ "$ref": "#/components/schemas/SingleResponseMessageReceiverVO"
+ }
+ }
+ }
+ }
+ }
+ },
+ "patch": {
+ "tags": [
+ "MessageReceiver"
+ ],
+ "summary": "消息接收更新",
+ "operationId": "updateMessageReceiver_1",
+ "requestBody": {
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/MessageReceiverUpdateCmd"
+ }
+ }
+ },
+ "required": true
+ },
+ "responses": {
+ "200": {
+ "description": "OK",
+ "content": {
+ "*/*": {
+ "schema": {
+ "$ref": "#/components/schemas/SingleResponseMessageReceiverVO"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
"/operation/updateMenu": {
"put": {
"tags": [
@@ -3282,6 +3410,37 @@
}
}
},
+ "/operation/markReadMessageReceiver": {
+ "post": {
+ "tags": [
+ "MessageReceiver"
+ ],
+ "summary": "标记消息已读",
+ "operationId": "markReadMessageReceiver",
+ "requestBody": {
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/MessageReceiverMarkReadCmd"
+ }
+ }
+ },
+ "required": true
+ },
+ "responses": {
+ "200": {
+ "description": "OK",
+ "content": {
+ "*/*": {
+ "schema": {
+ "$ref": "#/components/schemas/Response"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
"/operation/finalApproveOrder": {
"post": {
"tags": [
@@ -3996,6 +4155,68 @@
}
}
},
+ "/operation/createMessageTemplate": {
+ "post": {
+ "tags": [
+ "MessageTemplate"
+ ],
+ "summary": "创建消息模板",
+ "operationId": "createMessageTemplate",
+ "requestBody": {
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/MessageTemplateCreateCmd"
+ }
+ }
+ },
+ "required": true
+ },
+ "responses": {
+ "200": {
+ "description": "OK",
+ "content": {
+ "*/*": {
+ "schema": {
+ "$ref": "#/components/schemas/SingleResponseMessageTemplateVO"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "/operation/createMessageReceiver": {
+ "post": {
+ "tags": [
+ "MessageReceiver"
+ ],
+ "summary": "创建消息接收",
+ "operationId": "createMessageReceiver",
+ "requestBody": {
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/MessageReceiverCreateCmd"
+ }
+ }
+ },
+ "required": true
+ },
+ "responses": {
+ "200": {
+ "description": "OK",
+ "content": {
+ "*/*": {
+ "schema": {
+ "$ref": "#/components/schemas/SingleResponseMessageReceiverVO"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
"/operation/createMenu": {
"post": {
"tags": [
@@ -5329,6 +5550,68 @@
}
}
},
+ "/operation/showMessageTemplate": {
+ "get": {
+ "tags": [
+ "MessageTemplate"
+ ],
+ "summary": "消息模板详情",
+ "operationId": "showMessageTemplate",
+ "parameters": [
+ {
+ "name": "messageTemplateShowQry",
+ "in": "query",
+ "required": true,
+ "schema": {
+ "$ref": "#/components/schemas/MessageTemplateShowQry"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "content": {
+ "*/*": {
+ "schema": {
+ "$ref": "#/components/schemas/SingleResponseMessageTemplateVO"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "/operation/showMessageReceiver": {
+ "get": {
+ "tags": [
+ "MessageReceiver"
+ ],
+ "summary": "消息接收详情",
+ "operationId": "showMessageReceiver",
+ "parameters": [
+ {
+ "name": "messageReceiverShowQry",
+ "in": "query",
+ "required": true,
+ "schema": {
+ "$ref": "#/components/schemas/MessageReceiverShowQry"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "content": {
+ "*/*": {
+ "schema": {
+ "$ref": "#/components/schemas/SingleResponseMessageReceiverVO"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
"/operation/showMenu": {
"get": {
"tags": [
@@ -6538,6 +6821,68 @@
}
}
},
+ "/operation/pageMessageTemplate": {
+ "get": {
+ "tags": [
+ "MessageTemplate"
+ ],
+ "summary": "消息模板列表",
+ "operationId": "pageMessageTemplate",
+ "parameters": [
+ {
+ "name": "messageTemplatePageQry",
+ "in": "query",
+ "required": true,
+ "schema": {
+ "$ref": "#/components/schemas/MessageTemplatePageQry"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "content": {
+ "*/*": {
+ "schema": {
+ "$ref": "#/components/schemas/PageResponseMessageTemplateVO"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "/operation/pageMessageReceiver": {
+ "get": {
+ "tags": [
+ "MessageReceiver"
+ ],
+ "summary": "消息接收列表",
+ "operationId": "pageMessageReceiver",
+ "parameters": [
+ {
+ "name": "messageReceiverPageQry",
+ "in": "query",
+ "required": true,
+ "schema": {
+ "$ref": "#/components/schemas/MessageReceiverPageQry"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "content": {
+ "*/*": {
+ "schema": {
+ "$ref": "#/components/schemas/PageResponseMessageReceiverVO"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
"/operation/pageMaterial": {
"get": {
"tags": [
@@ -7582,6 +7927,68 @@
}
}
},
+ "/operation/listMessageTemplate": {
+ "get": {
+ "tags": [
+ "MessageTemplate"
+ ],
+ "summary": "消息模板列表",
+ "operationId": "listMessageTemplate",
+ "parameters": [
+ {
+ "name": "messageTemplateListQry",
+ "in": "query",
+ "required": true,
+ "schema": {
+ "$ref": "#/components/schemas/MessageTemplateListQry"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "content": {
+ "*/*": {
+ "schema": {
+ "$ref": "#/components/schemas/MultiResponseMessageTemplateVO"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "/operation/listMessageReceiver": {
+ "get": {
+ "tags": [
+ "MessageReceiver"
+ ],
+ "summary": "消息接收列表",
+ "operationId": "listMessageReceiver",
+ "parameters": [
+ {
+ "name": "messageReceiverListQry",
+ "in": "query",
+ "required": true,
+ "schema": {
+ "$ref": "#/components/schemas/MessageReceiverListQry"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "content": {
+ "*/*": {
+ "schema": {
+ "$ref": "#/components/schemas/MultiResponseMessageReceiverVO"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
"/operation/listMenu": {
"get": {
"tags": [
@@ -8140,6 +8547,37 @@
}
}
},
+ "/operation/getUnreadCount": {
+ "get": {
+ "tags": [
+ "MessageReceiver"
+ ],
+ "summary": "获取未读消息数量",
+ "operationId": "getUnreadCount",
+ "parameters": [
+ {
+ "name": "messageReceiverUnreadCountQry",
+ "in": "query",
+ "required": true,
+ "schema": {
+ "$ref": "#/components/schemas/MessageReceiverUnreadCountQry"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "content": {
+ "*/*": {
+ "schema": {
+ "$ref": "#/components/schemas/SingleResponseInteger"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
"/operation/getLastVehicleNo": {
"get": {
"tags": [
@@ -8605,6 +9043,68 @@
}
}
},
+ "/operation/destroyMessageTemplate": {
+ "delete": {
+ "tags": [
+ "MessageTemplate"
+ ],
+ "summary": "消息模板删除",
+ "operationId": "destroyMessageTemplate",
+ "requestBody": {
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/MessageTemplateDestroyCmd"
+ }
+ }
+ },
+ "required": true
+ },
+ "responses": {
+ "200": {
+ "description": "OK",
+ "content": {
+ "*/*": {
+ "schema": {
+ "$ref": "#/components/schemas/Response"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "/operation/destroyMessageReceiver": {
+ "delete": {
+ "tags": [
+ "MessageReceiver"
+ ],
+ "summary": "消息接收删除",
+ "operationId": "destroyMessageReceiver",
+ "requestBody": {
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/MessageReceiverDestroyCmd"
+ }
+ }
+ },
+ "required": true
+ },
+ "responses": {
+ "200": {
+ "description": "OK",
+ "content": {
+ "*/*": {
+ "schema": {
+ "$ref": "#/components/schemas/Response"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
"/operation/destroyMenu": {
"delete": {
"tags": [
@@ -12450,6 +12950,14 @@
"type": "string",
"format": "date-time",
"title": "创建时间"
+ },
+ "dealerVO": {
+ "$ref": "#/components/schemas/DealerVO",
+ "title": "经销商"
+ },
+ "companyVO": {
+ "$ref": "#/components/schemas/CompanyVO",
+ "title": "公司"
}
},
"required": [
@@ -13988,6 +14496,258 @@
}
}
},
+ "MessageTemplateUpdateCmd": {
+ "type": "object",
+ "properties": {
+ "messageTemplateId": {
+ "type": "string",
+ "title": "消息模板ID"
+ },
+ "templateCategory": {
+ "type": "string",
+ "enum": [
+ "PURCHASE_ORDER_MESSAGE_TEMPLATE"
+ ],
+ "title": "模板分类:1_采购单消息模板;"
+ },
+ "templateScene": {
+ "type": "string",
+ "enum": [
+ "WAIT_AUDIT",
+ "WAIT_APPROVE",
+ "APPROVE_PASS",
+ "AUDIT_REJECT",
+ "APPROVE_REJECT"
+ ],
+ "title": "触发场景:1_待审核;2_待审批;3_审批通过;4_审核驳回;5_审批驳回"
+ },
+ "titleTemplate": {
+ "type": "string",
+ "title": "模板标题"
+ },
+ "contentTemplate": {
+ "type": "string",
+ "title": "内容模板"
+ },
+ "description": {
+ "type": "string",
+ "title": "模板描述"
+ },
+ "variables": {
+ "type": "string",
+ "title": "模板变量定义"
+ },
+ "roleIds": {
+ "type": "array",
+ "items": {
+ "type": "integer",
+ "format": "int64"
+ },
+ "title": "通知角色"
+ },
+ "remark": {
+ "type": "string",
+ "title": "备注"
+ },
+ "status": {
+ "type": "boolean",
+ "title": "状态:1_启用;0_禁用"
+ },
+ "createdAt": {
+ "type": "string",
+ "format": "date-time",
+ "title": "创建时间"
+ }
+ },
+ "required": [
+ "messageTemplateId",
+ "status",
+ "templateCategory",
+ "templateScene"
+ ],
+ "title": "消息模板更新"
+ },
+ "MessageTemplateVO": {
+ "type": "object",
+ "properties": {
+ "messageTemplateId": {
+ "type": "string",
+ "title": "模板ID"
+ },
+ "templateCategory": {
+ "type": "string",
+ "enum": [
+ "PURCHASE_ORDER_MESSAGE_TEMPLATE"
+ ],
+ "title": "模板分类:1_采购单消息模板;"
+ },
+ "templateScene": {
+ "type": "string",
+ "enum": [
+ "WAIT_AUDIT",
+ "WAIT_APPROVE",
+ "APPROVE_PASS",
+ "AUDIT_REJECT",
+ "APPROVE_REJECT"
+ ],
+ "title": "触发场景:1_待审核;2_待审批;3_审批通过;4_审核驳回;5_审批驳回"
+ },
+ "titleTemplate": {
+ "type": "string",
+ "title": "模板标题"
+ },
+ "contentTemplate": {
+ "type": "string",
+ "title": "内容模板"
+ },
+ "description": {
+ "type": "string",
+ "title": "模板描述"
+ },
+ "variables": {
+ "type": "string",
+ "title": "模板变量定义"
+ },
+ "roleIds": {
+ "type": "array",
+ "items": {
+ "type": "integer",
+ "format": "int64"
+ },
+ "title": "通知角色"
+ },
+ "remark": {
+ "type": "string",
+ "title": "备注"
+ },
+ "status": {
+ "type": "boolean",
+ "title": "状态:1_启用;0_禁用"
+ },
+ "createdAt": {
+ "type": "string",
+ "format": "date-time",
+ "title": "创建时间"
+ }
+ },
+ "required": [
+ "messageTemplateId",
+ "status",
+ "templateCategory",
+ "templateScene"
+ ],
+ "title": "消息模板"
+ },
+ "SingleResponseMessageTemplateVO": {
+ "type": "object",
+ "properties": {
+ "success": {
+ "type": "boolean"
+ },
+ "errCode": {
+ "type": "string"
+ },
+ "errMessage": {
+ "type": "string"
+ },
+ "data": {
+ "$ref": "#/components/schemas/MessageTemplateVO"
+ }
+ }
+ },
+ "MessageReceiverUpdateCmd": {
+ "type": "object",
+ "properties": {
+ "messageReceiverId": {
+ "type": "string",
+ "title": "消息接收ID"
+ },
+ "messageId": {
+ "type": "string",
+ "title": "消息ID"
+ },
+ "userId": {
+ "type": "string",
+ "title": "接收用户ID"
+ },
+ "isRead": {
+ "type": "boolean",
+ "title": "是否已读"
+ },
+ "readAt": {
+ "type": "string",
+ "format": "date-time",
+ "title": "已读时间"
+ },
+ "createdAt": {
+ "type": "string",
+ "format": "date-time",
+ "title": "创建时间"
+ }
+ },
+ "required": [
+ "messageId",
+ "messageReceiverId",
+ "readAt",
+ "userId"
+ ],
+ "title": "消息接收更新"
+ },
+ "MessageReceiverVO": {
+ "type": "object",
+ "properties": {
+ "messageReceiverId": {
+ "type": "string",
+ "title": "消息接收ID"
+ },
+ "messageId": {
+ "type": "string",
+ "title": "消息ID"
+ },
+ "userId": {
+ "type": "string",
+ "title": "接收用户ID"
+ },
+ "isRead": {
+ "type": "boolean",
+ "title": "是否已读"
+ },
+ "readAt": {
+ "type": "string",
+ "format": "date-time",
+ "title": "已读时间"
+ },
+ "createdAt": {
+ "type": "string",
+ "format": "date-time",
+ "title": "创建时间"
+ }
+ },
+ "required": [
+ "messageId",
+ "messageReceiverId",
+ "readAt",
+ "userId"
+ ],
+ "title": "消息接收"
+ },
+ "SingleResponseMessageReceiverVO": {
+ "type": "object",
+ "properties": {
+ "success": {
+ "type": "boolean"
+ },
+ "errCode": {
+ "type": "string"
+ },
+ "errMessage": {
+ "type": "string"
+ },
+ "data": {
+ "$ref": "#/components/schemas/MessageReceiverVO"
+ }
+ }
+ },
"MenuUpdateCmd": {
"type": "object",
"properties": {
@@ -17546,6 +18306,19 @@
],
"title": "费用付款"
},
+ "MessageReceiverMarkReadCmd": {
+ "type": "object",
+ "properties": {
+ "messageReceiverId": {
+ "type": "string",
+ "title": "消息接收ID"
+ }
+ },
+ "required": [
+ "messageReceiverId"
+ ],
+ "title": "标记消息已读"
+ },
"OrderFinalApproveCmd": {
"type": "object",
"properties": {
@@ -18663,6 +19436,115 @@
}
}
},
+ "MessageTemplateCreateCmd": {
+ "type": "object",
+ "properties": {
+ "messageTemplateId": {
+ "type": "string",
+ "title": "模板ID"
+ },
+ "templateCategory": {
+ "type": "string",
+ "enum": [
+ "PURCHASE_ORDER_MESSAGE_TEMPLATE"
+ ],
+ "title": "模板分类:1_采购单消息模板;"
+ },
+ "templateScene": {
+ "type": "string",
+ "enum": [
+ "WAIT_AUDIT",
+ "WAIT_APPROVE",
+ "APPROVE_PASS",
+ "AUDIT_REJECT",
+ "APPROVE_REJECT"
+ ],
+ "title": "触发场景:1_待审核;2_待审批;3_审批通过;4_审核驳回;5_审批驳回"
+ },
+ "titleTemplate": {
+ "type": "string",
+ "title": "模板标题"
+ },
+ "contentTemplate": {
+ "type": "string",
+ "title": "内容模板"
+ },
+ "description": {
+ "type": "string",
+ "title": "模板描述"
+ },
+ "variables": {
+ "type": "string",
+ "title": "模板变量定义"
+ },
+ "roleIds": {
+ "type": "array",
+ "items": {
+ "type": "integer",
+ "format": "int64"
+ },
+ "title": "通知角色"
+ },
+ "remark": {
+ "type": "string",
+ "title": "备注"
+ },
+ "status": {
+ "type": "boolean",
+ "title": "状态:1_启用;0_禁用"
+ },
+ "createdAt": {
+ "type": "string",
+ "format": "date-time",
+ "title": "创建时间"
+ }
+ },
+ "required": [
+ "messageTemplateId",
+ "status",
+ "templateCategory",
+ "templateScene"
+ ],
+ "title": "消息模板创建"
+ },
+ "MessageReceiverCreateCmd": {
+ "type": "object",
+ "properties": {
+ "messageReceiverId": {
+ "type": "string",
+ "title": "消息接收ID"
+ },
+ "messageId": {
+ "type": "string",
+ "title": "消息ID"
+ },
+ "userId": {
+ "type": "string",
+ "title": "接收用户ID"
+ },
+ "isRead": {
+ "type": "boolean",
+ "title": "是否已读"
+ },
+ "readAt": {
+ "type": "string",
+ "format": "date-time",
+ "title": "已读时间"
+ },
+ "createdAt": {
+ "type": "string",
+ "format": "date-time",
+ "title": "创建时间"
+ }
+ },
+ "required": [
+ "messageId",
+ "messageReceiverId",
+ "readAt",
+ "userId"
+ ],
+ "title": "消息接收创建"
+ },
"MenuCreateCmd": {
"type": "object",
"properties": {
@@ -20339,6 +21221,34 @@
],
"title": "订单成本项详情查询"
},
+ "MessageTemplateShowQry": {
+ "type": "object",
+ "properties": {
+ "status": {
+ "type": "boolean",
+ "title": "状态:1_启用;0_禁用;"
+ },
+ "messageTemplateId": {
+ "type": "string",
+ "title": "消息模板ID"
+ }
+ },
+ "title": "消息模板查询"
+ },
+ "MessageReceiverShowQry": {
+ "type": "object",
+ "properties": {
+ "status": {
+ "type": "boolean",
+ "title": "状态:1_启用;0_禁用;"
+ },
+ "messageReceiverId": {
+ "type": "string",
+ "title": "消息接收ID"
+ }
+ },
+ "title": "消息接收查询"
+ },
"MenuShowQry": {
"type": "object",
"properties": {
@@ -21030,6 +21940,23 @@
},
"title": "订单状态"
},
+ "orderSupplierId": {
+ "type": "integer",
+ "format": "int64",
+ "title": "订单供应商ID"
+ },
+ "orderId": {
+ "type": "integer",
+ "format": "int64",
+ "title": "订单ID"
+ },
+ "registrationTime": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ },
+ "title": "登记时间"
+ },
"offset": {
"type": "integer",
"format": "int32"
@@ -21330,6 +22257,30 @@
"type": "string",
"title": "对账付款ID"
},
+ "dealerId": {
+ "type": "string",
+ "title": "经销商ID"
+ },
+ "companyId": {
+ "type": "string",
+ "title": "公司ID"
+ },
+ "accountType": {
+ "type": "string",
+ "title": "账户类型:1_银行卡;2_支付宝;3_微信"
+ },
+ "accountCategory": {
+ "type": "string",
+ "title": "账户类别:1_对公账户;2_私人账户"
+ },
+ "accountName": {
+ "type": "string",
+ "title": "开户公司名称/支付宝昵称/微信号"
+ },
+ "accountNumber": {
+ "type": "string",
+ "title": "银行账号/支付宝账号/微信账号"
+ },
"offset": {
"type": "integer",
"format": "int32"
@@ -22195,6 +23146,10 @@
"type": "string",
"title": "订单供应商ID"
},
+ "name": {
+ "type": "string",
+ "title": "名称"
+ },
"orderId": {
"type": "string",
"title": "订单ID"
@@ -22203,11 +23158,11 @@
"type": "string",
"title": "供应商id"
},
- "deliveryTime": {
+ "shippingDate": {
"type": "array",
"items": {
"type": "string",
- "format": "date-time"
+ "format": "date"
},
"title": "发货日期"
},
@@ -22253,6 +23208,14 @@
"type": "string",
"title": "发票ID"
},
+ "invoiceDate": {
+ "type": "array",
+ "items": {
+ "type": "string",
+ "format": "date"
+ },
+ "title": "发票日期"
+ },
"offset": {
"type": "integer",
"format": "int32"
@@ -22770,6 +23733,190 @@
}
}
},
+ "MessageTemplatePageQry": {
+ "type": "object",
+ "properties": {
+ "pageSize": {
+ "type": "integer",
+ "format": "int32"
+ },
+ "pageIndex": {
+ "type": "integer",
+ "format": "int32"
+ },
+ "orderBy": {
+ "type": "string"
+ },
+ "orderDirection": {
+ "type": "string"
+ },
+ "groupBy": {
+ "type": "string"
+ },
+ "needTotalCount": {
+ "type": "boolean"
+ },
+ "customFieldKey": {
+ "type": "string",
+ "title": "自定义字段key"
+ },
+ "customFieldValue": {
+ "type": "string",
+ "title": "自定义字段value"
+ },
+ "remark": {
+ "type": "string",
+ "title": "备注"
+ },
+ "status": {
+ "type": "boolean",
+ "title": "状态:1_启用;0_禁用;"
+ },
+ "messageTemplateId": {
+ "type": "string",
+ "title": "消息模板ID"
+ },
+ "offset": {
+ "type": "integer",
+ "format": "int32"
+ }
+ },
+ "title": "消息模板分页查询"
+ },
+ "PageResponseMessageTemplateVO": {
+ "type": "object",
+ "properties": {
+ "success": {
+ "type": "boolean"
+ },
+ "errCode": {
+ "type": "string"
+ },
+ "errMessage": {
+ "type": "string"
+ },
+ "totalCount": {
+ "type": "integer",
+ "format": "int32"
+ },
+ "pageSize": {
+ "type": "integer",
+ "format": "int32"
+ },
+ "pageIndex": {
+ "type": "integer",
+ "format": "int32"
+ },
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/components/schemas/MessageTemplateVO"
+ }
+ },
+ "empty": {
+ "type": "boolean"
+ },
+ "notEmpty": {
+ "type": "boolean"
+ },
+ "totalPages": {
+ "type": "integer",
+ "format": "int32"
+ }
+ }
+ },
+ "MessageReceiverPageQry": {
+ "type": "object",
+ "properties": {
+ "pageSize": {
+ "type": "integer",
+ "format": "int32"
+ },
+ "pageIndex": {
+ "type": "integer",
+ "format": "int32"
+ },
+ "orderBy": {
+ "type": "string"
+ },
+ "orderDirection": {
+ "type": "string"
+ },
+ "groupBy": {
+ "type": "string"
+ },
+ "needTotalCount": {
+ "type": "boolean"
+ },
+ "customFieldKey": {
+ "type": "string",
+ "title": "自定义字段key"
+ },
+ "customFieldValue": {
+ "type": "string",
+ "title": "自定义字段value"
+ },
+ "remark": {
+ "type": "string",
+ "title": "备注"
+ },
+ "status": {
+ "type": "boolean",
+ "title": "状态:1_启用;0_禁用;"
+ },
+ "messageReceiverId": {
+ "type": "string",
+ "title": "消息接收ID"
+ },
+ "offset": {
+ "type": "integer",
+ "format": "int32"
+ }
+ },
+ "title": "消息接收分页查询"
+ },
+ "PageResponseMessageReceiverVO": {
+ "type": "object",
+ "properties": {
+ "success": {
+ "type": "boolean"
+ },
+ "errCode": {
+ "type": "string"
+ },
+ "errMessage": {
+ "type": "string"
+ },
+ "totalCount": {
+ "type": "integer",
+ "format": "int32"
+ },
+ "pageSize": {
+ "type": "integer",
+ "format": "int32"
+ },
+ "pageIndex": {
+ "type": "integer",
+ "format": "int32"
+ },
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/components/schemas/MessageReceiverVO"
+ }
+ },
+ "empty": {
+ "type": "boolean"
+ },
+ "notEmpty": {
+ "type": "boolean"
+ },
+ "totalPages": {
+ "type": "integer",
+ "format": "int32"
+ }
+ }
+ },
"MaterialPageQry": {
"type": "object",
"properties": {
@@ -24760,6 +25907,14 @@
},
"title": "用户ID"
},
+ "roleIdList": {
+ "type": "array",
+ "items": {
+ "type": "integer",
+ "format": "int64"
+ },
+ "title": "角色ID"
+ },
"name": {
"type": "string",
"title": "用户名"
@@ -25399,6 +26554,86 @@
}
}
},
+ "MessageTemplateListQry": {
+ "type": "object",
+ "properties": {
+ "status": {
+ "type": "boolean",
+ "title": "状态:1_启用;0_禁用;"
+ },
+ "messageTemplateId": {
+ "type": "string",
+ "title": "消息模板ID"
+ }
+ },
+ "title": "消息模板列表查询"
+ },
+ "MultiResponseMessageTemplateVO": {
+ "type": "object",
+ "properties": {
+ "success": {
+ "type": "boolean"
+ },
+ "errCode": {
+ "type": "string"
+ },
+ "errMessage": {
+ "type": "string"
+ },
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/components/schemas/MessageTemplateVO"
+ }
+ },
+ "empty": {
+ "type": "boolean"
+ },
+ "notEmpty": {
+ "type": "boolean"
+ }
+ }
+ },
+ "MessageReceiverListQry": {
+ "type": "object",
+ "properties": {
+ "status": {
+ "type": "boolean",
+ "title": "状态:1_启用;0_禁用;"
+ },
+ "messageReceiverId": {
+ "type": "string",
+ "title": "消息接收ID"
+ }
+ },
+ "title": "消息接收列表查询"
+ },
+ "MultiResponseMessageReceiverVO": {
+ "type": "object",
+ "properties": {
+ "success": {
+ "type": "boolean"
+ },
+ "errCode": {
+ "type": "string"
+ },
+ "errMessage": {
+ "type": "string"
+ },
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/components/schemas/MessageReceiverVO"
+ }
+ },
+ "empty": {
+ "type": "boolean"
+ },
+ "notEmpty": {
+ "type": "boolean"
+ }
+ }
+ },
"MenuListQry": {
"type": "object",
"properties": {
@@ -26261,6 +27496,37 @@
}
}
},
+ "MessageReceiverUnreadCountQry": {
+ "type": "object",
+ "properties": {
+ "adminId": {
+ "type": "string",
+ "title": "管理员ID"
+ }
+ },
+ "required": [
+ "adminId"
+ ],
+ "title": "未读消息数量查询"
+ },
+ "SingleResponseInteger": {
+ "type": "object",
+ "properties": {
+ "success": {
+ "type": "boolean"
+ },
+ "errCode": {
+ "type": "string"
+ },
+ "errMessage": {
+ "type": "string"
+ },
+ "data": {
+ "type": "integer",
+ "format": "int32"
+ }
+ }
+ },
"LastVehicleNoQry": {
"type": "object",
"properties": {
@@ -26571,6 +27837,32 @@
],
"title": "删除发货单"
},
+ "MessageTemplateDestroyCmd": {
+ "type": "object",
+ "properties": {
+ "messageTemplateId": {
+ "type": "string",
+ "title": "消息模板ID"
+ }
+ },
+ "required": [
+ "messageTemplateId"
+ ],
+ "title": "删除消息模板"
+ },
+ "MessageReceiverDestroyCmd": {
+ "type": "object",
+ "properties": {
+ "messageReceiverId": {
+ "type": "string",
+ "title": "消息接收ID"
+ }
+ },
+ "required": [
+ "messageReceiverId"
+ ],
+ "title": "删除消息接收"
+ },
"MenuDestroyCmd": {
"type": "object",
"properties": {