From 11e6f17532067d1e29294b27d6a6499f827dadce Mon Sep 17 00:00:00 2001 From: GaoF Date: Fri, 26 Jul 2024 21:11:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/base/brand/sysBrandApi.js | 2 +- src/api/base/material/materialApi.js | 32 ---- src/api/base/material/materialCategoryApi.js | 32 ---- src/api/base/sysStoreApi.js | 48 ------ src/api/base/wx/officialAccountApi.js | 4 +- src/api/baseData/unit/unitApi.js | 28 --- src/components/DrawerForm/index.vue | 49 ------ src/components/DynamicForm/index.vue | 75 +++----- src/components/SearchForm/index.vue | 98 ----------- src/components/Table/index.vue | 25 +-- src/layout/components/panel-search/item.vue | 0 src/store/search.js | 0 src/utils/errorHandler.js | 1 + .../unit/columns/unitGroupColumns.js | 10 -- src/views/basicData/unit/detail/index.vue | 121 ++++++++++--- .../basicData/unit/formData/SearchForm.js | 26 --- src/views/basicData/unit/index.vue | 161 +++++++++++------- 17 files changed, 230 insertions(+), 482 deletions(-) delete mode 100644 src/api/base/material/materialApi.js delete mode 100644 src/api/base/material/materialCategoryApi.js delete mode 100644 src/api/base/sysStoreApi.js delete mode 100644 src/api/baseData/unit/unitApi.js delete mode 100644 src/components/DrawerForm/index.vue delete mode 100644 src/components/SearchForm/index.vue mode change 100755 => 100644 src/layout/components/panel-search/item.vue mode change 100755 => 100644 src/store/search.js delete mode 100644 src/views/basicData/unit/columns/unitGroupColumns.js delete mode 100644 src/views/basicData/unit/formData/SearchForm.js diff --git a/src/api/base/brand/sysBrandApi.js b/src/api/base/brand/sysBrandApi.js index 7b962a8..fc30e23 100644 --- a/src/api/base/brand/sysBrandApi.js +++ b/src/api/base/brand/sysBrandApi.js @@ -10,7 +10,7 @@ const request = (url, ...arg) => baseRequest(`/base/brand/` + url, ...arg) **/ export default { // 获取品牌分页 - sysBrandPage(data) { + page(data) { return request('page', data, 'get') }, // 获取品牌列表 diff --git a/src/api/base/material/materialApi.js b/src/api/base/material/materialApi.js deleted file mode 100644 index caa35e7..0000000 --- a/src/api/base/material/materialApi.js +++ /dev/null @@ -1,32 +0,0 @@ -import { baseRequest } from '@/utils/request' - -const request = (url, ...arg) => baseRequest(`/base/material/` + url, ...arg) - -/** - * 物料Api接口管理器 - * - * @author Luck - * @date 2024/07/24 19:54 - **/ -export default { - // 获取物料分页 - materialPage(data) { - return request('page', data, 'get') - }, - // 获取物料 -- 物料包装数据 - materialPackageData(data) { - return request('/package/data', data, 'get') - }, - // 提交物料表单 edit为true时为编辑，默认为新增 - materialSubmitForm(data, edit = false) { - return request(edit ? 'edit' : 'add', data) - }, - // 删除物料 - materialDelete(data) { - return request('delete', data) - }, - // 获取物料详情 - materialDetail(data) { - return request('detail', data, 'get') - } -} diff --git a/src/api/base/material/materialCategoryApi.js b/src/api/base/material/materialCategoryApi.js deleted file mode 100644 index 5c32f5e..0000000 --- a/src/api/base/material/materialCategoryApi.js +++ /dev/null @@ -1,32 +0,0 @@ -import { baseRequest } from '@/utils/request' - -const request = (url, ...arg) => baseRequest(`/base/materialCategory/` + url, ...arg) - -/** - * 物料分类Api接口管理器 - * - * @author Luck - * @date 2024/07/24 19:35 - **/ -export default { - // 获取物料分类分页 - materialCategoryPage(data) { - return request('page', data, 'get') - }, - // 获取物料分类 树结构 - materialCategoryTree(data) { - return request('tree', data, 'get') - }, - // 提交物料分类表单 edit为true时为编辑，默认为新增 - materialCategorySubmitForm(data, edit = false) { - return request(edit ? 'edit' : 'add', data) - }, - // 删除物料分类 - materialCategoryDelete(data) { - return request('delete', data) - }, - // 获取物料分类详情 - materialCategoryDetail(data) { - return request('detail', data, 'get') - } -} diff --git a/src/api/base/sysStoreApi.js b/src/api/base/sysStoreApi.js deleted file mode 100644 index 5850800..0000000 --- a/src/api/base/sysStoreApi.js +++ /dev/null @@ -1,48 +0,0 @@ -import { baseRequest } from '@/utils/request' - -const request = (url, ...arg) => baseRequest(`/base/store/` + url, ...arg) - -/** - * 仓库Api接口管理器 - * - * @author Luck - * @date 2024/07/24 19:32 - **/ -export default { - // 获取仓库分页 - sysStorePage(data) { - return request('page', data, 'get') - }, - // 获取仓库 树结构 - sysStoreTree(data) { - return request('tree', data, 'get') - }, - // 提交仓库表单 edit为true时为编辑，默认为新增 - sysStoreSubmitForm(data, edit = false) { - return request(edit ? 'edit' : 'add', data) - }, - // 删除仓库 - sysStoreDelete(data) { - return request('delete', data) - }, - // 获取仓库详情 - sysStoreDetail(data) { - return request('detail', data, 'get') - }, - - // 获取仓库 树选择器 - sysStoreSelector(data, isTop = false) { - let res = this.sysStoreTree(data); - if(isTop){ - res = [ - { - id: 0, - parentId: '-1', - name: '顶级', - children: res ? res : [] - } - ] - } - return res; - }, -} diff --git a/src/api/base/wx/officialAccountApi.js b/src/api/base/wx/officialAccountApi.js index da6970c..89850d2 100644 --- a/src/api/base/wx/officialAccountApi.js +++ b/src/api/base/wx/officialAccountApi.js @@ -6,11 +6,11 @@ const request = (url, ...arg) => baseRequest(`/wx/officialaccount/` + url, ...ar * 公众号Api接口管理器 * * @author Luck - * @date 2024/07/24 20:01 + * @date 2024/07/25 11:03 **/ export default { // 获取公众号分页 - officialAccountPage(data) { + page(data) { return request('page', data, 'get') }, // 提交公众号表单 edit为true时为编辑，默认为新增 diff --git a/src/api/baseData/unit/unitApi.js b/src/api/baseData/unit/unitApi.js deleted file mode 100644 index 9275952..0000000 --- a/src/api/baseData/unit/unitApi.js +++ /dev/null @@ -1,28 +0,0 @@ -import { baseRequest } from '@/utils/request' - -const request = (url, ...arg) => baseRequest(`/base/sysunit/` + url, ...arg) - -/** - * 单位Api接口管理器 - * - * @author Luck - * @date 2024/07/23 11:36 - **/ -export default { - // 获取单位分页 - sysUnitPage(data) { - return request('page', data, 'get') - }, - // 提交单位表单 edit为true时为编辑，默认为新增 - sysUnitSubmitForm(data, edit = false) { - return request(edit ? 'edit' : 'add', data) - }, - // 删除单位 - sysUnitDelete(data) { - return request('delete', data) - }, - // 获取单位详情 - sysUnitDetail(data) { - return request('detail', data, 'get') - } -} diff --git a/src/components/DrawerForm/index.vue b/src/components/DrawerForm/index.vue deleted file mode 100644 index 6dc7cb6..0000000 --- a/src/components/DrawerForm/index.vue +++ /dev/null @@ -1,49 +0,0 @@ - - - - - diff --git a/src/components/DynamicForm/index.vue b/src/components/DynamicForm/index.vue index 974350a..6ed391e 100644 --- a/src/components/DynamicForm/index.vue +++ b/src/components/DynamicForm/index.vue @@ -1,15 +1,9 @@ + + diff --git a/src/components/SearchForm/index.vue b/src/components/SearchForm/index.vue deleted file mode 100644 index a047c8a..0000000 --- a/src/components/SearchForm/index.vue +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - diff --git a/src/components/Table/index.vue b/src/components/Table/index.vue index 522ebc0..25321cf 100644 --- a/src/components/Table/index.vue +++ b/src/components/Table/index.vue @@ -118,8 +118,8 @@ typeof props.alert === 'boolean' && props.alert ? clearSelected() : props.alert.clear && typeof props.alert.clear === 'function' - ? props.alert.clear() - : null + ? props.alert.clear() + : null ) " > @@ -140,6 +140,7 @@ emit('expand', expanded, record) } " + @resizeColumn="handleResizeColumn" :rowClassName=" (record, index) => (data.localSettings.rowClassNameSwitch ? ((index + 1) % 2 == 0 ? 'odd' : '') : null) " @@ -283,6 +284,11 @@ } ) + // 收缩列 + const handleResizeColumn = (w, col) => { + col.width = w + } + // 表格props const renderTableProps = ref([]) // 右上角工具数组 @@ -569,7 +575,7 @@ size: data.customSize, // 注意这个size是a-table组件需要的，这里不能跟别的地方成为compSize columns: data.columnsSetting.filter((value) => value.checked === undefined || value.checked), ...data.localSettings, - scroll: {x: 100, y: 1000} + scroll: { x: 100 } } // 将值为 undefined 或者 null 的 table里props属性进行一个过滤 renderTableProps.value = Object.entries(renderProps).reduce((x, [y, z]) => (z == null ? x : ((x[y] = z), x)), {}) @@ -638,20 +644,7 @@ }) onMounted(() => { init() - - window.addEventListener('resize', () => { - console.log('屏幕发生变换') - }) }) - - - - onBeforeUnmount(() => { - window.removeEventListener('resize', () => { - console.log('屏幕发生变换') - - }); - }); diff --git a/src/views/basicData/unit/formData/SearchForm.js b/src/views/basicData/unit/formData/SearchForm.js deleted file mode 100644 index fc11a9e..0000000 --- a/src/views/basicData/unit/formData/SearchForm.js +++ /dev/null @@ -1,26 +0,0 @@ -export const SearchFields = [ - { label: '名称', name: 'name', type: 'input', placeholder: '请输入名称' }, - { - label: '状态', - name: 'state', - type: 'select', - placeholder: '请选择状态', - options: [ - { label: 'Active', value: 'active' }, - { label: 'Inactive', value: 'inactive' } - ] - }, - { label: '编码', name: 'number', type: 'input', placeholder: '请输入编码' }, - { - label: '是否基本单位', - name: 'isBase', - type: 'select', - placeholder: '请选择是否基本单位', - options: [ - { label: '是', value: true }, - { label: '否', value: false } - ], - advanced: true - }, - { label: '单位组id', name: 'unitGroupId', type: 'input', placeholder: '请输入单位组id', advanced: true } -] diff --git a/src/views/basicData/unit/index.vue b/src/views/basicData/unit/index.vue index e2b8eaa..146c6d4 100644 --- a/src/views/basicData/unit/index.vue +++ b/src/views/basicData/unit/index.vue @@ -1,50 +1,98 @@