diff --git a/src/components/OrgSelector/orgItem.vue b/src/components/OrgSelector/orgItem.vue index 2d04e20..0444cb5 100644 --- a/src/components/OrgSelector/orgItem.vue +++ b/src/components/OrgSelector/orgItem.vue @@ -9,7 +9,7 @@ :type="item.type === 'dept' ? 'primary' : item.type === 'user' ? 'warning' : 'success'" size="large" > - {{ item.name }} + {{ getDisplayName(item) }} @@ -28,6 +28,16 @@ let props = defineProps({ }, }); +const getDisplayName = (item) => { + if (item.type === 'user') { + const commonDeptName = item.commonDeptName || ''; + const realName = item.realName || item.name || ''; + const teacherNo = item.teacherNo || item.username || ''; + return commonDeptName ? `${commonDeptName} - ${realName} (${teacherNo})` : `${realName} (${teacherNo})`; + } + return item.name; +}; + const removeItem = (index, id, type) => { emits( 'update:data', diff --git a/src/components/OrgSelector/selectBox.vue b/src/components/OrgSelector/selectBox.vue index 24a3bfb..d229f15 100644 --- a/src/components/OrgSelector/selectBox.vue +++ b/src/components/OrgSelector/selectBox.vue @@ -62,7 +62,11 @@
-
{{ item.name }}
+
+ {{ item.commonDeptName }} - + {{ item.realName || item.name }} + ({{ item.teacherNo }}) +
diff --git a/src/components/OrgSelector/selectResult.vue b/src/components/OrgSelector/selectResult.vue index e5078be..8c314d3 100644 --- a/src/components/OrgSelector/selectResult.vue +++ b/src/components/OrgSelector/selectResult.vue @@ -48,7 +48,11 @@
-
{{ item.name }}
+
+ {{ item.commonDeptName }} - + {{ item.realName || item.name }} + ({{ item.teacherNo }}) +
diff --git a/src/views/purchase/purchasingrequisition/accept/AcceptCommonForm.vue b/src/views/purchase/purchasingrequisition/accept/AcceptCommonForm.vue index 65151e1..67b6469 100644 --- a/src/views/purchase/purchasingrequisition/accept/AcceptCommonForm.vue +++ b/src/views/purchase/purchasingrequisition/accept/AcceptCommonForm.vue @@ -79,10 +79,10 @@ - {{ item.name }} + {{ item.commonDeptName ? item.commonDeptName + ' - ' : '' }}{{ item.realName || item.name }} {{ item.teacherNo }} @@ -105,10 +105,10 @@ - {{ item.name }} + {{ item.commonDeptName ? item.commonDeptName + ' - ' : '' }}{{ item.realName || item.name }} {{ item.teacherNo }} @@ -180,10 +180,10 @@ const syncFormFromModel = (val: Record | undefined) => { Object.assign(form, val || {}) // 加载已选人员信息用于回显 if (form.purchaserId && form.purchaserName) { - purchaserOptions.value = [{ teacherNo: form.purchaserId, name: form.purchaserName }] + purchaserOptions.value = [{ teacherNo: form.purchaserId, realName: form.purchaserName, name: form.purchaserName }] } if (form.assetAdminId && form.assetAdminName) { - assetAdminOptions.value = [{ teacherNo: form.assetAdminId, name: form.assetAdminName }] + assetAdminOptions.value = [{ teacherNo: form.assetAdminId, realName: form.assetAdminName, name: form.assetAdminName }] } } @@ -305,7 +305,7 @@ const onPurchaserChange = (teacherNo: string) => { const selected = purchaserOptions.value.find((item: any) => item.teacherNo === teacherNo) if (selected) { form.purchaserId = selected.teacherNo - form.purchaserName = selected.name + form.purchaserName = selected.realName || selected.name } } @@ -318,7 +318,7 @@ const onAssetAdminChange = (teacherNo: string) => { const selected = assetAdminOptions.value.find((item: any) => item.teacherNo === teacherNo) if (selected) { form.assetAdminId = selected.teacherNo - form.assetAdminName = selected.name + form.assetAdminName = selected.realName || selected.name } }