diff --git a/app/app.vue b/app/app.vue index c90c68b..1a8b859 100644 --- a/app/app.vue +++ b/app/app.vue @@ -6,7 +6,9 @@ + + diff --git a/app/components/BackButton.vue b/app/components/BackButton.vue new file mode 100644 index 0000000..bc277aa --- /dev/null +++ b/app/components/BackButton.vue @@ -0,0 +1,7 @@ + diff --git a/app/components/BasicInfo.vue b/app/components/BasicInfo.vue new file mode 100644 index 0000000..9cca043 --- /dev/null +++ b/app/components/BasicInfo.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/app/components/SuperTable.vue b/app/components/SuperTable.vue index 2472937..3baa0c1 100644 --- a/app/components/SuperTable.vue +++ b/app/components/SuperTable.vue @@ -13,16 +13,11 @@ const pagination = defineModel('pagination'); async function onPageChange(pageInfo: { current: number; pageSize: number }) { - console.log('Page change'); - console.log(pageInfo); emit('pageChange', pageInfo); } function onRowClick(x: RowEventContext) { emit('onRowClick', x); } - function onSelectChange() { - console.log('Select change'); - } - - diff --git a/app/pages/base/index/home/index.vue b/app/pages/base/index/home/index.vue index 7cc6883..4cb0279 100644 --- a/app/pages/base/index/home/index.vue +++ b/app/pages/base/index/home/index.vue @@ -1,99 +1,15 @@ - - - - diff --git a/app/pages/base/index/peopleManage/components/PeopleForm.vue b/app/pages/base/index/peopleManage/components/PeopleForm.vue index 21fc017..39fbe06 100644 --- a/app/pages/base/index/peopleManage/components/PeopleForm.vue +++ b/app/pages/base/index/peopleManage/components/PeopleForm.vue @@ -45,7 +45,6 @@ for (const [key, value] of Object.entries(cityDataTyped['00']!)) { if (value === name) { provinceIndex.value = key; - console.log('finish'); return; } } diff --git a/app/pages/base/index/peopleManage/index.vue b/app/pages/base/index/peopleManage/index.vue index ff6e7c6..30aa788 100644 --- a/app/pages/base/index/peopleManage/index.vue +++ b/app/pages/base/index/peopleManage/index.vue @@ -2,7 +2,7 @@ import SuperTable from '~/components/SuperTable.vue'; import type { TableProps, TableRowData } from 'tdesign-vue-next'; import PeopleForm from '~/pages/base/index/peopleManage/components/PeopleForm.vue'; - + import { TButton } from '#components'; const store = usePeopleStore(); const { peopleList, pagination, situation } = storeToRefs(usePeopleStore()); @@ -46,12 +46,23 @@ { colKey: 'operator', title: '操作', - cell: (_, { row }) => ( -
- editUser(row)}>编辑 - deleteUser(row)}>删除 -
- ), + cell: (_, { row }) => + h('div', { class: 'w-40 flex flex-row justify-evenly' }, [ + h( + TButton, + { + onClick: () => editUser(row), + }, + { default: () => '编辑' }, + ), + h( + TButton, + { + onClick: () => showDeleteUserDialog(row), + }, + { default: () => '删除' }, + ), + ]), }, ]); @@ -63,29 +74,34 @@ await store.getTotal(); }); - function editUser(_row: TableRowData) { + function editUser(row: TableRowData) { if (form.value) form.value.resetForm(); store.currentForm = { - ...peopleList.value.find((e) => e.id === _row.id)!, + ...peopleList.value.find((e) => e.id === row.id)!, } as PeopleInfo; - console.log(store.currentForm.province); form.value?.setProvinceIndexByName(store.currentForm.province); - console.log(store.currentForm); store.showEditPeople = true; } - function deleteUser(_row: TableRowData) { - store.deletePeople(_row.id); - console.log(_row); + const showDeleteDialog = ref(false); + let deleteRowId = 0; + + function showDeleteUserDialog(row: TableRowData) { + deleteRowId = row.id; + showDeleteDialog.value = true; } - function pageChange(x: { current: number; pageSize: number }) { + function deleteUser() { + showDeleteDialog.value = false; + store.deletePeople(deleteRowId); + } + + async function pageChange(x: { current: number; pageSize: number }) { if (pagination.value) { pagination.value.current = x.current; pagination.value.pageSize = x.pageSize; - store.getPeopleList(); + await store.getPeopleList(); } - console.log(store.pagination); } async function doSearch() { @@ -147,6 +163,15 @@ + + 此操作将永久删除该人员,确定吗? + diff --git a/app/pages/login/components/LoginPart.vue b/app/pages/login/components/LoginPart.vue index 7d1e493..ef4dd63 100644 --- a/app/pages/login/components/LoginPart.vue +++ b/app/pages/login/components/LoginPart.vue @@ -10,6 +10,10 @@ await router.push('/base/home'); } } + onMounted(() => { + loginForm.value.usernameOrEmail = ''; + loginForm.value.password = ''; + });