From 68d959e0efcd39b6bddab96191dff912c1c76813 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 24 十月 2024 14:18:35 +0800
Subject: [PATCH] bug fix
---
src/views/ecg/appointment/index.vue | 58 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/src/views/ecg/appointment/index.vue b/src/views/ecg/appointment/index.vue
index fa7dd21..e8e07c1 100644
--- a/src/views/ecg/appointment/index.vue
+++ b/src/views/ecg/appointment/index.vue
@@ -78,46 +78,46 @@
class="!w-240px"
/>
</el-form-item>
- <el-form-item label="鎮ｈ�呭湴鍧�" prop="patAddr">
+ <el-form-item label="鍦板潃" prop="patAddr">
<el-input
v-model="queryParams.patAddr"
- placeholder="璇疯緭鍏ユ偅鑰呭湴鍧�"
+ placeholder="璇疯緭鍏ュ湴鍧�"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
- <el-form-item label="鎮ｈ�呮墍鍦ㄧ瀹や唬鐮�" prop="patDeptCode">
+ <el-form-item label="绉戝浠ｇ爜" prop="patDeptCode">
<el-input
v-model="queryParams.patDeptCode"
- placeholder="璇疯緭鍏ユ偅鑰呮墍鍦ㄧ瀹や唬鐮�"
+ placeholder="璇疯緭鍏ョ瀹や唬鐮�"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
- <el-form-item label="鎮ｈ�呮墍鍦ㄧ瀹ゅ悕绉�" prop="patDeptDesc">
+ <el-form-item label="绉戝" prop="patDeptDesc">
<el-input
v-model="queryParams.patDeptDesc"
- placeholder="璇疯緭鍏ユ偅鑰呮墍鍦ㄧ瀹ゅ悕绉�"
+ placeholder="璇疯緭鍏ョ瀹ゅ悕绉�"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
- <el-form-item label="鎮ｈ�呮墍鍦ㄧ梾鍖轰唬鐮�" prop="patWardCode">
+ <el-form-item label="鐥呭尯浠ｇ爜" prop="patWardCode">
<el-input
v-model="queryParams.patWardCode"
- placeholder="璇疯緭鍏ユ偅鑰呮墍鍦ㄧ梾鍖轰唬鐮�"
+ placeholder="璇疯緭鍏ョ梾鍖轰唬鐮�"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
- <el-form-item label="鎮ｈ�呮墍鍦ㄧ梾鍖哄悕绉�" prop="patWardDesc">
+ <el-form-item label="鐥呭尯" prop="patWardDesc">
<el-input
v-model="queryParams.patWardDesc"
- placeholder="璇疯緭鍏ユ偅鑰呮墍鍦ㄧ梾鍖哄悕绉�"
+ placeholder="璇疯緭鍏ョ梾鍖哄悕绉�"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
@@ -141,25 +141,25 @@
class="!w-240px"
/>
</el-form-item>
- <el-form-item label="棰勭害妫�鏌ョ被鍨�" prop="bookCheckType">
+ <el-form-item label="妫�鏌ョ被鍨�" prop="bookCheckType">
<el-select
v-model="queryParams.bookCheckType"
- placeholder="璇烽�夋嫨棰勭害妫�鏌ョ被鍨�"
+ placeholder="璇烽�夋嫨妫�鏌ョ被鍨�"
clearable
class="!w-240px"
>
<el-option
- v-for="dict in getIntDictOptions(DICT_TYPE.ECG_CHECK_TYPE)"
+ v-for="dict in checkTypeStore.getCheckTypeOptions()"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
- <el-form-item label="棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�" prop="bookSrc">
+ <el-form-item label="棰勭害鏉ユ簮" prop="bookSrc">
<el-input
v-model="queryParams.bookSrc"
- placeholder="璇疯緭鍏ラ绾︽潵婧愶細X绯荤粺銆佹姢澹墜鍔ㄩ绾�"
+ placeholder="璇疯緭鍏ラ绾︽潵婧�"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
@@ -192,18 +192,23 @@
<!-- 鍒楄〃 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
- <el-table-column label="鎮ｈ�呯紪鍙�" align="center" prop="patId" />
- <el-table-column label="鎮ｈ�呭鍚�" align="center" prop="patName" />
- <el-table-column label="鎮ｈ�呮�у埆" align="center" prop="patGender">
+ <el-table-column label="缂栧彿" align="center" prop="patId" />
+ <el-table-column label="缂磋垂" align="center" prop="paid">
+ <template #default="scope">
+ {{scope.row.paid == 1 ? "宸蹭粯" : ""}}
+ </template>
+ </el-table-column>
+ <el-table-column label="濮撳悕" align="center" prop="patName" />
+ <el-table-column label="鎬у埆" align="center" prop="patGender">
<template #default="scope">
<dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.patGender" />
</template>
</el-table-column>
- <el-table-column label="鎮ｈ�呯敓鏃�" align="center" prop="patBirthday" :formatter="dateFormatter2"/>
- <el-table-column label="鎮ｈ�呮墜鏈�" align="center" prop="patMobile" />
- <el-table-column label="鎮ｈ�呯數璇�" align="center" prop="patPhone" />
+ <el-table-column label="鐢熸棩" align="center" prop="patBirthday" :formatter="dateFormatter2" width="110px"/>
+ <el-table-column label="鎵嬫満" align="center" prop="patMobile" />
+ <el-table-column label="鐢佃瘽" align="center" prop="patPhone" />
<el-table-column label="韬唤璇佸彿" align="center" prop="patIdentityId" />
- <el-table-column label="鎮ｈ�呭湴鍧�" align="center" prop="patAddr" />
+ <el-table-column label="鍦板潃" align="center" prop="patAddr" />
<el-table-column label="绉戝浠ｇ爜" align="center" prop="patDeptCode" />
<el-table-column label="绉戝鍚嶇О" align="center" prop="patDeptDesc" />
<el-table-column label="鐥呭尯浠ｇ爜" align="center" prop="patWardCode" />
@@ -215,7 +220,7 @@
align="center"
prop="bookDate"
:formatter="dateFormatter2"
- width="180px"
+ width="120px"
/>
<el-table-column label="棰勭害鏃堕棿娈�" align="center" prop="bookTimeslot" width="100px">
<template #default="scope">
@@ -224,10 +229,10 @@
</el-table-column>
<el-table-column label="棰勭害妫�鏌ョ被鍨�" align="center" prop="bookCheckType">
<template #default="scope">
- <dict-tag :type="DICT_TYPE.ECG_CHECK_TYPE" :value="scope.row.bookCheckType" />
+ {{checkTypeStore.getCheckTypeName(scope.row.bookCheckType)}}
</template>
</el-table-column>
- <el-table-column label="棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�" align="center" prop="bookSrc">
+ <el-table-column label="棰勭害鏉ユ簮" align="center" prop="bookSrc">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ECG_BOOK_SRC" :value="scope.row.bookSrc" />
</template>
@@ -272,6 +277,7 @@
import download from '@/utils/download'
import { AppointmentApi, AppointmentVO } from '@/api/ecg/appointment'
import AppointmentForm from './AppointmentForm.vue'
+import {useCheckTypeStore} from "@/store/modules/checkType";
/** 棰勭害 鍒楄〃 */
defineOptions({ name: 'Appointment' })
@@ -307,6 +313,8 @@
const queryFormRef = ref() // 鎼滅储鐨勮〃鍗�
const exportLoading = ref(false) // 瀵煎嚭鐨勫姞杞戒腑
+const checkTypeStore = useCheckTypeStore();
+
/** 鏌ヨ鍒楄〃 */
const getList = async () => {
loading.value = true
--
Gitblit v1.9.3