ptw

src/views/pms/qhse/ptw/index.vue

@@ -360,7 +360,7 @@
           <template #default="scope">
             <el-radio
               :model-value="selectedPerson"
-              :label="scope.row.userName"
+              :label="scope.row.id"
               @change="handleRadioChange(scope.row)">
               &nbsp;
             </el-radio>
@@ -861,7 +861,8 @@ onMounted(async () => {
 
 let personDialogVisible = ref(false)
 let certList = ref([])
-const selectedPerson = ref<string | undefined>(undefined)
+const selectedPerson = ref<number | undefined>(undefined)
+const selectedPersonRow = ref<any>()
 
 const getCertificateTypeText = (type: string) => {
   const map: Record<string, string> = {
@@ -907,20 +908,21 @@ const confirmSelectMeasure = () => {
 
   // 将选中的仪器信息填入表单
   if (personType.value == 'workPerson') {
-    formData.value.workPerson = selectedPerson.value
+    formData.value.workPerson = selectedPersonRow.value?.userName || ''
   }
 
   if (personType.value == 'guardian') {
-    formData.value.guardian = selectedPerson.value
+    formData.value.guardian = selectedPersonRow.value?.userName || ''
   }
 
   if (personType.value == 'workDuty') {
-    formData.value.workDuty = selectedPerson.value
+    formData.value.workDuty = selectedPersonRow.value?.userName || ''
   }
 
   // 关闭选择仪器对话框
   personDialogVisible.value = false
   selectedPerson.value = undefined
+  selectedPersonRow.value = undefined
 }
 
 let personDialog = ref('')
@@ -933,12 +935,15 @@ const selectworkPerson = (type) => {
   } else if (type == 'workDuty') {
     personDialog.value = '选择作业负责人'
   }
+  selectedPerson.value = undefined
+  selectedPersonRow.value = undefined
   personDialogVisible.value = true
   getCertList()
 }
 
 const handleRadioChange = (row: any) => {
-  selectedPerson.value = row.userName
+  selectedPerson.value = row.id
+  selectedPersonRow.value = row
   // selectedMeasure.value = row
 }