From f5af1ea61ec20657a99ac1fe095b0217d04489c9 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 28 十月 2024 13:35:44 +0800
Subject: [PATCH] update
---
src/views/ecg/appointment/index.vue | 83 +--------------------------
src/views/ecg/appointment/AppointmentForm.vue | 20 +++---
src/store/modules/checkType.ts | 4
src/views/ecg/devrent/index.vue | 42 ++------------
4 files changed, 22 insertions(+), 127 deletions(-)
diff --git a/src/store/modules/checkType.ts b/src/store/modules/checkType.ts
index 8897503..82ca6f2 100644
--- a/src/store/modules/checkType.ts
+++ b/src/store/modules/checkType.ts
@@ -55,13 +55,13 @@
},
getCheckTypeName(type: number) {
if (!this.isSetCheckType) {
- this.setcheckTypeMap()
+ this.setCheckTypeMap()
}
return this.checkTypeMap[type]
},
getCheckTypeOptions() {
if (!this.isSetCheckType) {
- this.setcheckTypeMap()
+ this.setCheckTypeMap()
}
return Object.keys(this.checkTypeMap).map((key) => {
return {
diff --git a/src/views/ecg/appointment/AppointmentForm.vue b/src/views/ecg/appointment/AppointmentForm.vue
index a1a18ed..8c68bdf 100644
--- a/src/views/ecg/appointment/AppointmentForm.vue
+++ b/src/views/ecg/appointment/AppointmentForm.vue
@@ -51,7 +51,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="棰勭害鏃堕棿娈�" prop="bookTimeslot">
+ <el-form-item label="棰勭害鏃堕棿" prop="bookTimeslot">
<el-select v-model="formData.bookTimeslot" placeholder="璇烽�夋嫨棰勭害鏃堕棿娈�">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.ECG_BOOK_TIMESLOT)"
@@ -113,25 +113,25 @@
</el-row>
<el-row :gutter="20">
<el-col :span="12">
- <el-form-item label="鎮ｈ�呮墍鍦ㄧ瀹や唬鐮�" prop="patDeptCode">
- <el-input v-model="formData.patDeptCode" placeholder="璇疯緭鍏ユ偅鑰呮墍鍦ㄧ瀹や唬鐮�" />
+ <el-form-item label="绉戝浠ｇ爜" prop="patDeptCode">
+ <el-input v-model="formData.patDeptCode" placeholder="璇疯緭鍏ョ瀹や唬鐮�" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鎮ｈ�呮墍鍦ㄧ瀹ゅ悕绉�" prop="patDeptDesc">
- <el-input v-model="formData.patDeptDesc" placeholder="璇疯緭鍏ユ偅鑰呮墍鍦ㄧ瀹ゅ悕绉�" />
+ <el-form-item label="绉戝鍚嶇О" prop="patDeptDesc">
+ <el-input v-model="formData.patDeptDesc" placeholder="璇疯緭鍏ョ瀹ゅ悕绉�" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
- <el-form-item label="鎮ｈ�呮墍鍦ㄧ梾鍖轰唬鐮�" prop="patWardCode">
- <el-input v-model="formData.patWardCode" placeholder="璇疯緭鍏ユ偅鑰呮墍鍦ㄧ梾鍖轰唬鐮�" />
+ <el-form-item label="鐥呭尯浠ｇ爜" prop="patWardCode">
+ <el-input v-model="formData.patWardCode" placeholder="璇疯緭鍏ョ梾鍖轰唬鐮�" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鎮ｈ�呮墍鍦ㄧ梾鍖哄悕绉�" prop="patWardDesc">
- <el-input v-model="formData.patWardDesc" placeholder="璇疯緭鍏ユ偅鑰呮墍鍦ㄧ梾鍖哄悕绉�" />
+ <el-form-item label="鐥呭尯鍚嶇О" prop="patWardDesc">
+ <el-input v-model="formData.patWardDesc" placeholder="璇疯緭鍏ョ梾鍖哄悕绉�" />
</el-form-item>
</el-col>
</el-row>
@@ -196,7 +196,7 @@
patId: [{ required: true, message: '鎮ｈ�呯紪鍙蜂笉鑳戒负绌�', trigger: 'blur' }],
patName: [{ required: true, message: '鎮ｈ�呭鍚嶄笉鑳戒负绌�', trigger: 'blur' }],
patGender: [{ required: true, message: '鎮ｈ�呮�у埆涓嶈兘涓虹┖', trigger: 'blur' }],
- bookId: [{ required: true, message: '棰勭害缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
+ // bookId: [{ required: true, message: '棰勭害缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
bookDate: [{ required: true, message: '棰勭害鏃ユ湡涓嶈兘涓虹┖', trigger: 'blur' }],
bookTimeslot: [{ required: true, message: '棰勭害妫�鏌ユ椂闂存涓嶈兘涓虹┖', trigger: 'blur' }],
bookCheckType: [{ required: true, message: '棰勭害妫�鏌ョ被鍨嬩笉鑳戒负绌�', trigger: 'change' }]
diff --git a/src/views/ecg/appointment/index.vue b/src/views/ecg/appointment/index.vue
index e8e07c1..0ff69f1 100644
--- a/src/views/ecg/appointment/index.vue
+++ b/src/views/ecg/appointment/index.vue
@@ -26,31 +26,6 @@
class="!w-240px"
/>
</el-form-item>
- <el-form-item label="鎮ｈ�呮�у埆" prop="patGender">
- <el-select
- v-model="queryParams.patGender"
- placeholder="璇烽�夋嫨鎮ｈ�呮�у埆"
- clearable
- class="!w-240px"
- >
- <el-option
- v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎮ｈ�呯敓鏃�" prop="patBirthday">
- <el-date-picker
- v-model="queryParams.patBirthday"
- value-format="YYYY-MM-DD"
- type="date"
- placeholder="閫夋嫨鎮ｈ�呯敓鏃�"
- clearable
- class="!w-240px"
- />
- </el-form-item>
<el-form-item label="鎮ｈ�呮墜鏈�" prop="patMobile">
<el-input
v-model="queryParams.patMobile"
@@ -60,6 +35,7 @@
class="!w-240px"
/>
</el-form-item>
+<!--
<el-form-item label="鎮ｈ�呯數璇�" prop="patPhone">
<el-input
v-model="queryParams.patPhone"
@@ -69,64 +45,11 @@
class="!w-240px"
/>
</el-form-item>
+-->
<el-form-item label="韬唤璇佸彿" prop="patIdentityId">
<el-input
v-model="queryParams.patIdentityId"
placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
- </el-form-item>
- <el-form-item label="鍦板潃" prop="patAddr">
- <el-input
- v-model="queryParams.patAddr"
- placeholder="璇疯緭鍏ュ湴鍧�"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
- </el-form-item>
- <el-form-item label="绉戝浠ｇ爜" prop="patDeptCode">
- <el-input
- v-model="queryParams.patDeptCode"
- placeholder="璇疯緭鍏ョ瀹や唬鐮�"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
- </el-form-item>
- <el-form-item label="绉戝" prop="patDeptDesc">
- <el-input
- v-model="queryParams.patDeptDesc"
- placeholder="璇疯緭鍏ョ瀹ゅ悕绉�"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
- </el-form-item>
- <el-form-item label="鐥呭尯浠ｇ爜" prop="patWardCode">
- <el-input
- v-model="queryParams.patWardCode"
- placeholder="璇疯緭鍏ョ梾鍖轰唬鐮�"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
- </el-form-item>
- <el-form-item label="鐥呭尯" prop="patWardDesc">
- <el-input
- v-model="queryParams.patWardDesc"
- placeholder="璇疯緭鍏ョ梾鍖哄悕绉�"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
- </el-form-item>
- <el-form-item label="搴婂彿" prop="patBedNo">
- <el-input
- v-model="queryParams.patBedNo"
- placeholder="璇疯緭鍏ュ簥鍙�"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
@@ -156,6 +79,7 @@
/>
</el-select>
</el-form-item>
+<!--
<el-form-item label="棰勭害鏉ユ簮" prop="bookSrc">
<el-input
v-model="queryParams.bookSrc"
@@ -165,6 +89,7 @@
class="!w-240px"
/>
</el-form-item>
+-->
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 鎼滅储</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 閲嶇疆</el-button>
diff --git a/src/views/ecg/devrent/index.vue b/src/views/ecg/devrent/index.vue
index d6005c5..e16a966 100644
--- a/src/views/ecg/devrent/index.vue
+++ b/src/views/ecg/devrent/index.vue
@@ -6,7 +6,7 @@
:model="queryParams"
ref="queryFormRef"
:inline="true"
- label-width="68px"
+ label-width="120px"
>
<el-form-item label="璁惧缂栧彿" prop="devId">
<el-input
@@ -35,7 +35,7 @@
class="!w-240px"
/>
</el-form-item>
- <el-form-item label="瑁呮満鏃堕棿" prop="rentTime">
+ <el-form-item label="妫�鏌�&瑁呮満鏃堕棿" prop="rentTime">
<el-date-picker
v-model="queryParams.rentTime"
value-format="YYYY-MM-DD HH:mm:ss"
@@ -58,39 +58,6 @@
/>
</el-form-item>
<!--
- <el-form-item label="骞叉壈鏁�" prop="interference">
- <el-input
- v-model="queryParams.interference"
- placeholder="璇疯緭鍏ュ共鎵版暟"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
- </el-form-item>
- <el-form-item label="鍩虹嚎绮�" prop="baseline">
- <el-switch
- v-model="queryParams.baseline"
- :active-value="1"
- :inactive-value="0"
- />
- </el-form-item>
- <el-form-item label="鑴辫惤" prop="detachment">
- <el-switch
- v-model="queryParams.detachment"
- :active-value="1"
- :inactive-value="0"
- />
- </el-form-item>
--->
- <el-form-item label="澶囨敞" prop="remark">
- <el-input
- v-model="queryParams.remark"
- placeholder="璇疯緭鍏ュ娉�"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
- </el-form-item>
<el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
@@ -102,6 +69,7 @@
class="!w-220px"
/>
</el-form-item>
+-->
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 鎼滅储</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 閲嶇疆</el-button>
@@ -134,7 +102,7 @@
<el-table-column label="鎮ｈ�呯紪鍙�" align="center" prop="patId" />
<el-table-column label="鎮ｈ�呭悕绉�" align="center" prop="patName" />
<el-table-column
- label="瑁呮満鏃堕棿"
+ label="妫�鏌�&瑁呮満鏃堕棿"
align="center"
prop="rentTime"
:formatter="dateFormatter"
@@ -151,6 +119,7 @@
<el-table-column label="鍩虹嚎绮�" align="center" prop="baseline" />
<el-table-column label="鑴辫惤" align="center" prop="detachment" />
<el-table-column label="澶囨敞" align="center" prop="remark" />
+<!--
<el-table-column
label="鍒涘缓鏃堕棿"
align="center"
@@ -158,6 +127,7 @@
:formatter="dateFormatter"
width="180px"
/>
+-->
<el-table-column label="鎿嶄綔" align="center" min-width="120px">
<template #default="scope">
<el-button
--
Gitblit v1.9.3