大屏页面初始化
This commit is contained in:
@@ -169,6 +169,10 @@ import CSearch from '@/components/Search/proSearch.vue'
|
|||||||
import PDialog from '@/components/Dialog/proDialog.vue'
|
import PDialog from '@/components/Dialog/proDialog.vue'
|
||||||
import VForm from './form.vue'
|
import VForm from './form.vue'
|
||||||
|
|
||||||
|
import { useUserStore } from '@/stores/user'
|
||||||
|
|
||||||
|
const userStore = useUserStore()
|
||||||
|
|
||||||
const formComponentRef = ref(null)
|
const formComponentRef = ref(null)
|
||||||
const saveLoading = ref(false)
|
const saveLoading = ref(false)
|
||||||
const loading = ref(false)
|
const loading = ref(false)
|
||||||
@@ -240,10 +244,11 @@ async function getDataList() {
|
|||||||
loading.value = true
|
loading.value = true
|
||||||
try {
|
try {
|
||||||
const reqParams = {
|
const reqParams = {
|
||||||
|
...searchForm,
|
||||||
pageNum: pagination.pageNum,
|
pageNum: pagination.pageNum,
|
||||||
pageSize: pagination.pageSize,
|
pageSize: pagination.pageSize,
|
||||||
type: activeTag.value,
|
type: activeTag.value,
|
||||||
...searchForm,
|
createUser: userStore.loginUser.userName,
|
||||||
}
|
}
|
||||||
const res = await getNotesList(reqParams);
|
const res = await getNotesList(reqParams);
|
||||||
pagination.total = res.total;
|
pagination.total = res.total;
|
||||||
@@ -341,7 +346,8 @@ const handleSave = async () => {
|
|||||||
const reqParams = {
|
const reqParams = {
|
||||||
...formData.value,
|
...formData.value,
|
||||||
isEdit: isEdit.value,
|
isEdit: isEdit.value,
|
||||||
id: currentRow.value?.id
|
id: currentRow.value?.id,
|
||||||
|
createUser: userStore.loginUser.userName,
|
||||||
}
|
}
|
||||||
const res = await getNotesSave(reqParams);
|
const res = await getNotesSave(reqParams);
|
||||||
saveLoading.value = false
|
saveLoading.value = false
|
||||||
|
|||||||
@@ -33,12 +33,13 @@ public class NotesController {
|
|||||||
|
|
||||||
@GetMapping("list")
|
@GetMapping("list")
|
||||||
public Result<?> getList(Integer pageNum, Integer pageSize,
|
public Result<?> getList(Integer pageNum, Integer pageSize,
|
||||||
String title, String priority, String ustatus, String type) {
|
String title, String priority, String ustatus, String type,String createUser) {
|
||||||
LambdaQueryWrapper<Notes> query = new LambdaQueryWrapper<Notes>()
|
LambdaQueryWrapper<Notes> query = new LambdaQueryWrapper<Notes>()
|
||||||
.like(StrUtil.isNotBlank(title), Notes::getTitle, title)
|
.like(StrUtil.isNotBlank(title), Notes::getTitle, title)
|
||||||
.eq(StrUtil.isNotBlank(priority), Notes::getPriority, priority)
|
.eq(StrUtil.isNotBlank(priority), Notes::getPriority, priority)
|
||||||
.eq(StrUtil.isNotBlank(ustatus), Notes::getUstatus, ustatus)
|
.eq(StrUtil.isNotBlank(ustatus), Notes::getUstatus, ustatus)
|
||||||
.eq(StrUtil.isNotBlank(type), Notes::getType, type)
|
.eq(StrUtil.isNotBlank(type), Notes::getType, type)
|
||||||
|
.eq(StrUtil.isNotBlank(createUser), Notes::getCreateUser, createUser)
|
||||||
.orderByDesc(Notes::getCreateTime);
|
.orderByDesc(Notes::getCreateTime);
|
||||||
List<Notes> list = notesService.list(query);
|
List<Notes> list = notesService.list(query);
|
||||||
PageUtil<?> util = new PageUtil<>(pageNum, pageSize, list);
|
PageUtil<?> util = new PageUtil<>(pageNum, pageSize, list);
|
||||||
|
|||||||
Reference in New Issue
Block a user