diff --git a/src/components/negativeInfo/police-dialog.vue b/src/components/negativeInfo/police-dialog.vue index f3132c4..5a318b2 100644 --- a/src/components/negativeInfo/police-dialog.vue +++ b/src/components/negativeInfo/police-dialog.vue @@ -46,7 +46,7 @@
姓名
{{ policeInfo.name || "/" }}
性别
{{ policeInfo.idCode ? getGenderFromIdCode(policeInfo.idCode) : "/" }}
年龄
{{ policeAge }}
-
所属单位
{{ activeRow.parentDepartName ? activeRow.parentDepartName + "/" : "" }}{{ activeRow.departName || "/" }}
+
所属单位
{{ departmentName }}
警号
{{ policeInfo.empNo || "/" }}
身份证号
{{ policeInfo.idCode || "/" }}
入职时间
{{ policeInfo.employmentDate || "/" }}
@@ -139,6 +139,11 @@ const emit = defineEmits(["update:modelValue"]); const time = ref([]); const policeInfo = ref({}); +const departmentInfo = ref({}); +const departmentName = computed(() => { + const info = departmentInfo.value.departName ? departmentInfo.value : props.activeRow; + return [info.parentDepartName, info.departName].filter(Boolean).join("/") || "/"; +}); const policeAge = computed(() => { const idCode = String(policeInfo.value.idCode || "").trim(); let birthText; @@ -225,6 +230,7 @@ async function getProfileData() { negativeList.value = data.negatives; policeInfo.value = data.policeInfo; + departmentInfo.value = { departName: data.departName, parentDepartName: data.parentDepartName }; negativeInfo.value = data.negativeInfo; problemSourcesPieOptions.value.series[0].data = data.problemSourcesList; problemSourcesPieOptions.value.title.text = String(data.negativeInfo.size ?? 0);