diff --git a/src/api/dictionary.ts b/src/api/dictionary.ts index efdd2d3dbbc8279cc9be96bf9ebcc2514237a1c1..5aeff5f61687220af0258729433a22a70a3ebf92 100644 --- a/src/api/dictionary.ts +++ b/src/api/dictionary.ts @@ -5,7 +5,7 @@ const Api = { list: '/api/dictionary/getList', add: '/api/dictionary/add', update: '/api/dictionary/update', - remove: '/api/dictionary/remove', + delete: '/api/dictionary/delete', } export const getDictionaryList = ( dicTypeId: string @@ -32,11 +32,11 @@ export const updateDictionary = (data: Dictionary) => { data, }) } -export const removeDictionary = (id: string) => { +export const deleteDictionary = (id: string) => { return request({ - url: Api.remove, + url: Api.delete, method: 'POST', - params: { + data: { id, }, }) diff --git a/src/api/dictionaryType.ts b/src/api/dictionaryType.ts index 388e1baaa69a242f9ba433423f979237b52b0c30..a9f399c3deafe041e76bcd6f54c1e13a5e5f6298 100644 --- a/src/api/dictionaryType.ts +++ b/src/api/dictionaryType.ts @@ -5,7 +5,7 @@ const Api = { list: '/api/dictionaryType/getList', add: '/api/dictionaryType/add', update: '/api/dictionaryType/update', - remove: '/api/dictionaryType/remove', + delete: '/api/dictionaryType/delete', } export const getDictionaryTypeList = (): Promise< QuickResponseData> @@ -30,11 +30,11 @@ export const updateDictionaryType = (data: DictionaryType) => { data, }) } -export const removeDictionaryType = (id: string) => { +export const deleteDictionaryType = (id: string) => { return request({ - url: Api.remove, + url: Api.delete, method: 'POST', - params: { + data: { id, }, }) diff --git a/src/api/user.ts b/src/api/user.ts index 842193f6ba83be8faa8bf397fb15126b6c02d98a..636bbc770ac2734a338a8fa64972dd14b63fbb5d 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -7,7 +7,11 @@ const Api = { info: '/api/user/getInfo', add: '/api/user/add', update: '/api/user/update', - remove: '/api/user/remove', + delete: '/api/user/delete', + batchDeleteUser: '/api/user/batchRemove', + resetPassword: '/api/user/resetPassword', + enabled: '/api/user/enabled', + disable: '/api/user/disable', } export const getUserPageList = ( params: object @@ -49,12 +53,48 @@ export const updateUser = (data: User) => { data, }) } -export const deleteUser = (userId: string) => { +export const deleteUser = (id: string) => { return request({ - url: Api.remove, + url: Api.delete, method: 'POST', - params: { - userId, + data: { + id, + }, + }) +} +export const batchDeleteUser = (ids: string) => { + return request({ + url: Api.batchDeleteUser, + method: 'POST', + data: { + ids, + }, + }) +} +export const resetUserPassword = (id: string) => { + return request({ + url: Api.resetPassword, + method: 'POST', + data: { + id, + }, + }) +} +export const enableUser = (id: string) => { + return request({ + url: Api.enabled, + method: 'POST', + data: { + id, + }, + }) +} +export const disableUser = (id: string) => { + return request({ + url: Api.disable, + method: 'POST', + data: { + id, }, }) } diff --git a/src/assets/audios/order.mp3 b/src/assets/audios/order.mp3 deleted file mode 100644 index f67c4e9569c9471f4412fd246e1d42c35f3b42f6..0000000000000000000000000000000000000000 Binary files a/src/assets/audios/order.mp3 and /dev/null differ diff --git a/src/components/QuickCode/index.vue b/src/components/QuickCode/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..22aa2e7fb920cc6790b18fccb830b1ad4dd35df3 --- /dev/null +++ b/src/components/QuickCode/index.vue @@ -0,0 +1,31 @@ + + diff --git a/src/components/QuickCrud/index.scss b/src/components/QuickCrud/index.scss deleted file mode 100644 index 5ed1aa9c874ff08a3936444f0b1eb4fc1ed012e8..0000000000000000000000000000000000000000 --- a/src/components/QuickCrud/index.scss +++ /dev/null @@ -1,12 +0,0 @@ -.action { - margin-bottom: 10px; - } - .demo-pagination-block + .demo-pagination-block { - margin-top: 10px; - } - .demo-pagination-block .demonstration { - margin-bottom: 16px; - } - .el-pagination { - margin-top: 10px; - } \ No newline at end of file diff --git a/src/components/QuickCrud/index.ts b/src/components/QuickCrud/index.ts deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/components/QuickCrud/index.vue b/src/components/QuickCrud/index.vue index 99296b9ebe5378a2a3c0e1d33a06706fe26bd163..773ce8da534da634a3a8019cdce78baa3502dda9 100644 --- a/src/components/QuickCrud/index.vue +++ b/src/components/QuickCrud/index.vue @@ -1,36 +1,57 @@ - diff --git a/src/components/QuickForm/index.scss b/src/components/QuickForm/index.scss deleted file mode 100644 index a0c8268b50f7ed88bc5c8790b95132159f2a9a1b..0000000000000000000000000000000000000000 --- a/src/components/QuickForm/index.scss +++ /dev/null @@ -1,20 +0,0 @@ -.avatar-uploader .el-upload { - border: 1px dashed var(--el-border-color); - border-radius: 6px; - cursor: pointer; - position: relative; - overflow: hidden; - transition: var(--el-transition-duration-fast); - } - - .avatar-uploader .el-upload:hover { - border-color: var(--el-color-primary); - } - - .el-icon.avatar-uploader-icon { - font-size: 28px; - color: #8c939d; - width: 178px; - height: 178px; - text-align: center; - } \ No newline at end of file diff --git a/src/components/QuickForm/index.ts b/src/components/QuickForm/index.ts deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/components/QuickForm/index.vue b/src/components/QuickForm/index.vue index af877b776b474f511d8ae7e8e070ec78ec58c175..45e41f741cc42b2d38cba8a8274675cc096693d4 100644 --- a/src/components/QuickForm/index.vue +++ b/src/components/QuickForm/index.vue @@ -1,10 +1,16 @@ @@ -68,12 +83,12 @@ defineExpose({ handleSubmit }) (formType === 'add' && !item.addHidden) || (formType === 'edit' && !item.editHidden) || (formType === 'detail' && !item.detailHidden) || - !formType + formType === 'form' " :label="item.label" :label-width="item.labelWidth" - :prop="item.prop" - :rules="item.rules" + :prop="formType === 'detail' ? undefined : item.prop" + :rules="formType === 'detail' ? undefined : item.rules" > @@ -127,7 +142,7 @@ defineExpose({ handleSubmit }) :readonly=" (formType === 'add' && item.addReadonly) || (formType === 'edit' && item.editReadonly) || - (formType === 'detail' && item.detailReadonly) + formType === 'detail' " /> @@ -145,14 +160,14 @@ defineExpose({ handleSubmit }) @@ -164,25 +179,44 @@ defineExpose({ handleSubmit }) :readonly=" (formType === 'add' && item.addReadonly) || (formType === 'edit' && item.editReadonly) || - (formType === 'detail' && item.detailReadonly) + formType === 'detail' " /> - diff --git a/src/components/QuickSearch/index.vue b/src/components/QuickSearch/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..583bb35f3778ef945ccfddd1c6f87eceb6efc18e --- /dev/null +++ b/src/components/QuickSearch/index.vue @@ -0,0 +1,63 @@ + + diff --git a/src/components/QuickTable/index.scss b/src/components/QuickTable/index.scss deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/components/QuickTable/index.ts b/src/components/QuickTable/index.ts deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/components/QuickTable/index.vue b/src/components/QuickTable/index.vue index 4b2ba7dd2c6eb07b7e5dd81ef3bc38767c656d54..20d89e46b530d95f3689a0877f4046161f398fe3 100644 --- a/src/components/QuickTable/index.vue +++ b/src/components/QuickTable/index.vue @@ -1,7 +1,9 @@