diff --git a/src/views/common/push/pushApplication/ApplicationModal.vue b/src/views/common/push/pushApplication/ApplicationModal.vue index 31a1038..c542188 100644 --- a/src/views/common/push/pushApplication/ApplicationModal.vue +++ b/src/views/common/push/pushApplication/ApplicationModal.vue @@ -20,7 +20,10 @@ import { formSchema } from './application.data'; import { addPushApplication, editPushApplication, getPushApplication } from '/@/api/platform/common/controller/pushApplication'; import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal'; + import { useUserStore } from '/@/store/modules/user'; + const userStore = useUserStore(); + const userInfoStore = userStore.getUserInfo; /** 通用变量统一声明区域 */ const tag = ref>(''); /** https://v3.cn.vuejs.org/api/options-data.html#emits */ @@ -43,6 +46,11 @@ { field: 'messageSecret', ifShow: tag.value == 'edit' + }, + { + field: 'userId', + defaultValue: userInfoStore.id, + ifShow: tag.value == 'edit' } ]); // 采用tag标签区分操作 diff --git a/src/views/common/push/pushApplication/application.data.ts b/src/views/common/push/pushApplication/application.data.ts index c471dd9..39b34d2 100644 --- a/src/views/common/push/pushApplication/application.data.ts +++ b/src/views/common/push/pushApplication/application.data.ts @@ -5,6 +5,7 @@ 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'; +import {PushAuditStatus} from '/@/enums/pushEnum'; const userStore = useUserStore(); const userInfoStore = userStore.getUserInfo; @@ -103,6 +104,17 @@ export const formSchema: FormSchema[] = [ span: 12 } }, + { + field: 'userId', + label: '推送ID', + component: 'Input', + componentProps: { + disabled: true + }, + colProps: { + span: 12 + } + }, { field: 'messageSecret', label: '推送密钥', @@ -187,7 +199,7 @@ export const sendFormSchema: FormSchema[] = [ componentProps: { api: listPushConcernFan, params: { - status: '1', + status: PushAuditStatus.APPROVED, concernUserId: userInfoStore.id }, resultField: 'data',