diff --git a/src/apis/material/materialInfo.ts b/src/apis/material/materialInfo.ts new file mode 100644 index 0000000..5c170cd --- /dev/null +++ b/src/apis/material/materialInfo.ts @@ -0,0 +1,52 @@ +import http from '@/utils/http' + +const BASE_URL = '/admin/meterialInfo' + +export interface MeterialInfoResp { + materialName: string + encoding: string + unitWeight: string + maxWeight: string + photoUrl: string + createUser: string + createTime: string + createUserString: string + updateUserString: string + disabled: boolean +} +export interface MaterialInfoQuery { + materialName: string | undefined + encoding: string | undefined + sort: Array +} +export interface MaterialInfoPageQuery extends MaterialInfoQuery, PageQuery {} + +/** @desc 查询物料信息列表 */ +export function listMaterialInfo(query: MaterialInfoPageQuery) { + return http.get>(`${BASE_URL}`, query) +} + +/** @desc 查询物料信息详情 */ +export function getMaterialInfo(id: string) { + return http.get(`${BASE_URL}/${id}`) +} + +/** @desc 新增物料信息 */ +export function addMaterialInfo(data: any) { + return http.post(`${BASE_URL}`, data) +} + +/** @desc 修改物料信息 */ +export function updateMaterialInfo(data: any, id: string) { + return http.put(`${BASE_URL}/${id}`, data) +} + +/** @desc 删除物料信息 */ +export function deleteMaterialInfo(id: string) { + return http.del(`${BASE_URL}/${id}`) +} + +/** @desc 导出物料信息 */ +export function exportMaterialInfo(query: MeterialInfoQuery) { + return http.download(`${BASE_URL}/export`, query) +} diff --git a/src/views/material/MaterialInfoAddModal.vue b/src/views/material/MaterialInfoAddModal.vue new file mode 100644 index 0000000..bc3dc54 --- /dev/null +++ b/src/views/material/MaterialInfoAddModal.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/views/material/index.vue b/src/views/material/index.vue new file mode 100644 index 0000000..e7cdc7c --- /dev/null +++ b/src/views/material/index.vue @@ -0,0 +1,174 @@ + + + + + diff --git a/src/views/system/user/UserAddDrawer.vue b/src/views/system/user/UserAddDrawer.vue index 3e0ec09..c77e785 100644 --- a/src/views/system/user/UserAddDrawer.vue +++ b/src/views/system/user/UserAddDrawer.vue @@ -53,16 +53,6 @@ const columns: ColumnItem[] = reactive([ maxLength: 64, }, }, - { - label: '昵称', - field: 'nickname', - type: 'input', - span: 24, - required: true, - props: { - maxLength: 30, - }, - }, { label: '密码', field: 'password', @@ -85,13 +75,10 @@ const columns: ColumnItem[] = reactive([ }, }, { - label: '邮箱', - field: 'email', + label: '卡号', + field: 'cardNo', type: 'input', span: 24, - props: { - maxLength: 255, - }, }, { label: '性别', @@ -102,25 +89,6 @@ const columns: ColumnItem[] = reactive([ options: GenderList, }, }, - { - label: '所属部门', - field: 'deptId', - type: 'tree-select', - span: 24, - required: true, - props: { - data: deptList, - allowClear: true, - allowSearch: true, - fallbackOption: false, - filterTreeNode(searchKey: string, nodeData: TreeNodeData) { - if (nodeData.title) { - return nodeData.title.toLowerCase().includes(searchKey.toLowerCase()) - } - return false - }, - }, - }, { label: '角色', field: 'roleIds', diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 00c0146..af8873b 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -1,99 +1,99 @@