From 09dc74e264b6262cbe41c9c8476e24705871d4a6 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 08 十一月 2026 23:31:17 +0800
Subject: [PATCH] yxh
---
src/views/ecg/checktype/QueueSequenceForm.vue | 112 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 80 insertions(+), 32 deletions(-)
diff --git a/src/views/ecg/checktype/QueueSequenceForm.vue b/src/views/ecg/checktype/QueueSequenceForm.vue
index 56844a0..bef3e84 100644
--- a/src/views/ecg/checktype/QueueSequenceForm.vue
+++ b/src/views/ecg/checktype/QueueSequenceForm.vue
@@ -13,15 +13,18 @@
<template #title>
<div class="text-13px leading-6">
姝ｅ湪缁存姢妫�鏌ラ」鐩細<b>{{ checkTypeName }}</b>
- <span class="text-gray-500">锛堟鏌ラ」鐩�� {{ checkTypeValue }}锛屽叡 {{ list.length }} 涓椂娈碉級</span>
+ <span class="text-gray-500">锛堟鏌ラ」鐩�� {{ checkTypeValue }}锛屽叡 {{ slotList.length }} 涓椂娈碉級</span>
</div>
</template>
<div class="text-12px leading-5">
- 路 <b>璧峰搴忓彿</b>锛氭瘡澶╄嚜鍔ㄩ噸缃椂鍥炲埌璇ュ�硷紱<b>涓婇檺</b>锛氬埌杈惧悗璇ユ椂娈佃涓恒�屽凡婊°�嶏紝鎮ｈ�呯鍒颁細椤哄欢鍒板悗缁椂娈点��<br />
- 路 <b>褰撳墠搴忓彿</b>锛氬凡鍙戝埌鍑犲彿锛屼竴鑸棤闇�鎵嬪伐鏀癸紙姣忔棩閲嶇疆浼氳嚜鍔ㄥ洖鍒�"璧峰搴忓彿"锛夈��<br />
- 路 <b>棰勫畾棰濆害</b> = 涓婇檺 鈭� 璧峰搴忓彿锛堝彧璇伙級銆�<b>涓婇檺 = 璧峰搴忓彿 琛ㄧず璇ユ椂娈垫病鏈夊悕棰�</b>锛堝厑璁镐繚瀛橈紝棰勫畾棰濆害鏄剧ず 0 骞舵爣绾級銆�<br />
- 路 涓婇檺 <b>涓嶈兘灏忎簬</b>璧峰搴忓彿锛屽惁鍒欒鏃舵姘歌繙鏃犳硶鍙栧彿銆�<br />
- 路 鍚屼竴妫�鏌ラ」鐩笅<b>鍚屼竴鏃舵鍙兘鏈変竴鏉¤鍒�</b>锛岄噸澶嶆坊鍔犱細琚嫆缁濄��
+ 路 <b>鍙锋瑙勫垯</b>锛氭瘡涓椂娈垫寜椤哄簭鍗犵敤涓�娈佃繛缁彿 鈥斺�� 姝ｅ父棰勭害鍙峰湪鍓嶏紝棰勭暀鍙风揣璺熷叾鍚庯紙鍙锋洿澶э級锛�
+ 涓嬩竴娈典粠涓婁竴娈电殑鏈�澶у彿缁х画锛屽洜姝�<b>鍙烽殢鏃舵閫掑銆佹鍐呰繛缁�</b>銆�<br />
+ 路 <b>璧峰搴忓彿</b>锛氱敱绯荤粺鑷姩璁＄畻锛堜笂涓�娈电殑鏈�澶у彿锛夛紝<b>涓嶅彲鎵嬪伐淇敼</b>銆�<br />
+ 路 <b>涓婇檺</b>锛氳鍙锋睜銆屽彿婊＄殑鏈�澶у簭鍙枫�嶏紱<b>褰撳墠搴忓彿</b>锛氬凡鍙戝埌鍑犲彿锛堟瘡鏃ラ噸缃洖璧峰搴忓彿锛夈��<br />
+ 路 <b>鍙栧彿椤哄簭</b>锛氭櫘閫氭偅鑰� 鈫� 鏈椂娈垫甯搁绾﹀彿锛涙弧浜� 鈫� 鏈椂娈�<b>棰勭暀鍙�</b>锛堢粰涓存椂鍔犲彿锛夛紱
+ 鍐嶆弧 鈫� <b>鎬婚鐣欐睜</b>锛堟棤棰勭害鏃舵鐨勬偅鑰呬篃鐩存帴璧版�婚鐣欐睜锛夈��<b>鎬婚鐣欐睜涓嶈涓婇檺锛屼繚璇佷竴瀹氳兘绛惧埌銆�</b><br />
+ 路 <b>棰勫畾棰濆害</b> = 涓婇檺 鈭� 璧峰搴忓彿锛堝彧璇伙級銆備笂闄� = 璧峰搴忓彿 琛ㄧず璇ュ彿姹犳棤鍚嶉锛堝厑璁镐繚瀛橈紝鏄剧ず 0 骞舵爣绾級銆�<br />
+ 路 涓婇檺 <b>涓嶈兘灏忎簬</b>璧峰搴忓彿锛涘悓涓�妫�鏌ラ」鐩笅<b>鍚屼竴鏃舵鍙兘鏈変竴鏉¤鍒�</b>銆�
</div>
</el-alert>
@@ -39,7 +42,7 @@
<el-table
v-loading="loading"
- :data="list"
+ :data="slotList"
:stripe="true"
border
class="qs-table"
@@ -58,14 +61,10 @@
<el-table-column label="姝ｅ父棰勭害" align="center">
<el-table-column label="璧峰搴忓彿" align="center" width="90">
<template #default="scope">
- <el-input-number
- v-model="scope.row.queueSet"
- :min="0"
- :controls="false"
- size="small"
- style="width: 100%"
- @change="markChanged(scope.row)"
- />
+ <!-- 銆愭湰闇�姹傘�戣捣濮嬪簭鍙� = 鍙锋璧风偣锛岀敱绯荤粺鎸夐『搴忚嚜鍔ㄨ绠楋紝涓嶅厑璁告墜宸ユ敼 -->
+ <span class="qs-fixed" :title="'绯荤粺鑷姩璁＄畻锛堜笂涓�娈电殑鏈�澶у彿锛�'">
+ {{ scope.row.queueSet ?? 0 }}
+ </span>
</template>
</el-table-column>
<el-table-column label="涓婇檺" align="center" width="80">
@@ -115,14 +114,10 @@
<el-table-column label="棰勭暀" align="center">
<el-table-column label="璧峰搴忓彿" align="center" width="90">
<template #default="scope">
- <el-input-number
- v-model="scope.row.queueVipSet"
- :min="0"
- :controls="false"
- size="small"
- style="width: 100%"
- @change="markChanged(scope.row)"
- />
+ <!-- 銆愭湰闇�姹傘�戦鐣欏彿娈佃捣鐐癸紝鍚屾牱鐢辩郴缁熻嚜鍔ㄨ绠� -->
+ <span class="qs-fixed" :title="'绯荤粺鑷姩璁＄畻锛堟甯搁绾︾殑涓婇檺锛�'">
+ {{ scope.row.queueVipSet ?? 0 }}
+ </span>
</template>
</el-table-column>
<el-table-column label="涓婇檺" align="center" width="80">
@@ -190,6 +185,28 @@
</el-table-column>
</el-table>
+ <!--
+ 銆愭湰闇�姹傘�戞�婚鐣欐睜锛坱ime_slot = 0锛�
+ 路 鏈鏅�氬彿 + 鏈棰勭暀鍙烽兘鍙戝畬锛屾垨鎮ｈ�呮病鏈夐绾︽椂娈垫椂锛屼粠鎬婚鐣欐睜鍙栧彿锛�
+ 路 鍙锋鏀惧湪褰撳ぉ鎵�鏈夋椂娈典箣鍚庯紙鍙锋渶澶� 鈬� 鎺掑叏澶╂渶鍚庯級锛屼笖**涓嶈涓婇檺**锛堟案杩滀笉浼氭弧锛夈��
+ -->
+ <el-alert type="warning" :closable="false" class="mt-10px">
+ <template #title>
+ <div class="text-13px">
+ 鎬婚鐣欐睜锛堟棤鏃舵 / 鎵�鏈夊彿婧愮敤灏芥椂鐨勫厹搴曪級锛�
+ <template v-if="totalPool">
+ 璧峰 <b>{{ totalPool.queueVipSet ?? 0 }}</b> 路
+ 宸插彂 <b>{{ totalPool.queueVipNo ?? 0 }}</b> 路
+ 涓婇檺 <b>{{ totalPool.queueVipFull ?? 0 }}</b>
+ <span class="text-gray-500">锛堜笉璁句笂闄愶紝婊″悗鑷姩缁х画鍙戝彿锛屼繚璇佷竴瀹氳兘绛惧埌锛�</span>
+ </template>
+ <template v-else>
+ <span class="text-gray-500">灏氭湭鍒濆鍖栵紙棣栨绛惧埌鏃剁郴缁熶細鑷姩鍒涘缓锛屽彿娈垫帴鍦ㄥ綋澶╂渶鍚庝竴娈典箣鍚庯級</span>
+ </template>
+ </div>
+ </template>
+ </el-alert>
+
<!-- 鏂板 / 缂栬緫琛ㄥ崟 -->
<Dialog v-model="formVisible" :title="formTitle" width="520px" append-to-body>
<el-form
@@ -219,27 +236,35 @@
閫夐」鏉ヨ嚜瀛楀吀 <code>ecg_book_timeslot</code>锛涗篃鏀寔鐩存帴杈撳叆璧峰/缁撴潫鏃堕棿鍚庡洖杞︽柊寤恒��
</div>
</el-form-item>
- <el-form-item label="鏅��-璧峰搴忓彿" prop="queueSet">
- <el-input-number v-model="formData.queueSet" :min="0" class="w-full" />
+ <el-form-item label="姝ｅ父棰勭害-璧峰搴忓彿" prop="queueSet">
+ <!-- 銆愭湰闇�姹傘�戣捣濮嬪簭鍙� = 鍙锋璧风偣锛岀敱绯荤粺鎸夈�屾鏌ョ被鍨� 鈫� 鏃舵椤哄簭銆嶈嚜鍔ㄨ绠楋紝涓嶅彲鎵嬪伐鏀� -->
+ <el-input-number v-model="formData.queueSet" :min="0" class="w-full" disabled />
+ <div class="text-12px text-gray-500 leading-5 mt-1">
+ 绯荤粺鑷姩璁＄畻锛�= 涓婁竴娈电殑鏈�澶у彿锛夛紝涓嶉渶瑕佸～鍐欍��
+ </div>
</el-form-item>
- <el-form-item label="鏅��-涓婇檺" prop="queueFull">
+ <el-form-item label="姝ｅ父棰勭害-涓婇檺" prop="queueFull">
<!-- 銆愭湰娆￠渶姹傘�戜笂闄愬厑璁哥瓑浜庤捣濮嬪簭鍙凤紙=璇ユ椂娈垫棤鍚嶉锛夛紝鏁� min 鏀逛负 0 -->
<el-input-number v-model="formData.queueFull" :min="0" class="w-full" />
</el-form-item>
- <el-form-item label="VIP-璧峰搴忓彿" prop="queueVipSet">
- <el-input-number v-model="formData.queueVipSet" :min="0" class="w-full" />
+ <el-form-item label="棰勭暀-璧峰搴忓彿" prop="queueVipSet">
+ <!-- 銆愭湰闇�姹傘�戦鐣欏彿娈电揣璺熸甯搁绾﹀彿娈典箣鍚庯紝鐢辩郴缁熻嚜鍔ㄨ绠� -->
+ <el-input-number v-model="formData.queueVipSet" :min="0" class="w-full" disabled />
+ <div class="text-12px text-gray-500 leading-5 mt-1">
+ 绯荤粺鑷姩璁＄畻锛�= 姝ｅ父棰勭害鐨勪笂闄愶級锛屼笉闇�瑕佸～鍐欍��
+ </div>
</el-form-item>
- <el-form-item label="VIP-涓婇檺" prop="queueVipFull">
+ <el-form-item label="棰勭暀-涓婇檺" prop="queueVipFull">
<!-- 銆愭湰娆￠渶姹傘�戝悓鏅�氫笂闄愶細鍏佽绛変簬璧峰搴忓彿 -->
<el-input-number v-model="formData.queueVipFull" :min="0" class="w-full" />
</el-form-item>
- <el-form-item label="鏅��-褰撳墠搴忓彿">
+ <el-form-item label="姝ｅ父棰勭害-褰撳墠搴忓彿">
<el-input-number v-model="formData.queueNo" :min="0" class="w-full" />
<div class="text-12px text-gray-500 leading-5 mt-1">
- 鏂板鏃舵鏃跺缓璁笌銆屾櫘閫�-璧峰搴忓彿銆嶄竴鑷淬��
+ 鏂板鏃舵鏃跺缓璁笌銆屾甯搁绾�-璧峰搴忓彿銆嶄竴鑷淬��
</div>
</el-form-item>
- <el-form-item label="VIP-褰撳墠搴忓彿">
+ <el-form-item label="棰勭暀-褰撳墠搴忓彿">
<el-input-number v-model="formData.queueVipNo" :min="0" class="w-full" />
</el-form-item>
</el-form>
@@ -276,6 +301,19 @@
() => `棰勭害鏃舵缁存姢${checkTypeName.value ? ' - ' + checkTypeName.value : ''}`
)
const changedCount = computed(() => changedRows.value.size)
+
+/**
+ * 銆愭湰闇�姹傘�戣〃鏍煎彧鏄剧ず"鐪熷疄鏃舵"锛坱ime_slot <> 0锛夛紱
+ * time_slot = 0 鐨勯偅涓�琛屾槸銆屾�婚鐣欐睜銆嶏紙鏃犳椂娈� / 鍏ㄦ弧鏃剁殑鍏滃簳鍙锋睜锛夛紝鍗曠嫭鍦ㄨ〃鏍间笅鏂瑰睍绀恒��
+ */
+const slotList = computed(() =>
+ (list.value || []).filter((r: QueueSequenceVO) => Number(r.timeSlot ?? 0) !== 0)
+)
+
+/** 鎬婚鐣欐睜琛岋紙time_slot = 0锛夛紱鏈垵濮嬪寲鏃朵负 undefined */
+const totalPool = computed(() =>
+ (list.value || []).find((r: QueueSequenceVO) => Number(r.timeSlot ?? 0) === 0)
+)
/** 鏃舵涓嬫媺閫夐」锛氬彇鑷瓧鍏� ecg_book_timeslot锛坴alue 涓� HHMMHHMM 鏁板瓧瀛楃涓诧紝label 褰㈠ 08:00-08:30锛� */
const timeSlotOptions = computed(() => {
@@ -503,6 +541,16 @@
}
/* 棰勫畾棰濆害锛堝彧璇伙級锛氬�间负 0 鏃舵祬绾㈠簳锛岃〃绀鸿鏃舵娌℃湁鍚嶉 */
+/* 銆愭湰闇�姹傘�戝彿娈佃捣鐐癸紙绯荤粺鑷姩璁＄畻锛屽彧璇诲睍绀猴級 */
+.qs-fixed {
+ display: inline-block;
+ min-width: 34px;
+ padding: 1px 4px;
+ border-radius: 3px;
+ color: var(--el-text-color-secondary);
+ background-color: var(--el-fill-color-light);
+ font-variant-numeric: tabular-nums;
+}
.qs-quota {
display: inline-block;
padding: 1px 6px;
--
Gitblit v1.9.3