From b517aec7d753c241a8633df6009f2a3240f49638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Sat, 7 Oct 2023 10:40:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/xxjj/businessWarehouse/index.ts | 8 +- .../views/xxjj/businessOrganization/index.vue | 2 +- .../BusinessTree.vue | 2 + .../businessWarehouse.data.ts | 87 +++++-------------- .../views/xxjj/businessWarehouse/index.vue | 6 +- .../BusinessWarehouseController.java | 8 ++ .../controller/admin/dept/DeptController.java | 12 +++ .../admin/dept/vo/dept/DeptSimpleRespVO.java | 2 + .../BusinessWarehouseMapper.java | 25 ++++++ .../BusinessWarehouseService.java | 8 ++ .../BusinessWarehouseServiceImpl.java | 5 ++ 11 files changed, 96 insertions(+), 69 deletions(-) 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 d254b0a..af5d2ff 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 @@ -1,4 +1,5 @@ import { defHttp } from '@/utils/http/axios' +import { handleTree } from '@/utils/tree' // 查询业务线/仓库列表 export function getBusinessWarehousePage(params) { @@ -32,5 +33,10 @@ export function exportBusinessWarehouse(params) { // 查询业务线（精简)列表 export function listSimpleBusiness() { - return defHttp.get({ url: '/system/business-warehouse/list-all-simple' }) + return defHttp.get({ url: '/system/business-warehouse/list-all-simple' }) } + + // 查询业务线列表 +export function getBusinessPage(params) { + return defHttp.get({ url: '/system/business-warehouse/business', params }) +} 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 6f072bd..7b768e4 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 @@ -50,7 +50,7 @@ const { createConfirm, createMessage } = useMessage() const [registerModal, { openModal }] = useModal() const [registerTable, { getForm, reload }] = useTable({ - title: '业务线列表', + title: '业务组织列表', api: getBusinessWarehousePage, columns, formConfig: { labelWidth: 120, schemas: searchFormSchema }, diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/BusinessTree.vue b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/BusinessTree.vue index 200b9f1..c91be10 100644 --- a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/BusinessTree.vue +++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/BusinessTree.vue @@ -15,6 +15,8 @@ const treeData = ref([]) async function fetch() { const res = await listSimpleBusiness() treeData.value = handleTree(res, 'id') + console.log('res',res); + console.log('treeData',treeData.value) } function handleSelect(keys) { diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/businessWarehouse.data.ts b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/businessWarehouse.data.ts index 0542cdd..473d824 100644 --- a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/businessWarehouse.data.ts +++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/businessWarehouse.data.ts @@ -1,5 +1,20 @@ import { BasicColumn, FormSchema, useRender } from '@/components/Table' import { DICT_TYPE, getDictOptions } from '@/utils/dict' +import { getListSimpleUsers } from '@/api/system/user' +import { listSimpleBusiness } from '@/api/xxjj/businessWarehouse' +import { handleTree,listToTree } from '@/utils/tree' + + +let users: any[] = [] +async function getUserList() { + const res = await listSimpleBusiness() + const result = handleTree(res, 'id') + listToTree(result) + console.log('result',result) + users = result +} + +await getUserList() export const columns: BasicColumn[] = [ { @@ -109,72 +124,16 @@ export const searchFormSchema: FormSchema[] = [ export const createFormSchema: FormSchema[] = [ { - label: '编号', - field: 'id', - show: false, - component: 'Input' - }, - { - label: '业务线编号', - field: 'businessCode', - required: true, - component: 'Input' - }, - { - label: '业务线名称', - field: 'name', + label: '成员', + field: 'memberUserIds', required: true, - component: 'Input' - }, - { - label: '业务线简称', - field: 'businessSimple', - component: 'Input' - }, - { - label: '类型', - field: 'type', - component: 'Select', + component: 'ApiTransfer', componentProps: { - options: getDictOptions(DICT_TYPE.BUSINESS_TYPE, 'number') - } - }, - { - label: '所属行业', - field: 'industry', - component: 'Select', - componentProps: { - options: getDictOptions(DICT_TYPE.DUTY_TYPE, 'number') - } - }, - { - label: '所在城市', - field: 'city', - component: 'Input' - }, - { - label: '成立时间', - field: 'establishDate', - component: 'DatePicker' - }, - { - label: '介绍', - field: 'description', - component: 'InputTextArea' - }, - { - label: '归属人员', - field: 'belongUserId', - component: 'Input' - }, - { - label: '区分标志', - field: 'diffFlag', - required: true, - component: 'Select', - componentProps: { - options: getDictOptions(DICT_TYPE.DIFF_FLAG, 'number') - } + api: () => listSimpleBusiness(), + showSearch: true, + labelField: 'name', + valueField: 'id', + }, }, ] diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/index.vue b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/index.vue index 6bf4ca8..9deb508 100644 --- a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/index.vue +++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/index.vue @@ -40,7 +40,7 @@ import { useModal } from '@/components/Modal' import BusinessWarehouseModal from './BusinessWarehouseModal.vue' import { IconEnum } from '@/enums/appEnum' import { BasicTable, useTable, TableAction } from '@/components/Table' -import { deleteBusinessWarehouse, exportBusinessWarehouse, getBusinessWarehousePage } from '@/api/xxjj/businessWarehouse' +import { deleteBusinessWarehouse, exportBusinessWarehouse, getBusinessWarehousePage, getBusinessPage} from '@/api/xxjj/businessWarehouse' import { columns, searchFormSchema } from './businessWarehouse.data' defineOptions({ name: 'BusinessWarehouse' }) @@ -50,8 +50,8 @@ const { createConfirm, createMessage } = useMessage() const [registerModal, { openModal }] = useModal() const [registerTable, { getForm, reload }] = useTable({ - title: '业务线/仓库列表', - api: getBusinessWarehousePage, + title: '业务线列表', + api: getBusinessPage, columns, formConfig: { labelWidth: 120, schemas: searchFormSchema }, useSearchForm: true, diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/BusinessWarehouseController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/BusinessWarehouseController.java index d4a98e8..e51c217 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/BusinessWarehouseController.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/BusinessWarehouseController.java @@ -93,6 +93,14 @@ public class BusinessWarehouseController { return success(BusinessWarehouseConvert.INSTANCE.convertPage(pageResult)); } + @GetMapping("/business") + @Operation(summary = "获得业务线分页") + @PreAuthorize("@ss.hasPermission('system:business-warehouse:business')") + public CommonResult> getBusinessPage(@Valid BusinessWarehousePageReqVO pageVO) { + PageResult pageResult = businessWarehouseService.getBusinessPage(pageVO); + return success(BusinessWarehouseConvert.INSTANCE.convertPage(pageResult)); + } + @GetMapping("/export-excel") @Operation(summary = "导出业务线表 Excel") @PreAuthorize("@ss.hasPermission('system:business-warehouse:export')") diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java index 360ef8f..3a7f949 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java @@ -90,4 +90,16 @@ public class DeptController { return success(DeptConvert.INSTANCE.convert(deptService.getDept(id))); } + @GetMapping("/list-user-simple") + @Operation(summary = "获取部门用户精简信息列表", description = "只包含被开启的部门，主要用于前端的下拉选项") + public CommonResult> getSimpleDeptUserList() { + // 获得部门列表，只要开启状态的 + DeptListReqVO reqVO = new DeptListReqVO(); + reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); + List list = deptService.getDeptList(reqVO); + // 排序后，返回给前端 + list.sort(Comparator.comparing(DeptDO::getSort)); + return success(DeptConvert.INSTANCE.convertList02(list)); + } + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java index c1b8987..a9b1ba5 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java @@ -23,4 +23,6 @@ public class DeptSimpleRespVO { @Schema(description = "父部门 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long parentId; + + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java index 78d671f..7b38bde 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java @@ -75,4 +75,29 @@ public interface BusinessWarehouseMapper extends BaseMapperX selectBusinessPage(BusinessWarehousePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(BusinessWarehouseDO::getBusinessCode, reqVO.getBusinessCode()) + .likeIfPresent(BusinessWarehouseDO::getName, reqVO.getName()) + .eqIfPresent(BusinessWarehouseDO::getBusinessSimple, reqVO.getBusinessSimple()) + .eqIfPresent(BusinessWarehouseDO::getBusinessLogo, reqVO.getBusinessLogo()) + .eqIfPresent(BusinessWarehouseDO::getParentId, reqVO.getParentId()) + .eqIfPresent(BusinessWarehouseDO::getType, reqVO.getType()) + .eqIfPresent(BusinessWarehouseDO::getStatus, reqVO.getStatus()) + .eqIfPresent(BusinessWarehouseDO::getInstitutionNum, reqVO.getInstitutionNum()) + .eqIfPresent(BusinessWarehouseDO::getEmployeeNum, reqVO.getEmployeeNum()) + .eqIfPresent(BusinessWarehouseDO::getIndustry, reqVO.getIndustry()) + .eqIfPresent(BusinessWarehouseDO::getCity, reqVO.getCity()) + .betweenIfPresent(BusinessWarehouseDO::getEstablishDate, reqVO.getEstablishDate()) + .eqIfPresent(BusinessWarehouseDO::getBelongUserId, reqVO.getBelongUserId()) + .likeIfPresent(BusinessWarehouseDO::getBrandName, reqVO.getBrandName()) + .eqIfPresent(BusinessWarehouseDO::getPhone, reqVO.getPhone()) + .eqIfPresent(BusinessWarehouseDO::getDiffFlag, "0") + .eqIfPresent(BusinessWarehouseDO::getFax, reqVO.getFax()) + .eqIfPresent(BusinessWarehouseDO::getUrl, reqVO.getUrl()) + .eqIfPresent(BusinessWarehouseDO::getDescription, reqVO.getDescription()) + .betweenIfPresent(BusinessWarehouseDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(BusinessWarehouseDO::getId)); + } + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java index cc5e2c9..3f8fcc0 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java @@ -59,6 +59,14 @@ public interface BusinessWarehouseService { */ PageResult getBusinessWarehousePage(BusinessWarehousePageReqVO pageReqVO); + /** + * 获得业务线分页 + * + * @param pageReqVO 分页查询 + * @return 业务线表分页 + */ + PageResult getBusinessPage(BusinessWarehousePageReqVO pageReqVO); + /** * 获得业务线表列表, 用于 Excel 导出 * diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java index eda6b62..b84f203 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java @@ -74,6 +74,11 @@ public class BusinessWarehouseServiceImpl implements BusinessWarehouseService { return businessWarehouseMapper.selectPage(pageReqVO); } + @Override + public PageResult getBusinessPage(BusinessWarehousePageReqVO pageReqVO) { + return businessWarehouseMapper.selectBusinessPage(pageReqVO); + } + @Override public List getBusinessWarehouseList(BusinessWarehouseExportReqVO exportReqVO) { return businessWarehouseMapper.selectList(exportReqVO); 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 2/2] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E9=85=8D=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') }} +