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') }} +