adtec-core-package 2.1.0 → 2.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "private": false,
   "type": "module",
   "scripts": {

package/src/components/business/comp.selectUser.vue

@@ -3,7 +3,7 @@
 <!--修改时间: 2024/11/8 上午10:33-->
 <template>
   <el-drawer v-model="dialogVisible" :title="title" size="850px" @close="dialogVisible = false">
-    <userForm ref="ref_form" :fetch-data="fetchData"  @success="success" :defalut-query-param="defalutQueryParam"></userForm>
+    <userForm ref="ref_form" :multiple="multiple" :fetch-data="fetchData"  @success="success" :defalut-query-param="defalutQueryParam"></userForm>
     <template #footer>
       <el-button @click="dialogVisible = false">取消</el-button>
       <el-button type="primary" @click="confirm">确定</el-button>
@@ -26,6 +26,7 @@ interface Props<T extends IpageDataQuery, E extends IMdmEmployee> {
   fetchData?: (data: T) => Promise<PageData<E>>
   defalutQueryParam?: any
   diagLogLoading?: boolean
+  multiple?: boolean
 }
 
 const props = withDefaults(defineProps<Props<IMdmEmployeeQuery, IMdmEmployee>>(), {
@@ -33,6 +34,7 @@ const props = withDefaults(defineProps<Props<IMdmEmployeeQuery, IMdmEmployee>>()
   fetchData: EmployeeInfoApi.getMdmEmployeeListByIds,
   defalutQueryParam: {},
   diagLogLoading: false,
+  multiple: true
 })
 watch(
   () => props.modelValue,

package/src/components/business/comp.userForm.vue

@@ -21,6 +21,7 @@
           <el-tree-select
             ref="ref_tree"
             check-strictly
+            :disabled="queryParam.disabled"
             v-model="queryParam.deptIds"
             :data="orgDeptTree"
             filterable
@@ -92,14 +93,14 @@
             style="display: flex; justify-content: center; align-items: center; padding-left: 8px"
           >
             <el-radio v-model="checkId" :label="scope.row.id" @change="handleRadioChange(scope.row)"
-              ><span></span
+            ><span></span
             ></el-radio>
           </div>
         </template>
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" label="用户姓名" prop="name" width="120" />
-      <el-table-column :show-overflow-tooltip="true" label="岗位名称" prop="postName" width="120" />
-      <el-table-column :show-overflow-tooltip="true" label="所属部门" prop="deptName" />
+      <el-table-column :show-overflow-tooltip="true" label="用户姓名" prop="name" width="120"/>
+      <el-table-column :show-overflow-tooltip="true" label="岗位名称" prop="postName" width="120"/>
+      <el-table-column :show-overflow-tooltip="true" label="所属部门" prop="deptName"/>
       <el-table-column
         :show-overflow-tooltip="true"
         label="所属组织"
@@ -119,16 +120,16 @@
   </el-flex>
 </template>
 <script lang="ts" setup>
-import { useVModel } from '@vueuse/core'
-import type { IMdmEmployeeQuery } from '../../interface/IMdmEmployeeQuery'
-import { nextTick, onMounted, ref, watch } from 'vue'
-import type { IpageDataQuery, PageData } from '../../interface//PageData'
-import type { IMdmEmployee } from '../../interface/IMdmEmployee'
-import { ElMessage, ElTooltip, type TableInstance, type TreeNode } from 'element-plus'
+import {useVModel} from '@vueuse/core'
+import type {IMdmEmployeeQuery} from '../../interface/IMdmEmployeeQuery'
+import {nextTick, onMounted, ref, watch} from 'vue'
+import type {IpageDataQuery, PageData} from '../../interface//PageData'
+import type {IMdmEmployee} from '../../interface/IMdmEmployee'
+import {ElMessage, ElTooltip, type TableInstance, type TreeNode} from 'element-plus'
 import deptInfoApi from '../../api/DeptInfoApi'
-import type { IOrgDeptInfo } from '../../interface/IOrgDeptInfo'
+import type {IOrgDeptInfo} from '../../interface/IOrgDeptInfo'
 import EmployeeInfoApi from '../../api/EmployeeInfoApi'
-import { useResetRefHooks } from '../../hooks/useResetRefHooks'
+import {useResetRefHooks} from '../../hooks/useResetRefHooks'
 import frameworkUtils from '../../utils/FrameworkUtils'
 
 // 明确指定 Props 的泛型参数类型
@@ -143,17 +144,15 @@ const props = withDefaults(defineProps<Props<IMdmEmployeeQuery, IMdmEmployee>>()
   fetchData: EmployeeInfoApi.getMdmEmployeeListByIds,
   defalutQueryParam: {
     disabled: false,
-    deptIds: [],
+    deptIds: []
   },
   multiple: true,
   showOrgInfo: true,
 })
-const [queryParam, resetQueryParam] = useResetRefHooks<IMdmEmployeeQuery>({
-  current: 1,
-  size: frameworkUtils.getPageSize(),
-  disabled: props.defalutQueryParam.disabled,
-  deptIds: props.defalutQueryParam.deptIds,
-})
+const [queryParam, resetQueryParam] = useResetRefHooks<IMdmEmployeeQuery>({...{
+    current: 1,
+    size: frameworkUtils.getPageSize()
+  }, ...props.defalutQueryParam})
 const emit = defineEmits(['success'])
 const orgDeptTree = ref<IOrgDeptInfo[]>([])
 const loading = ref(false)
@@ -187,7 +186,7 @@ const handleRadioChange = (row: IMdmEmployee) => {
 }
 const renderTreeNode = (
   h: (type: any, props: any, children: any) => any,
-  { node, data }: { node: TreeNode; data: IOrgDeptInfo },
+  {node, data}: { node: TreeNode; data: IOrgDeptInfo },
 ) => {
   return [
     h(
@@ -236,8 +235,7 @@ const resetQuery = async () => {
   queryRef.value?.resetFields()
   ref_tree.value?.setCheckedKeys([])
   resetQueryParam()
-  queryParam.value.deptIds = props.defalutQueryParam.deptIds
-  queryParam.value.disabled = props.defalutQueryParam.disabled
+  queryParam.value = {...queryParam.value,...props.defalutQueryParam}
   nextTick(() => {
     ref_tree.value?.setCheckedKeys(queryParam.value.deptIds ?? [])
     handleQuery()

package/src/interface/IMdmEmployee.ts

@@ -147,4 +147,7 @@ export interface IMdmEmployee extends BaseEntity{
   postCode?: string
   deptId?:string
   postId?:string
+  topDeptName?:string
+  topDeptId?:string
+  topDeptCode?: string
 }

package/src/interface/IMdmEmployeeQuery.ts

@@ -17,4 +17,5 @@ export interface IMdmEmployeeQuery extends IpageDataQuery {
   codeorname?: string
   postIds?: string[]
   disabled?: boolean
+  showTopDept?: string
 }