From 1446994d504819c367e1ff667360eadb314f9ac6 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 18 十月 2026 16:52:18 +0800
Subject: [PATCH] 修改了诊室工号

---
 src/views/ecg/doctor/components/RoutinePanel.vue |   83 +++++++++++++++++++++++++++++++----------
 1 files changed, 63 insertions(+), 20 deletions(-)

diff --git a/src/views/ecg/doctor/components/RoutinePanel.vue b/src/views/ecg/doctor/components/RoutinePanel.vue
index cc50adb..de37be3 100644
--- a/src/views/ecg/doctor/components/RoutinePanel.vue
+++ b/src/views/ecg/doctor/components/RoutinePanel.vue
@@ -22,7 +22,7 @@
       </el-col>
       <el-col :span="6">
         <el-form-item label="鎮h�呭鍚�" prop="patName">
-          <el-input v-model="formData.episodeId" placeholder="璇疯緭鍏ユ偅鑰呭鍚�" />
+          <el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭鍚�" />
         </el-form-item>
       </el-col>        
     </el-row>
@@ -62,6 +62,11 @@
     锛堟浘灏濊瘯璁� el-table 鍐呴儴婊氬姩浠ュ浐瀹氳〃澶达紝浣嗘湰椤圭洰 Element Plus 2.7.0 涓�
        height/maxHeight 鍧囨湭鐢熸晥锛屽凡鍥為��锛岃瑙併�婇儴缃叉竻鍗曘��5.3.15銆傦級
   -->
+  <!-- 銆愭湰娆¢渶姹傘�戞搷浣滃姛鑳藉尯涓庡凡瀹屾垚璁板綍涔嬮棿鐨勬爣棰樻爮 -->
+  <div class="records-title">
+    <span class="records-title__bar"></span>
+    <span class="records-title__text">宸插畬鎴愬垪琛�</span>
+  </div>
   <div class="records-host">
     <ContentWrap class="records-wrap">
       <el-table
@@ -92,7 +97,9 @@
       </el-table-column>
       <el-table-column label="妫�鏌ョ姸鎬�" align="center" prop="lost">
         <template #default="scope">
-          <span v-if="scope.row.jobType === 60">宸叉鏌�</span>
+          <!-- 銆愭湰闇�姹傘�戝畬鎴愯鎾ら攢杩囷細璇ユ潯璁板綍鏄剧ず銆屽凡鎾ら攢銆嶏紱鍐嶆瀹屾垚鏃跺悗绔� undone 鑷姩鍙樺洖 false -->
+          <el-tag v-if="scope.row.undone" type="danger" size="small">宸叉挙閿�</el-tag>
+          <span v-else-if="scope.row.jobType === 60">宸叉鏌�</span>
           <span v-if="scope.row.jobType === 50">宸叉斁寮�</span>
         </template>
       </el-table-column>
@@ -218,6 +225,10 @@
   formData.value.seqNum = queueVO?.seqNum
   formData.value.status = queueVO?.status
   formData.value.patSrc = queueVO?.patSrc
+  // 銆愭湰娆′慨澶嶃�戞潯鐮�/鎵撳嵃灏忕エ渚濊禆 patDetails锛堝惈 source/appointmentId锛夛紝
+  // 闃熷垪琛屾湰灏卞甫鐫�瀹冿紱鍘熷厛鍙湪 getFreeRentInfo() 鏌ュ埌"寰呮鏌ュ崟"鏃舵墠璧嬪�硷紝
+  // 瀵艰嚧缁濆ぇ澶氭暟鎯呭喌涓� patDetails 涓� undefined 鈫� 鏉$爜涓嶆樉绀恒��
+  formData.value.patDetails = queueVO?.patDetails
   formData.value.patMobile = queueVO?.patMobile
   formData.value.patPhone = queueVO?.patPhone
   formData.value.patWardDesc = queueVO?.patWardDesc
@@ -230,7 +241,7 @@
   getFreeRentInfo(formData.value)
   copyBarcode()
 }
-defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
+defineExpose({ setPatient, getList: () => getList() }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
 
 const { t } = useI18n() // 鍥介檯鍖�
 const message = useMessage() // 娑堟伅寮圭獥
@@ -594,13 +605,16 @@
 const getDisplayBarcode = (): string => {
   if (formData.value.checkType == null) return ''
 
-  const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
-  if (
-    formData.value.patDetails == null ||
-    formData.value.patDetails.source == null ||
-    !displayBarcode.includes(formData.value.patDetails.source)
-  )
-    return ''
+  // 銆愭湰娆′慨澶嶃�戙�屾偅鑰呮潯鐮佹樉绀恒�嶆湭閰嶇疆锛坣ull/绌猴級鈫� 涓嶆樉绀猴紙鎸夌幇鍦虹‘璁ゅ彛寰勶級
+  const displayBarcode: number[] | undefined = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
+  if (displayBarcode == null || displayBarcode.length === 0) return ''
+
+  // 銆愭湰娆′慨澶嶃�戞潵婧愪紭鍏堝彇 patDetails.source锛岀己澶辨椂鍥為��鍒板钩閾虹殑 patSrc銆�
+  // 鍘熸潵鍙 patDetails.source锛岃�� patDetails 鍘熷厛鍙湪"鑳芥煡鍒板緟妫�鏌ュ崟"鏃舵墠琚祴鍊硷紝
+  // 澶у鏁版儏鍐典笅鏄� undefined 鈫� 鏉$爜姘歌繙涓嶆樉绀恒��
+  const patSource = formData.value.patDetails?.source ?? formData.value.patSrc
+  if (patSource == null) return ''
+  if (!displayBarcode.map(Number).includes(Number(patSource))) return ''
 
   return getBarcode()
 }
@@ -608,11 +622,12 @@
 const getBarcode = (): string => {
   if (formData.value.checkType == null) return ''
 
-  const patSource = formData.value.patDetails?.source
+  const patSource = formData.value.patDetails?.source ?? formData.value.patSrc
   if (patSource == null) return ''
 
-  if (1 === patSource || 2 === patSource) return formData.value.applyNo ?? ''
-  else if (3 === patSource || 4 === patSource) return formData.value.episodeId ?? ''
+  // 闂ㄨ瘖/鎬ヨ瘖 鈫� 鐢宠鍗曞彿锛涗綇闄�/浣撴 鈫� 灏辫瘖娴佹按鍙�
+  if (1 === Number(patSource) || 2 === Number(patSource)) return formData.value.applyNo ?? ''
+  else if (3 === Number(patSource) || 4 === Number(patSource)) return formData.value.episodeId ?? ''
 
   return ''
 }
@@ -630,6 +645,28 @@
 </script>
 
 <style scoped lang="scss">
+
+/* 銆愭湰娆¢渶姹傘�戙�屽凡瀹屾垚鍒楄〃銆嶆爣棰樻爮锛氬乏渚т富鑹茬珫绾� + 鍔犵矖灏忔爣棰橈紝绱у噾楂樺害涓嶆尋鍘嬭〃鏍� */
+.records-title {
+  display: flex;
+  align-items: center;
+  flex: none;
+  gap: 6px;
+  padding: 2px 0 6px;
+
+  &__bar {
+    width: 3px;
+    height: 14px;
+    background-color: var(--el-color-primary);
+    border-radius: 2px;
+  }
+
+  &__text {
+    font-size: 14px;
+    font-weight: 600;
+    color: var(--el-text-color-primary);
+  }
+}
 /* ==========================================================================
    闇�姹傦細琛ㄥ崟鍐呭鎸ゅ崰浜嗕笅鏂硅褰曡〃鏍肩殑绌洪棿 鈥斺�� 鍘嬬缉琛岄棿璺濄��
    Element Plus 榛樿 `.el-form-item { margin-bottom: 18px }`锛�
@@ -681,15 +718,21 @@
 .patient-actions {
   display: flex;
   flex: none;
-  flex-wrap: nowrap;
+  /* 鎸夐挳澶氭椂鍏佽鎹㈣锛岄伩鍏嶆尋鍦ㄤ竴琛岋紙妫�鏌ラ〉鏈�澶� 6 涓寜閽級 */
+  flex-wrap: wrap;
   gap: 8px;
   align-items: center;
-  /* 涓婁笅鐣欑櫧 + 鍒嗛殧绾匡紝褰㈡垚鐙珛鍔熻兘鍧� */
-  padding: 6px 4px;
-  margin-bottom: 6px;
-  background-color: var(--el-bg-color);
-  border-top: 1px solid var(--el-border-color-lighter);
-  border-bottom: 1px solid var(--el-border-color-lighter);
+  /*
+    銆愭湰娆¢渶姹傘�戞搷浣滃姛鑳藉尯鍋氫竴鐐硅瑙夊尯鍒嗭紝鏂逛究鍖荤敓涓�鐪煎畾浣嶏細
+    鏋佹祬鐨勪富鑹插簳 + 缁嗚竟妗� + 宸︿晶 3px 涓昏壊绔栨潯锛堜笌銆屸枎宸插畬鎴愬垪琛ㄣ�嶆爣棰樻潯鍚屾璇█锛夈��
+    鍙仛"绋嶆湁鍖哄垎"锛屼笉鏀规寜閽湰韬殑灏哄/棰滆壊/椤哄簭銆�
+  */
+  padding: 8px 10px;
+  margin: 2px 0 10px;
+  background-color: var(--el-color-primary-light-9);
+  border: 1px solid var(--el-color-primary-light-7);
+  border-left: 3px solid var(--el-color-primary);
+  border-radius: 4px;
 
   /* Element Plus 缁欑浉閭� el-button 榛樿鍔犱簡 margin-left:12px锛屼細涓� gap 鍙犲姞锛屾竻鎺� */
   :deep(.el-button + .el-button) {

--
Gitblit v1.9.3