From eff2db8e06879ba895535f4d1810aa431962e0c8 Mon Sep 17 00:00:00 2001 From: sa0ChunLuyu Date: Mon, 27 Jul 2026 14:16:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E9=A1=B9=E7=9B=AE=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E7=94=B3=E8=AF=B7=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Http/Controllers/API/PdfController.php | 423 +++++++++++++++++- .../views/pdf/GroupedCheckPdf.blade.php | 116 +++++ Laravel/routes/api.php | 1 + .../src/components/Yewu/YuYue202506.vue | 19 +- .../views/AppointmentMngr/PlanListAdmin.vue | 22 +- .../views/AppointmentMngr/PlanModelAdmin.vue | 20 +- 6 files changed, 587 insertions(+), 14 deletions(-) create mode 100644 Laravel/resources/views/pdf/GroupedCheckPdf.blade.php diff --git a/Laravel/app/Http/Controllers/API/PdfController.php b/Laravel/app/Http/Controllers/API/PdfController.php index 78e3983..8f71ab7 100644 --- a/Laravel/app/Http/Controllers/API/PdfController.php +++ b/Laravel/app/Http/Controllers/API/PdfController.php @@ -11,7 +11,8 @@ class PdfController extends Controller { - public function GetCheckPdf() + //旧版GetCheckPdf（备份） + public function GetCheckPdfOld() { $OrderNoList = request('OrderNoList');//医嘱号列表（数组） if (!isset($OrderNoList) or empty($OrderNoList)) return \Yz::JsonReturn("OrderNoList,不能为空"); @@ -29,6 +30,284 @@ public function GetCheckPdf() return \Yz::JsonReturn(true, '查询完成', ['list' => $list]); } + //新版GetCheckPdf：检查项目状态，分组生成PDF文件 + public function GetCheckPdf() + { + $OrderNoList = request('OrderNoList'); + if (!isset($OrderNoList) or empty($OrderNoList)) { + return \Yz::JsonReturn('OrderNoList,不能为空'); + } + if (!is_array($OrderNoList)) { + return \Yz::JsonReturn('OrderNoList,应为数组'); + } + + $type = request('Type', 'old'); + $p_type = config('app.globals.患者类型'); + $resultList = []; + $normalIds = []; //正常的医嘱号列表 + + //建立入参索引映射 + $orderIndexMap = array_flip(array_values($OrderNoList)); + + //遍历每个医嘱号，检查状态 + foreach ($OrderNoList as $orderNo) { + //查s_list（去掉is_nullify限制，先判断记录是否存在和是否已删除） + $entrustInfo = DB::table('s_list as a') + ->where(['a.entrust_id' => $orderNo]) + ->first(); + + //不存在 或 已删除 + if (!$entrustInfo || $entrustInfo->is_del == 1) { + $resultList[] = [ + '_idx' => $orderIndexMap[$orderNo], + 'OrderNo' => [$orderNo], + 'Message' => "医嘱id:{$orderNo}，在医技预约系统中不存在！", + 'PdfUrl' => '', + ]; + continue; + } + + //已作废 + if ($entrustInfo->is_nullify == 1) { + $resultList[] = [ + '_idx' => $orderIndexMap[$orderNo], + 'OrderNo' => [$orderNo], + 'Message' => "医嘱id:{$orderNo}，已作废！", + 'PdfUrl' => '', + ]; + continue; + } + + //查s_check_item（判断是否需要预约） + $checkItem = DB::table('s_check_item as a') + ->leftJoin('s_check_item_device as b', 'a.id', '=', 'b.item_id') + ->leftJoin('s_department_resources_device as c', 'b.device_id', '=', 'c.device_id') + ->where(['a.item_name' => $entrustInfo->entrust, 'a.status' => 1, 'a.is_del' => 0]) + ->first(); + + if (!$checkItem || empty($checkItem->device_id)) { + $resultList[] = [ + '_idx' => $orderIndexMap[$orderNo], + 'OrderNo' => [$orderNo], + 'Message' => "{$entrustInfo->entrust}项目不需要预约", + 'PdfUrl' => '', + ]; + continue; + } + + //查预约状态 + if ($entrustInfo->list_status != 1) { + $resultList[] = [ + '_idx' => $orderIndexMap[$orderNo], + 'OrderNo' => [$orderNo], + 'Message' => "{$entrustInfo->entrust}项目没有预约", + 'PdfUrl' => '', + ]; + continue; + } + + //正常项目 + $normalIds[] = $orderNo; + } + + //如果有正常项目，生成PDF + if (!empty($normalIds)) { + //查询正常项目的完整数据 + $list = DB::table('s_list as a') + ->select( + 'a.*', + 'c.period_begin_time', + 'c.period_end_time', + 'b.department_resources_name', + 'b.department_resources_addr' + ) + ->leftJoin('s_period as c', 'a.reservation_time', '=', 'c.id') + ->leftJoin('s_department_resources as b', 'a.reservation_sources', '=', 'b.id') + ->whereIn('a.entrust_id', $normalIds) + ->where('a.list_status', 1) + ->where('a.is_nullify', 0) + ->orderByRaw('FIELD(a.entrust_id, ' . implode(',', array_map('intval', $normalIds)) . ')') + ->get(); + + //三层分组 + $groups = []; + foreach ($list as $item) { + $typeKey = $item->patient_type; + $patientKey = $item->patient_type == 0 + ? substr($item->episodeid, -10) + : $item->reg_num; + $roomKey = $type === 'single' || $type === 'old' + ? 'item_' . $item->id + : ($item->department_resources_name ?: '未知诊室') + . '|' . ($item->reservation_date ?? '') + . '|' . ($item->period_begin_time ?? '') + . '|' . ($item->period_end_time ?? ''); + + if (!isset($groups[$typeKey])) { + $groups[$typeKey] = [ + 'label' => $p_type[$typeKey] ?? '未知', + 'patients' => [], + ]; + } + if (!isset($groups[$typeKey]['patients'][$patientKey])) { + $groups[$typeKey]['patients'][$patientKey] = [ + 'patient_name' => $item->user_name, + 'patient_id' => $patientKey, + 'patient_type' => $item->patient_type, + 'user_sex' => $item->user_sex, + 'user_brithday' => $item->user_brithday, + 'warddesc' => $item->warddesc ?? '', + 'bedno' => $item->bedno ?? '', + 'user_phone' => $item->user_phone, + 'rooms' => [], + ]; + } + if (!isset($groups[$typeKey]['patients'][$patientKey]['rooms'][$roomKey])) { + $groups[$typeKey]['patients'][$patientKey]['rooms'][$roomKey] = [ + 'room_name' => $roomKey, + 'room_addr' => $item->department_resources_addr ?? '', + 'items' => [], + ]; + } + + $groups[$typeKey]['patients'][$patientKey]['rooms'][$roomKey]['items'][] = [ + 'id' => $item->id, + 'entrust_id' => $item->entrust_id, + 'entrust' => $item->entrust, + 'entrust_date' => $item->entrust_date, + 'entrust_time' => $item->entrust_time, + 'reservation_date' => $item->reservation_date, + 'period_begin_time' => $item->period_begin_time, + 'period_end_time' => $item->period_end_time, + ]; + } + + //预计算各字段 + $generator = new \Picqer\Barcode\BarcodeGeneratorPNG(); + foreach ($groups as &$typeGroup) { + foreach ($typeGroup['patients'] as &$patient) { + $patient['user_sex_label'] = ''; + if ($patient['user_sex'] == 1) $patient['user_sex_label'] = '男'; + if ($patient['user_sex'] == 2) $patient['user_sex_label'] = '女'; + $patient['age'] = \Tools::getAgeFromBirthday($patient['user_brithday']); + $patient['patient_type_label'] = $typeGroup['label']; + + $patient['barcode'] = base64_encode($generator->getBarcode($patient['patient_id'], $generator::TYPE_CODE_128, 2, 40)); + $patient['barcode_text'] = $patient['patient_id']; + + foreach ($patient['rooms'] as &$room) { + $room['items_str'] = implode('，', array_column($room['items'], 'entrust')); + + $firstItem = $room['items'][0]; + $room['reservation_date'] = $firstItem['reservation_date']; + $room['period_begin'] = $firstItem['period_begin_time'] ? substr($firstItem['period_begin_time'], 0, 5) : ''; + $room['period_end'] = $firstItem['period_end_time'] ? substr($firstItem['period_end_time'], 0, 5) : ''; + $room['weekday_label'] = \Tools::GetWeekName($firstItem['reservation_date']); + + $minDateTime = $room['items'][0]['entrust_date'] . ' ' . $room['items'][0]['entrust_time']; + $maxDateTime = $minDateTime; + foreach ($room['items'] as $it) { + $dt = $it['entrust_date'] . ' ' . $it['entrust_time']; + if ($dt < $minDateTime) $minDateTime = $dt; + if ($dt > $maxDateTime) $maxDateTime = $dt; + } + $room['entrust_date_time'] = $minDateTime === $maxDateTime + ? $minDateTime + : $minDateTime . ' ~ ' . $maxDateTime; + } + } + } + unset($typeGroup, $patient, $room); + + //为每个room生成独立的PDF文件 + $datePath = date('Y/m/d'); + $storageDir = 'CheckPdf/' . $datePath; + $fullDir = storage_path('app/public/' . $storageDir); + if (!File::exists($fullDir)) { + File::makeDirectory($fullDir, 0755, true); + } + + foreach ($groups as $typeKey => $typeGroup) { + foreach ($typeGroup['patients'] as $patientKey => $patient) { + foreach ($patient['rooms'] as $roomKey => $room) { + //收集该分组的医嘱号 + $orderNos = array_column($room['items'], 'entrust_id'); + + //构建只包含当前room的临时groups结构 + $tempGroups = [ + $typeKey => [ + 'label' => $typeGroup['label'], + 'patients' => [ + $patientKey => [ + 'patient_name' => $patient['patient_name'], + 'patient_id' => $patient['patient_id'], + 'patient_type' => $patient['patient_type'], + 'user_sex_label' => $patient['user_sex_label'], + 'age' => $patient['age'], + 'patient_type_label' => $patient['patient_type_label'], + 'warddesc' => $patient['warddesc'], + 'bedno' => $patient['bedno'], + 'user_phone' => $patient['user_phone'], + 'barcode' => $patient['barcode'], + 'barcode_text' => $patient['barcode_text'], + 'rooms' => [ + $roomKey => $room, + ], + ], + ], + ], + ]; + + //生成文件名（MD5：医嘱号列表|预约日期|预约时间段） + $entrustIdStr = implode(',', $orderNos); + $nameStr = $entrustIdStr . '|' . $room['reservation_date'] + . '|' . ($room['period_begin'] ? $room['period_begin'] . '-' . $room['period_end'] : ''); + $filename = md5($nameStr) . '.pdf'; + $filePath = $fullDir . '/' . $filename; + + //检查文件是否存在，不存在则生成 + if (!File::exists($filePath)) { + $pdf = SnappyPdf::loadView('pdf.GroupedCheckPdf', ['groups' => $tempGroups]) + ->setOption('page-size', 'a4') + ->setOption('orientation', 'portrait'); + $pdf->save($filePath); + } + + $url = env('APP_URL') . Storage::url($storageDir . '/' . $filename); + + $resultList[] = [ + '_idx' => $orderIndexMap[$orderNos[0]], + 'OrderNo' => $orderNos, + 'Message' => '', + 'PdfUrl' => $url, + ]; + } + } + } + } + + //按入参顺序排序，去掉内部索引 + usort($resultList, function ($a, $b) { + return $a['_idx'] - $b['_idx']; + }); + $resultList = array_map(function ($item) { + unset($item['_idx']); + return $item; + }, $resultList); + + //old模式简化返回格式 + if ($type === 'old') { + $resultList = array_map(function ($item) { + return [ + 'OrderNo' => is_array($item['OrderNo']) ? $item['OrderNo'][0] : $item['OrderNo'], + 'PdfUrl' => $item['PdfUrl'] ?? '', + ]; + }, $resultList); + } + + return \Yz::JsonReturn(true, '查询完成', ['list' => $resultList]); + } + //创建检查申请单pdf文件 public function CreateJianChaShenQingDanPdf() { @@ -94,4 +373,144 @@ public function CreateJianChaShenQingDanPdf() } -} + //按诊室分组生成检查项目清单PDF（流式返回） + public function GenerateGroupedCheckPdf() + { + $OrderNoList = request('OrderNoList'); + if (!isset($OrderNoList) or empty($OrderNoList)) { + return \Yz::JsonReturn('OrderNoList,不能为空'); + } + if (!is_array($OrderNoList)) { + return \Yz::JsonReturn('OrderNoList,应为数组'); + } + + //查询数据，关联时段和诊室资源 + $list = DB::table('s_list as a') + ->select( + 'a.*', + 'c.period_begin_time', + 'c.period_end_time', + 'b.department_resources_name', + 'b.department_resources_addr' + ) + ->leftJoin('s_period as c', 'a.reservation_time', '=', 'c.id') + ->leftJoin('s_department_resources as b', 'a.reservation_sources', '=', 'b.id') + ->whereIn('a.entrust_id', $OrderNoList) + ->where('a.list_status', 1) + ->where('a.is_nullify', 0) + ->orderBy('a.id') + ->get(); + + if ($list->isEmpty()) { + return \Yz::JsonReturn(false, '未找到符合条件的医嘱数据'); + } + + $type = request('Type', 'group'); + $p_type = config('app.globals.患者类型'); + + //三层分组：patient_type → 患者标识 → 诊室 + $groups = []; + foreach ($list as $item) { + //第1层：患者类型 + $typeKey = $item->patient_type; + + //第2层：患者标识（住院用episodeid后10位，非住院用reg_num） + $patientKey = $item->patient_type == 0 + ? substr($item->episodeid, -10) + : $item->reg_num; + + //第3层：诊室（single模式每个item独立一页，用item.id区分） + $roomKey = $type === 'single' + ? 'item_' . $item->id + : ($item->department_resources_name ?: '未知诊室') + . '|' . ($item->reservation_date ?? '') + . '|' . ($item->period_begin_time ?? '') + . '|' . ($item->period_end_time ?? ''); + + if (!isset($groups[$typeKey])) { + $groups[$typeKey] = [ + 'label' => $p_type[$typeKey] ?? '未知', + 'patients' => [], + ]; + } + if (!isset($groups[$typeKey]['patients'][$patientKey])) { + $groups[$typeKey]['patients'][$patientKey] = [ + 'patient_name' => $item->user_name, + 'patient_id' => $patientKey, + 'patient_type' => $item->patient_type, + 'user_sex' => $item->user_sex, + 'user_brithday' => $item->user_brithday, + 'warddesc' => $item->warddesc ?? '', + 'bedno' => $item->bedno ?? '', + 'user_phone' => $item->user_phone, + 'rooms' => [], + ]; + } + if (!isset($groups[$typeKey]['patients'][$patientKey]['rooms'][$roomKey])) { + $groups[$typeKey]['patients'][$patientKey]['rooms'][$roomKey] = [ + 'room_name' => $roomKey, + 'room_addr' => $item->department_resources_addr ?? '', + 'items' => [], + ]; + } + + $groups[$typeKey]['patients'][$patientKey]['rooms'][$roomKey]['items'][] = [ + 'id' => $item->id, + 'entrust' => $item->entrust, + 'entrust_date' => $item->entrust_date, + 'entrust_time' => $item->entrust_time, + 'reservation_date' => $item->reservation_date, + 'period_begin_time' => $item->period_begin_time, + 'period_end_time' => $item->period_end_time, + ]; + } + + //预计算各字段 + $generator = new \Picqer\Barcode\BarcodeGeneratorPNG(); + foreach ($groups as &$typeGroup) { + foreach ($typeGroup['patients'] as &$patient) { + //患者基本信息 + $patient['user_sex_label'] = ''; + if ($patient['user_sex'] == 1) $patient['user_sex_label'] = '男'; + if ($patient['user_sex'] == 2) $patient['user_sex_label'] = '女'; + $patient['age'] = \Tools::getAgeFromBirthday($patient['user_brithday']); + $patient['patient_type_label'] = $typeGroup['label']; + + //条形码 + $patient['barcode'] = base64_encode($generator->getBarcode($patient['patient_id'], $generator::TYPE_CODE_128, 2, 40)); + $patient['barcode_text'] = $patient['patient_id']; + + foreach ($patient['rooms'] as &$room) { + //项目名称拼接 + $room['items_str'] = implode('，', array_column($room['items'], 'entrust')); + + //预约时间 + $firstItem = $room['items'][0]; + $room['reservation_date'] = $firstItem['reservation_date']; + $room['period_begin'] = $firstItem['period_begin_time'] ? substr($firstItem['period_begin_time'], 0, 5) : ''; + $room['period_end'] = $firstItem['period_end_time'] ? substr($firstItem['period_end_time'], 0, 5) : ''; + $room['weekday_label'] = \Tools::GetWeekName($firstItem['reservation_date']); + + //申请时间范围 + $minDateTime = $room['items'][0]['entrust_date'] . ' ' . $room['items'][0]['entrust_time']; + $maxDateTime = $minDateTime; + foreach ($room['items'] as $it) { + $dt = $it['entrust_date'] . ' ' . $it['entrust_time']; + if ($dt < $minDateTime) $minDateTime = $dt; + if ($dt > $maxDateTime) $maxDateTime = $dt; + } + $room['entrust_date_time'] = $minDateTime === $maxDateTime + ? $minDateTime + : $minDateTime . ' ~ ' . $maxDateTime; + } + } + } + unset($typeGroup, $patient, $room); + + $pdf = SnappyPdf::loadView('pdf.GroupedCheckPdf', ['groups' => $groups]) + ->setOption('page-size', 'a4') + ->setOption('orientation', 'portrait'); + + return $pdf->inline('GenerateGroupedCheckPdf.pdf'); + } +} \ No newline at end of file diff --git a/Laravel/resources/views/pdf/GroupedCheckPdf.blade.php b/Laravel/resources/views/pdf/GroupedCheckPdf.blade.php new file mode 100644 index 0000000..16f5361 --- /dev/null +++ b/Laravel/resources/views/pdf/GroupedCheckPdf.blade.php @@ -0,0 +1,116 @@ + + + + + 检查项目清单 + + + +@foreach ($groups as $typeKey => $typeGroup) + @foreach ($typeGroup['patients'] as $patientKey => $patient) + @foreach ($patient['rooms'] as $roomKey => $room) +
+
+
+
秦皇岛市中医医院
+
检查项目清单
+
+ +
{{ $patient['barcode_text'] }}
+
+
+ +
+ + + + + + + + + + @if ($patient['patient_type'] == 0) + + + + @else + + + + @endif + +
姓名：{{ $patient['patient_name'] }}性别：{{ $patient['user_sex_label'] }}年龄：{{ $patient['age'] }}病人类型：{{ $patient['patient_type_label'] }}
{{ $patient['patient_type_label'] }}号：{{ $patient['patient_id'] }}病区：{{ $patient['warddesc'] }}床号：{{ $patient['bedno'] }}联系电话：{{ $patient['user_phone'] }}联系电话：{{ $patient['user_phone'] }}
+
+ +
+ + + + + + + + + + + + + +
检查项目：{{ $room['items_str'] }}
预约时间：{{ str_replace('-', '/', $room['reservation_date']) }} + @if ($room['period_begin'] && $room['period_end']) + {{ $room['period_begin'] }}-{{ $room['period_end'] }} + @endif + {{ $room['weekday_label'] }}
检查地点：{{ $room['room_addr'] }}
+
+ +
+ + + + + +
温馨提示： +
1、预约后请您及时缴费，门诊患者预约成功后60分钟内不缴费，系统会自动取消您的预约申请。自动取消后，如需继续预约，请到相关检查科室重新预约。
+
2、预约时间为8点~10点的，请8点到登记处签到，预约时间为10点~12点的，请10点前到登记处签到，便于工作人员进行检查评估和准备。
+
3、预约时间不是实际检查时间，以现场登记后排队号为准。
+
+
+ +
+
检查须知：
+
+ 腹部检查禁食4小时，腹部、盆腔、泌尿系统检查请尽量饮水，充盈肠道及膀胱；危重病人需由家属陪同；孕妇及婴幼儿请慎行检查。 +
+
+ +
+ 申请时间：{{ $room['entrust_date_time'] }} +
+
+
+ @endforeach + @endforeach +@endforeach + + \ No newline at end of file diff --git a/Laravel/routes/api.php b/Laravel/routes/api.php index c4a80b2..48e5627 100644 --- a/Laravel/routes/api.php +++ b/Laravel/routes/api.php @@ -210,6 +210,7 @@ Route::post('/PacsCancelSignIn','App\Http\Controllers\API\Third\PacsController@CancelSignIn' );//路径起名字有问题，实际是给报到机的 Route::post('/GetEntrustInfo','App\Http\Controllers\API\Third\PacsController@GetEntrustInfo' ); Route::post('/GetCheckPdf','App\Http\Controllers\API\PdfController@GetCheckPdf' ); + Route::post('/GenerateGroupedCheckPdf','App\Http\Controllers\API\PdfController@GenerateGroupedCheckPdf' ); Route::post('/SignInOnPacs','App\Http\Controllers\API\Third\PacsController@SignInOnPacs' );//给Pacs用，通知本系统到检（场景，不经过报到机直接人工窗口） Route::post('/SignInOnPacsTest','App\Http\Controllers\API\Third\PacsController@SignInOnPacsTest' );//给Pacs用，测试接口，不修改数据 diff --git a/YiJi-admin/src/components/Yewu/YuYue202506.vue b/YiJi-admin/src/components/Yewu/YuYue202506.vue index 72e04e2..e6863e8 100644 --- a/YiJi-admin/src/components/Yewu/YuYue202506.vue +++ b/YiJi-admin/src/components/Yewu/YuYue202506.vue @@ -6,7 +6,7 @@
{{patientInfo.patient_type_label}}号:{{patientInfo.patient_type == 0 ? patientInfo.episodeid?.slice(-10) : patientInfo.reg_num}}
电话:{{patientInfo.user_phone}}
病区:{{patientInfo.warddesc}}
-
床号:{{patientInfo.bedname}}
+
床号:{{patientInfo.bedno}}
诊断:{{patientInfo.diagnosisName}}
@@ -751,12 +751,12 @@ } if (crossParts.length > 0) { let crossMsg = '' - crossMsg += '' + crossMsg += '' let lastSlot = '' let bgColor = '#f5f5f5' crossParts.sort((a, b) => a.idx - b.idx).forEach(p => { if (p.timeSlot !== lastSlot) { - bgColor = bgColor === '#fff' ? '#f5f5f5' : '#fff' + bgColor = bgColor === '#fff' ? '#d5dce6' : '#fff' lastSlot = p.timeSlot } crossMsg += '' @@ -989,12 +989,12 @@ } if (crossParts.length > 0) { let crossMsg = '
序号项目名称检查室日期时间段
序号项目名称检查室日期时间段
' + p.idx + '' + p.entrust + '' + p.room + '' + p.date + '' + p.timeSlot + '
' - crossMsg += '' + crossMsg += '' let lastSlot = '' let bgColor = '#f5f5f5' crossParts.sort((a, b) => a.idx - b.idx).forEach(p => { if (p.timeSlot !== lastSlot) { - bgColor = bgColor === '#fff' ? '#f5f5f5' : '#fff' + bgColor = bgColor === '#fff' ? '#d5dce6' : '#fff' lastSlot = p.timeSlot } crossMsg += '' @@ -1123,12 +1123,12 @@ } if (crossParts.length > 0) { let crossMsg = '
序号项目名称检查室日期时间段
序号项目名称检查室日期时间段
' + p.idx + '' + p.entrust + '' + p.room + '' + p.date + '' + p.timeSlot + '
' - crossMsg += '' + crossMsg += '' let lastSlot = '' let bgColor = '#f5f5f5' crossParts.sort((a, b) => a.idx - b.idx).forEach(p => { if (p.timeSlot !== lastSlot) { - bgColor = bgColor === '#fff' ? '#f5f5f5' : '#fff' + bgColor = bgColor === '#fff' ? '#d5dce6' : '#fff' lastSlot = p.timeSlot } crossMsg += '' @@ -1399,7 +1399,7 @@ if (res.status) { systemConfigs.value.forEach((v, i) => { if (v.label == '开启申请单pdf' && v.value === "1") { - CreateJianChaShenQingDanPdfFunc() +// CreateJianChaShenQingDanPdfFunc() } }) GetMainInfo(() => { @@ -1582,7 +1582,7 @@ }, true) systemConfigs.value.forEach((v, i) => { if (v.label == '开启申请单pdf' && v.value === "1") { - CreateJianChaShenQingDanPdfFunc(successEntrustIds) +// CreateJianChaShenQingDanPdfFunc(successEntrustIds) } }) if (auto_print.value.length > 0) { @@ -1853,6 +1853,7 @@ .patientInfo { display: flex; + align-items: center; flex-shrink: 0; .item{ margin-right: 18px; diff --git a/YiJi-admin/src/views/AppointmentMngr/PlanListAdmin.vue b/YiJi-admin/src/views/AppointmentMngr/PlanListAdmin.vue index 1d9cb55..42ea3d2 100644 --- a/YiJi-admin/src/views/AppointmentMngr/PlanListAdmin.vue +++ b/YiJi-admin/src/views/AppointmentMngr/PlanListAdmin.vue @@ -82,16 +82,19 @@ + 编辑
+ 明细
+ 占位
@@ -898,6 +901,13 @@ align-items: center; border-radius: 4px; .icon_k { + display: flex; + flex-direction: column; + align-items: center; + cursor: pointer; + margin: 0 4px; + } + .icon_k .el-icon { height: 30px; width: 30px; border-radius: 50%; @@ -906,8 +916,16 @@ align-items: center; border: 1px solid #ccc; background-color: #fff; - margin-left: 6px; - + } + .icon_text { + font-size: 11px; + color: #409eff; + background-color: #fff; + padding: 1px 4px; + border-radius: 3px; + margin-top: 3px; + white-space: nowrap; + line-height: 1.4; } } diff --git a/YiJi-admin/src/views/AppointmentMngr/PlanModelAdmin.vue b/YiJi-admin/src/views/AppointmentMngr/PlanModelAdmin.vue index 9810d35..23b80b7 100644 --- a/YiJi-admin/src/views/AppointmentMngr/PlanModelAdmin.vue +++ b/YiJi-admin/src/views/AppointmentMngr/PlanModelAdmin.vue @@ -82,11 +82,13 @@ + 编辑
+ 占位
@@ -1316,6 +1318,13 @@ align-items: center; border-radius: 4px; .icon_k { + display: flex; + flex-direction: column; + align-items: center; + cursor: pointer; + margin: 0 4px; + } + .icon_k .el-icon { height: 30px; width: 30px; border-radius: 50%; @@ -1324,7 +1333,16 @@ align-items: center; border: 1px solid #ccc; background-color: #fff; - + } + .icon_text { + font-size: 11px; + color: #409eff; + background-color: #fff; + padding: 1px 4px; + border-radius: 3px; + margin-top: 3px; + white-space: nowrap; + line-height: 1.4; } } }
序号项目名称检查室日期时间段
序号项目名称检查室日期时间段
' + p.idx + '' + p.entrust + '' + p.room + '' + p.date + '' + p.timeSlot + '