diff --git a/src/views/common/push/pushApplication/SendMessageModal.vue b/src/views/common/push/pushApplication/EnterpriseSendModal.vue similarity index 89% rename from src/views/common/push/pushApplication/SendMessageModal.vue rename to src/views/common/push/pushApplication/EnterpriseSendModal.vue index b7fd2c8..3435435 100644 --- a/src/views/common/push/pushApplication/SendMessageModal.vue +++ b/src/views/common/push/pushApplication/EnterpriseSendModal.vue @@ -23,21 +23,20 @@ const userInfoStore = userStore.getUserInfo; const emit = defineEmits(['success', 'register']); const [registerForm, { resetFields, setFieldsValue, validate, clearValidate, updateSchema }] = useForm({ - labelWidth: 150, + labelWidth: 80, schemas: sendFormSchema, showActionButtonGroup: false, baseColProps: { span: 24 } }); - const [registerModal, { setModalProps, closeModal, redoModalHeight }] = useModalInner(async (data: WindowInnerData = { _tag: '' }) => { + const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data: WindowInnerData = { _tag: '' }) => { // 处理清除脏数据 await resetFields(); await clearValidate(); messageSecret.value = data.record?.messageSecret; const props: Partial = { confirmLoading: false }; - props.title = '发送消息'; + props.title = '企业发送消息'; // 尾部:设置处理后的最终配置数据 setModalProps(props); - redoModalHeight(); }); async function handleSubmit() { diff --git a/src/views/common/push/pushApplication/application.data.ts b/src/views/common/push/pushApplication/application.data.ts index 7493511..b6155a4 100644 --- a/src/views/common/push/pushApplication/application.data.ts +++ b/src/views/common/push/pushApplication/application.data.ts @@ -3,6 +3,11 @@ import { FormSchema } from '/@/components/Table'; import { h } from 'vue'; import { Tag } from 'ant-design-vue'; import { listPushType } from '/@/api/platform/common/controller/pushType'; +import {listPushConcernFan} from "/@/api/platform/common/controller/pushConcernFan"; +import {useUserStore} from "/@/store/modules/user"; + +const userStore = useUserStore(); +const userInfoStore = userStore.getUserInfo; /** 表格列配置 */ export const columns: BasicColumn[] = [ @@ -111,6 +116,7 @@ export const formSchema: FormSchema[] = [ } ]; +/** 发送消息表单 */ export const sendFormSchema: FormSchema[] = [ { field: 'userId', @@ -125,25 +131,29 @@ export const sendFormSchema: FormSchema[] = [ show: false }, { - field: 'title', - label: '标题', + field: 'remarks', + label: '任务描述', component: 'Input', required: true, - colProps: { - span: 24 + componentProps: { + showCount: true, + maxlength: 20, } }, { - label: '通知文字描述', + field: 'title', + label: '通知标题', + component: 'Input', + required: true, + }, + { + label: '通知内容', field: 'text', component: 'InputTextArea', required: true, componentProps: { rows: 6 }, - colProps: { - span: 24 - } }, { field: 'pushTypeId', @@ -159,4 +169,23 @@ export const sendFormSchema: FormSchema[] = [ resultField: 'data' }, }, + { + field: 'alias', + label: '推送用户', + component: 'ApiTreeSelect', + componentProps: { + api: listPushConcernFan, + params: { + status: '1', + fanUserId: userInfoStore.id + }, + resultField: 'data', + treeCheckable: true, + showCheckedStrategy: 'SHOW_PARENT', + treeDefaultExpandAll: true, + maxTagCount: 10, + fieldNames: { label: 'nickName', key: 'concernUserId', value: 'concernUserId' }, + allowClear: true, + }, + }, ]; diff --git a/src/views/common/push/pushApplication/index.vue b/src/views/common/push/pushApplication/index.vue index 48afe30..ca8b49c 100644 --- a/src/views/common/push/pushApplication/index.vue +++ b/src/views/common/push/pushApplication/index.vue @@ -46,7 +46,7 @@ - + @@ -62,7 +62,7 @@ import { listPushApplication, delPushApplication } from '/@/api/platform/common/controller/pushApplication'; import { useModal } from '/@/components/Modal'; import ApplicationModal from './ApplicationModal.vue'; - import SendMessageModal from './SendMessageModal.vue'; + import EnterpriseSendModal from './EnterpriseSendModal.vue'; import { columns, searchFormSchema } from './application.data'; import { useMessage } from '/@/hooks/web/useMessage';