From c31ed02f9bf693ebc8859f0193afecdc118c886d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Mon, 9 Oct 2023 14:42:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BB=84=E7=BB=87=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/xxjj/businessWarehouse/index.ts | 7 +- .../src/views/system/dept/index.vue | 1 + .../src/views/system/user/user.data.ts | 1 + .../BusinessOrganizationModal.vue | 1 + .../businessOrganization.data.ts | 36 +++---- .../views/xxjj/businessOrganization/index.vue | 20 +++- .../BusinessTree.vue | 2 - .../businessWarehouse.data.ts | 78 +++++++++----- .../xxjj/businessOrganizationConfig/index.vue | 11 +- .../BusinessWarehouseModal.vue | 1 + .../businessWarehouse.data.ts | 36 +++---- .../views/xxjj/businessWarehouse/index.vue | 3 + .../mybatis/core/mapper/BaseMapperX.java | 3 +- .../system/enums/ErrorCodeConstants.java | 5 +- ...usinessEnterpriseRelationalController.java | 102 ++++++++++++++++++ .../BusinessEnterpriseRelationalBaseVO.java | 25 +++++ ...sinessEnterpriseRelationalCreateReqVO.java | 14 +++ .../BusinessEnterpriseRelationalExcelVO.java | 31 ++++++ ...sinessEnterpriseRelationalExportReqVO.java | 26 +++++ ...BusinessEnterpriseRelationalPageReqVO.java | 28 +++++ .../BusinessEnterpriseRelationalRespVO.java | 19 ++++ ...sinessEnterpriseRelationalUpdateReqVO.java | 18 ++++ .../BusinessUserRelationalController.java | 102 ++++++++++++++++++ .../vo/BusinessUserRelationalBaseVO.java | 25 +++++ .../vo/BusinessUserRelationalCreateReqVO.java | 14 +++ .../vo/BusinessUserRelationalExcelVO.java | 31 ++++++ .../vo/BusinessUserRelationalExportReqVO.java | 26 +++++ .../vo/BusinessUserRelationalPageReqVO.java | 28 +++++ .../vo/BusinessUserRelationalRespVO.java | 19 ++++ .../vo/BusinessUserRelationalUpdateReqVO.java | 18 ++++ .../BusinessWarehouseController.java | 8 ++ .../businesswarehouse/vo/BusinessUserVO.java | 44 ++++++++ .../BusinessEnterpriseRelationalConvert.java | 34 ++++++ .../BusinessUserRelationalConvert.java | 34 ++++++ .../BusinessEnterpriseRelationalDO.java | 39 +++++++ .../BusinessUserRelationalDO.java | 39 +++++++ .../BusinessEnterpriseRelationalMapper.java | 36 +++++++ .../BusinessUserRelationalMapper.java | 36 +++++++ .../BusinessWarehouseMapper.java | 24 +++++ .../BusinessEnterpriseRelationalService.java | 70 ++++++++++++ ...sinessEnterpriseRelationalServiceImpl.java | 82 ++++++++++++++ .../BusinessUserRelationalService.java | 70 ++++++++++++ .../BusinessUserRelationalServiceImpl.java | 82 ++++++++++++++ .../BusinessWarehouseService.java | 2 + .../BusinessWarehouseServiceImpl.java | 8 ++ 45 files changed, 1267 insertions(+), 72 deletions(-) create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/BusinessEnterpriseRelationalController.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalBaseVO.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalCreateReqVO.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExcelVO.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExportReqVO.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalPageReqVO.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalRespVO.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalUpdateReqVO.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/BusinessUserRelationalController.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalBaseVO.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalCreateReqVO.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalExcelVO.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalExportReqVO.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalPageReqVO.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalRespVO.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businessuserrelational/vo/BusinessUserRelationalUpdateReqVO.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessUserVO.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businessenterpriserelational/BusinessEnterpriseRelationalConvert.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businessuserrelational/BusinessUserRelationalConvert.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/businessenterpriserelational/BusinessEnterpriseRelationalDO.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/businessuserrelational/BusinessUserRelationalDO.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businessenterpriserelational/BusinessEnterpriseRelationalMapper.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businessuserrelational/BusinessUserRelationalMapper.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businessenterpriserelational/BusinessEnterpriseRelationalService.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImpl.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businessuserrelational/BusinessUserRelationalService.java create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businessuserrelational/BusinessUserRelationalServiceImpl.java diff --git a/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts b/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts index af5d2ff..31c76ba 100644 --- a/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts +++ b/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts @@ -34,9 +34,14 @@ export function exportBusinessWarehouse(params) { // 查询业务线(精简)列表 export function listSimpleBusiness() { return defHttp.get({ url: '/system/business-warehouse/list-all-simple' }) - } +} // 查询业务线列表 export function getBusinessPage(params) { return defHttp.get({ url: '/system/business-warehouse/business', params }) } + + // 查询业务组织列表 + export function getBusinessUserList(params) { + return defHttp.get({ url: '/system/business-warehouse/business-user', params }) +} diff --git a/yudao-ui-admin-vben-master/src/views/system/dept/index.vue b/yudao-ui-admin-vben-master/src/views/system/dept/index.vue index 42b2b2a..4ea0448 100644 --- a/yudao-ui-admin-vben-master/src/views/system/dept/index.vue +++ b/yudao-ui-admin-vben-master/src/views/system/dept/index.vue @@ -38,6 +38,7 @@ const [register, { expandAll, collapseAll, getForm, reload }] = useTable({ async function getList() { const res = await getDeptPage(getForm().getFieldsValue() as any) + console.log('dept',res) return handleTree(res, 'id') } diff --git a/yudao-ui-admin-vben-master/src/views/system/user/user.data.ts b/yudao-ui-admin-vben-master/src/views/system/user/user.data.ts index 87b0af2..5c8b3a6 100644 --- a/yudao-ui-admin-vben-master/src/views/system/user/user.data.ts +++ b/yudao-ui-admin-vben-master/src/views/system/user/user.data.ts @@ -30,6 +30,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'deptId', width: 120, customRender: ({ record }) => { + console.log('record',record) return useRender.renderTag(record.dept && record.dept.name) }, }, diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/BusinessOrganizationModal.vue b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/BusinessOrganizationModal.vue index 1f4d021..e63c365 100644 --- a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/BusinessOrganizationModal.vue +++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/BusinessOrganizationModal.vue @@ -45,6 +45,7 @@ async function handleSubmit() { if (unref(isUpdate)) { await updateBusinessWarehouse(values) } else { + values.diffFlag = 1 await createBusinessWarehouse(values) } closeModal() diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/businessOrganization.data.ts b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/businessOrganization.data.ts index 75d6aab..e6aaaf9 100644 --- a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/businessOrganization.data.ts +++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/businessOrganization.data.ts @@ -175,15 +175,15 @@ export const createFormSchema: FormSchema[] = [ field: 'description', component: 'InputTextArea' }, - { - label: '区分标志', - field: 'diffFlag', - required: true, - component: 'Select', - componentProps: { - options: getDictOptions(DICT_TYPE.DIFF_FLAG, 'number') - } - }, + // { + // label: '区分标志', + // field: 'diffFlag', + // required: true, + // component: 'Select', + // componentProps: { + // options: getDictOptions(DICT_TYPE.DIFF_FLAG, 'number') + // } + // }, ] export const updateFormSchema: FormSchema[] = [ @@ -246,13 +246,13 @@ export const updateFormSchema: FormSchema[] = [ field: 'belongUserId', component: 'Input' }, - { - label: '区分标志', - field: 'diffFlag', - required: true, - component: 'Select', - componentProps: { - options: getDictOptions(DICT_TYPE.DIFF_FLAG, 'number') - } - }, + // { + // label: '区分标志', + // field: 'diffFlag', + // required: true, + // component: 'Select', + // componentProps: { + // options: getDictOptions(DICT_TYPE.DIFF_FLAG, 'number') + // } + // }, ] \ No newline at end of file diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/index.vue b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/index.vue index 7b768e4..5c14c0f 100644 --- a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/index.vue +++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/index.vue @@ -8,6 +8,12 @@ {{ t('action.export') }} + + {{ t('component.tree.expandAll') }} + + + {{ t('component.tree.unExpandAll') }} +