yxh
2026-09-29 6ab4b1e0b68e4c347110e37018fa005603f53904
src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -29,11 +29,13 @@
        <el-input v-model="formData.patName" placeholder="请输入患者名称" />
      </el-form-item>
     </el-col>
     <!-- 需求1:患者信息 18 项统一展示(后端已从预约单平铺回填,setPatient 已赋值到 formData) -->
     <PatientInfoBlock :data="formData" check-type-field="checkType" :span="12" />
      <el-col :span="12">
  
      <el-form-item label="患者描述" prop="patDeptDesc">
        <dict-tag v-if="formData.patDetails?.source" :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData.patDetails?.source" />
        {{formData?.patDetails?.deptDesc}} {{formData?.patDetails?.wardDesc}} {{formData?.patDetails?.bedNo}}
        <dict-tag v-if="formData.patSrc ?? formData.patDetails?.source" :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData.patSrc ?? formData.patDetails?.source" />
        {{ formData.patWardDesc || formData?.patDetails?.wardDesc || '-' }} {{ formData.patBedNo || formData?.patDetails?.bedNo || '-' }}
      </el-form-item>
           </el-col>
      <el-col :span="12">
@@ -58,8 +60,8 @@
           </el-col>
      <el-col :span="12">
       <el-form-item label="多耐药" prop="tolerance">
         <el-tag type="info" v-if="formData.tolerance == 0">否</el-tag>
        <el-tag type="danger" v-else>是</el-tag>
         <!-- 需求6:统一走字典 ecg_tolerance(0=无 1=多耐 2=多重耐药);NULL 按"无"显示(Q12) -->
         <dict-tag :type="DICT_TYPE.ECG_TOLERANCE" :value="formData.tolerance ?? 0" />
        </el-form-item>
             </el-col>
      </el-row>
@@ -174,6 +176,8 @@
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import {tranlateDevState} from "@/utils/statusFormatter";
import {getCheckTypeName, needAutoFeeConfirm} from "../../../../utils/checkTypeFormatter";
// 需求1:患者信息 18 项统一展示块
import PatientInfoBlock from "@/views/ecg/doctor/components/PatientInfoBlock.vue";
/** 设备领用 表单 */
defineComponent({ name: 'DevReadyPanel' })
@@ -312,6 +316,26 @@
    remark: undefined,
    patDetails: undefined,
    paid: undefined,
    // 需求1:PatientInfoBlock 依赖的平铺字段,先初始化为 undefined,
    // 随后由 setPatient 从 QueueVO 赋值(不初始化会读不到属性)
    applyNo: undefined,
    episodeId: undefined,
    patGender: undefined,
    patBirthday: undefined,
    registerDate: undefined,
    doctor: undefined,
    doctorTime: undefined,
    patSrc: undefined,
    patMobile: undefined,
    patPhone: undefined,
    patWardDesc: undefined,
    patBedNo: undefined,
    medicalCard: undefined,
    doctorAdviceNo: undefined,
    outpatientNo: undefined,
    patIdentityId: undefined,
    status: undefined,
    seqNum: undefined,
  }
  formRef.value?.resetFields()
@@ -331,6 +355,23 @@
  formData.value.patName = queueVO?.patName
  formData.value.checkType = queueVO?.bookCheckType
  formData.value.tolerance = queueVO?.tolerance // 多耐药,后端从预约单补齐
  // 需求1:以下平铺字段由后端从预约单回填到 QueueRespVO,
  // 必须显式赋值给 formData,否则模板里读不到(原先只赋值了上面 6 个)。
  formData.value.patGender = queueVO?.patGender
  formData.value.patBirthday = queueVO?.patBirthday
  formData.value.registerDate = queueVO?.registerDate
  formData.value.doctor = queueVO?.doctor
  formData.value.doctorTime = queueVO?.doctorTime
  formData.value.patSrc = queueVO?.patSrc
  formData.value.patMobile = queueVO?.patMobile
  formData.value.patPhone = queueVO?.patPhone
  formData.value.patWardDesc = queueVO?.patWardDesc
  formData.value.patBedNo = queueVO?.patBedNo
  formData.value.medicalCard = queueVO?.medicalCard
  formData.value.outpatientNo = queueVO?.outpatientNo
    // 需求1:医嘱号(此前 3 个面板都遗漏了该字段的赋值,导致 PatientInfoBlock 恒显示 '-')
    formData.value.doctorAdviceNo = queueVO?.doctorAdviceNo
  formData.value.patIdentityId = queueVO?.patIdentityId
  getFreeRentInfo(formData.value)  // 待检查的信息  @ dev_rent 表
  copyBarcode()
}