notice暂不在master上修改 dev上已修改

pull/74/MERGE^2
gexinzhineng/gxzn27 2023-03-31 15:43:14 +08:00
parent 776032db82
commit 9a19ae9332
3 changed files with 189 additions and 272 deletions

View File

@ -1,131 +0,0 @@
<template>
<Dialog :title="modelTitle" v-model="modelVisible" width="800">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="80px"
v-loading="formLoading"
>
<el-form-item label="公告标题" prop="title">
<el-input v-model="formData.title" placeholder="请输入公告标题" />
</el-form-item>
<el-form-item label="公告内容" prop="content">
<Editor :model-value="formData.content" height="150px" />
</el-form-item>
<el-form-item label="公告类型" prop="type">
<el-select v-model="formData.type" placeholder="请选择公告类型" clearable>
<el-option
v-for="dict in getDictOptions(DICT_TYPE.SYSTEM_NOTICE_TYPE)"
:key="parseInt(dict.value)"
:label="dict.label"
:value="parseInt(dict.value)"
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="formData.status" placeholder="请选择状态" clearable>
<el-option
v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="parseInt(dict.value)"
:label="dict.label"
:value="parseInt(dict.value)"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" type="textarea" placeholder="请输备注" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="modelVisible = false"> </el-button>
</div>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { DICT_TYPE, getDictOptions } from '@/utils/dict'
import * as NoticeApi from '@/api/system/notice'
const { t } = useI18n() //
const message = useMessage() //
const modelVisible = ref(false) //
const modelTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
title: '',
type: undefined,
content: '',
status: undefined,
remark: ''
})
const formRules = reactive({
title: [{ required: true, message: '公告标题不能为空', trigger: 'blur' }],
type: [{ required: true, message: '公告类型不能为空', trigger: 'change' }],
status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
content: [{ required: true, message: '公告内容不能为空', trigger: 'blur' }]
})
const formRef = ref() // Ref
/** 打开弹窗 */
const openModal = async (type: string, id?: number) => {
modelVisible.value = true
modelTitle.value = t('action.' + type)
formType.value = type
resetForm()
//
if (id) {
formLoading.value = true
try {
formData.value = await NoticeApi.getNotice(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ openModal }) // openModal
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
//
formLoading.value = true
try {
const data = formData.value as unknown as NoticeApi.NoticeVO
if (formType.value === 'create') {
await NoticeApi.createNotice(data)
message.success(t('common.createSuccess'))
} else {
await NoticeApi.updateNotice(data)
message.success(t('common.updateSuccess'))
}
modelVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
title: '',
type: undefined,
content: '',
status: undefined,
remark: ''
}
formRef.value?.resetFields()
}
</script>

View File

@ -1,159 +1,148 @@
<template> <template>
<content-wrap> <ContentWrap>
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
<el-form-item label="公告标题" prop="title">
<el-input
v-model="queryParams.title"
placeholder="请输入公告标题"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="公告状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择公告状态" clearable>
<el-option
v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="parseInt(dict.value)"
:label="dict.label"
:value="parseInt(dict.value)"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
@click="openModal('create')"
v-hasPermi="['system:notice:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
</el-form-item>
</el-form>
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list" align="center"> <XTable @register="registerTable">
<el-table-column label="公告编号" align="center" prop="id" /> <!-- 操作新增 -->
<el-table-column label="公告标题" align="center" prop="title" /> <template #toolbar_buttons>
<el-table-column label="公告类型" align="center" prop="type"> <XButton
<template #default="scope"> type="primary"
<dict-tag :type="DICT_TYPE.SYSTEM_NOTICE_TYPE" :value="scope.row.type" /> preIcon="ep:zoom-in"
</template> :title="t('action.add')"
</el-table-column> v-hasPermi="['system:notice:create']"
<el-table-column label="状态" align="center" prop="status"> @click="handleCreate()"
<template #default="scope"> />
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" /> </template>
</template> <template #actionbtns_default="{ row }">
</el-table-column> <!-- 操作修改 -->
<el-table-column <XTextButton
label="创建时间" preIcon="ep:edit"
align="center" :title="t('action.edit')"
prop="createTime" v-hasPermi="['system:notice:update']"
width="180" @click="handleUpdate(row.id)"
:formatter="dateFormatter" />
/> <!-- 操作详情 -->
<el-table-column label="操作" align="center"> <XTextButton
<template #default="scope"> preIcon="ep:view"
<el-button :title="t('action.detail')"
link v-hasPermi="['system:notice:query']"
type="primary" @click="handleDetail(row.id)"
@click="openModal('update', scope.row.id)" />
v-hasPermi="['system:notice:update']" <!-- 操作删除 -->
> <XTextButton
编辑 preIcon="ep:delete"
</el-button> :title="t('action.del')"
<el-button v-hasPermi="['system:notice:delete']"
link @click="deleteData(row.id)"
type="danger" />
@click="handleDelete(scope.row.id)" </template>
v-hasPermi="['system:notice:delete']" </XTable>
> </ContentWrap>
删除 <!-- 弹窗 -->
</el-button> <XModal id="noticeModel" v-model="dialogVisible" :title="dialogTitle">
</template> <!-- 对话框(添加 / 修改) -->
</el-table-column> <Form
</el-table> ref="formRef"
<!-- 分页 --> v-if="['create', 'update'].includes(actionType)"
<Pagination :schema="allSchemas.formSchema"
:total="total" :rules="rules"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/> />
</content-wrap> <!-- 对话框(详情) -->
<Descriptions
<!-- 表单弹窗添加/修改 --> v-if="actionType === 'detail'"
<notice-form ref="modalRef" @success="getList" /> :schema="allSchemas.detailSchema"
:data="detailData"
>
<template #content="{ row }">
<Editor :model-value="row.content" :readonly="true" />
</template>
</Descriptions>
<template #footer>
<!-- 按钮保存 -->
<XButton
v-if="['create', 'update'].includes(actionType)"
type="primary"
:title="t('action.save')"
:loading="actionLoading"
@click="submitForm()"
/>
<!-- 按钮关闭 -->
<XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" />
</template>
</XModal>
</template> </template>
<script setup lang="tsx"> <script setup lang="ts" name="Notice">
import { DICT_TYPE, getDictOptions } from '@/utils/dict' import type { FormExpose } from '@/components/Form'
import { dateFormatter } from '@/utils/formatTime' // import
import * as NoticeApi from '@/api/system/notice' import * as NoticeApi from '@/api/system/notice'
import { DictTag } from '@/components/DictTag' import { rules, allSchemas } from './notice.data'
import NoticeForm from './form.vue'
const message = useMessage() //
const { t } = useI18n() // const { t } = useI18n() //
const message = useMessage() //
const loading = ref(true) // //
const total = ref(0) // const [registerTable, { reload, deleteData }] = useXTable({
const list = ref([]) // allSchemas: allSchemas,
const queryParams = reactive({ getListApi: NoticeApi.getNoticePageApi,
title: '', deleteApi: NoticeApi.deleteNoticeApi
type: undefined,
status: undefined,
pageNo: 1,
pageSize: 100
}) })
const queryFormRef = ref() // //
const dialogVisible = ref(false) //
const dialogTitle = ref('edit') //
const actionType = ref('') //
const actionLoading = ref(false) // Loading
const formRef = ref<FormExpose>() // Ref
const detailData = ref() // Ref
/** 查询公告列表 */ //
const getList = async () => { const setDialogTile = (type: string) => {
loading.value = true dialogTitle.value = t('action.' + type)
try { actionType.value = type
const data = await NoticeApi.getNoticePage(queryParams) dialogVisible.value = true
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
} }
/** 搜索按钮操作 */ //
const handleQuery = () => { const handleCreate = () => {
queryParams.pageNo = 1 setDialogTile('create')
getList()
} }
/** 重置按钮操作 */ //
const resetQuery = () => { const handleUpdate = async (rowId: number) => {
queryFormRef.value.resetFields() setDialogTile('update')
handleQuery() //
const res = await NoticeApi.getNoticeApi(rowId)
unref(formRef)?.setValues(res)
} }
/** 添加/修改操作 */ //
const modalRef = ref() const handleDetail = async (rowId: number) => {
const openModal = (type: string, id?: number) => { setDialogTile('detail')
modalRef.value.openModal(type, id) //
const res = await NoticeApi.getNoticeApi(rowId)
detailData.value = res
} }
/** 删除按钮操作 */ // /
const handleDelete = async (id: number) => { const submitForm = async () => {
try { const elForm = unref(formRef)?.getElFormRef()
// if (!elForm) return
await message.delConfirm() elForm.validate(async (valid) => {
// if (valid) {
await NoticeApi.deleteNotice(id) actionLoading.value = true
message.success(t('common.delSuccess')) //
// try {
await getList() const data = unref(formRef)?.formModel as NoticeApi.NoticeVO
} catch {} if (actionType.value === 'create') {
await NoticeApi.createNoticeApi(data)
message.success(t('common.createSuccess'))
} else {
await NoticeApi.updateNoticeApi(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
} finally {
actionLoading.value = false
await reload()
}
}
})
} }
/** 初始化 **/
onMounted(() => {
getList()
})
</script> </script>

View File

@ -0,0 +1,59 @@
import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
const { t } = useI18n() // 国际化
// 表单校验
export const rules = reactive({
title: [required],
type: [required]
})
// CrudSchema
const crudSchemas = reactive<VxeCrudSchema>({
primaryKey: 'id',
primaryType: 'seq',
action: true,
columns: [
{
title: '公告标题',
field: 'title',
isSearch: true
},
{
title: '公告类型',
field: 'type',
dictType: DICT_TYPE.SYSTEM_NOTICE_TYPE,
dictClass: 'number'
},
{
title: t('common.status'),
field: 'status',
dictType: DICT_TYPE.COMMON_STATUS,
dictClass: 'number',
isSearch: true
},
{
title: '公告内容',
field: 'content',
table: {
type: 'html'
},
form: {
component: 'Editor',
colProps: {
span: 24
},
componentProps: {
valueHtml: ''
}
},
isTable: false
},
{
title: t('common.createTime'),
field: 'createTime',
formatter: 'formatDate',
isForm: false
}
]
})
export const { allSchemas } = useVxeCrudSchemas(crudSchemas)