From 9f5b4e23bbca058ecef83397ff95dbe0fed7bd5e Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 08 四月 2025 14:02:05 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 14 +++-
src/views/patient/patient/physical.vue | 8 +-
src/views/patient/patient/ExternalPatient.vue | 23 ++++---
src/views/patient/propaganda/Missionotice.vue | 4
src/views/patient/patient/hospital.vue | 16 +++++
src/views/patient/patient/outpatient.vue | 6 +-
src/views/patient/medtechnician/Compositeeditdetails.vue | 23 ++++---
src/views/patient/patient/behospitalized.vue | 20 ++++++
src/views/patient/patient/index.vue | 23 ++++---
src/views/patient/patient/profile/index.vue | 10 +-
src/views/patient/medtechnician/PatientChart.vue | 9 ++
11 files changed, 106 insertions(+), 50 deletions(-)
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index e8e66a3..a5ce6e6 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -165,14 +165,18 @@
:show-overflow-tooltip="true"
/>
<el-table-column
- label="寰呴殢璁�/鎬讳换鍔�"
+ label="鎬讳换鍔�/宸查殢璁�"
align="center"
key="nickName"
width="120"
prop="nickName"
>
<template slot-scope="scope">
- <span>{{ scope.row.wfs }}/{{ scope.row.yfs }}</span>
+ <span
+ >{{ scope.row.wfs ? scope.row.wfs + scope.row.yfs : "" }}/{{
+ scope.row.yfs
+ }}</span
+ >
</template>
</el-table-column>
<el-table-column
@@ -695,7 +699,7 @@
this.tasktopic == 7 ||
this.tasktopic == 6
) {
- if (!this.topqueryParams.type) this.topqueryParams.type = '2';
+ if (!this.topqueryParams.type) this.topqueryParams.type = "2";
this.longtermlist = [
{
value: 1,
@@ -707,7 +711,7 @@
},
];
} else if (this.tasktopic == 4 || this.tasktopic == 8) {
- if (!this.topqueryParams.type) this.topqueryParams.type = '3';
+ if (!this.topqueryParams.type) this.topqueryParams.type = "3";
this.longtermlist = [
{
value: 3,
@@ -715,7 +719,7 @@
},
];
} else if (this.tasktopic == 5) {
- if (!this.topqueryParams.type) this.topqueryParams.type = '1';
+ if (!this.topqueryParams.type) this.topqueryParams.type = "1";
this.longtermlist = [
{
value: 1,
diff --git a/src/views/patient/medtechnician/Compositeeditdetails.vue b/src/views/patient/medtechnician/Compositeeditdetails.vue
index 4d55836..cca2e90 100644
--- a/src/views/patient/medtechnician/Compositeeditdetails.vue
+++ b/src/views/patient/medtechnician/Compositeeditdetails.vue
@@ -359,15 +359,20 @@
prop="templatename"
/>
<el-table-column
- label="寰呴殢璁�/鎬讳换鍔�"
- align="center"
- key="nickName"
- prop="nickName"
- >
- <template slot-scope="scope">
- <span>{{ scope.row.wfs }}/{{ scope.row.yfs }}</span>
- </template>
- </el-table-column>
+ label="鎬讳换鍔�/宸查殢璁�"
+ align="center"
+ key="nickName"
+ width="120"
+ prop="nickName"
+ >
+ <template slot-scope="scope">
+ <span
+ >{{ scope.row.wfs ? scope.row.wfs + scope.row.yfs : "" }}/{{
+ scope.row.yfs
+ }}</span
+ >
+ </template>
+ </el-table-column>
<el-table-column
label="鍒涘缓浜�"
align="center"
diff --git a/src/views/patient/medtechnician/PatientChart.vue b/src/views/patient/medtechnician/PatientChart.vue
index f274342..f21143c 100644
--- a/src/views/patient/medtechnician/PatientChart.vue
+++ b/src/views/patient/medtechnician/PatientChart.vue
@@ -158,13 +158,18 @@
:show-overflow-tooltip="true"
/>
<el-table-column
- label="寰呴殢璁�/鎬讳换鍔＄粍"
+ label="鎬讳换鍔�/宸查殢璁�"
align="center"
key="nickName"
+ width="120"
prop="nickName"
>
<template slot-scope="scope">
- <span>{{ scope.row.wfs }}/{{ scope.row.yfs }}</span>
+ <span
+ >{{ scope.row.wfs ? scope.row.wfs + scope.row.yfs : "" }}/{{
+ scope.row.yfs
+ }}</span
+ >
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/patient/patient/ExternalPatient.vue b/src/views/patient/patient/ExternalPatient.vue
index 83cbeab..5f20aaa 100644
--- a/src/views/patient/patient/ExternalPatient.vue
+++ b/src/views/patient/patient/ExternalPatient.vue
@@ -263,15 +263,20 @@
prop="templatename"
/>
<el-table-column
- label="寰呴殢璁�/鎬讳换鍔�"
- align="center"
- key="nickName"
- prop="nickName"
- >
- <template slot-scope="scope">
- <span>{{ scope.row.wfs }}/{{ scope.row.yfs }}</span>
- </template>
- </el-table-column>
+ label="鎬讳换鍔�/宸查殢璁�"
+ align="center"
+ key="nickName"
+ width="120"
+ prop="nickName"
+ >
+ <template slot-scope="scope">
+ <span
+ >{{ scope.row.wfs ? scope.row.wfs + scope.row.yfs : "" }}/{{
+ scope.row.yfs
+ }}</span
+ >
+ </template>
+ </el-table-column>
<el-table-column
label="鍒涘缓浜�"
align="center"
diff --git a/src/views/patient/patient/behospitalized.vue b/src/views/patient/patient/behospitalized.vue
index 3f35db3..3c386b7 100644
--- a/src/views/patient/patient/behospitalized.vue
+++ b/src/views/patient/patient/behospitalized.vue
@@ -19,6 +19,22 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+ <el-form-item label="涓绘不鍖荤敓" prop="name">
+ <el-input
+ v-model="queryParams.drname"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="璐ｄ换鎶ゅ＋" prop="name">
+ <el-input
+ v-model="queryParams.nurseName"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
<el-form-item label="浣忛櫌鍙�" prop="patid">
<el-input
v-model="queryParams.patid"
@@ -211,7 +227,7 @@
prop="leavehospitaldistrictname"
width="120"
/>
- <el-table-column
+ <!-- <el-table-column
label="搴婁綅鍙�"
align="center"
key="bedNo"
@@ -231,7 +247,7 @@
key="nurseName"
prop="nurseName"
width="120"
- />
+ /> -->
<el-table-column
label="鎿嶄綔"
diff --git a/src/views/patient/patient/hospital.vue b/src/views/patient/patient/hospital.vue
index 839e198..1a0f749 100644
--- a/src/views/patient/patient/hospital.vue
+++ b/src/views/patient/patient/hospital.vue
@@ -20,6 +20,22 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+ <el-form-item label="涓绘不鍖荤敓" prop="name">
+ <el-input
+ v-model="queryParams.drname"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="璐ｄ换鎶ゅ＋" prop="name">
+ <el-input
+ v-model="queryParams.nurseName"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
<el-form-item label="浣忛櫌鍙�" prop="patid">
<el-input
v-model="queryParams.patid"
diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue
index d89caa1..78643ad 100644
--- a/src/views/patient/patient/index.vue
+++ b/src/views/patient/patient/index.vue
@@ -442,15 +442,20 @@
prop="templatename"
/>
<el-table-column
- label="寰呴殢璁�/鎬讳换鍔�"
- align="center"
- key="nickName"
- prop="nickName"
- >
- <template slot-scope="scope">
- <span>{{ scope.row.wfs }}/{{ scope.row.yfs }}</span>
- </template>
- </el-table-column>
+ label="鎬讳换鍔�/宸查殢璁�"
+ align="center"
+ key="nickName"
+ width="120"
+ prop="nickName"
+ >
+ <template slot-scope="scope">
+ <span
+ >{{ scope.row.wfs ? scope.row.wfs + scope.row.yfs : "" }}/{{
+ scope.row.yfs
+ }}</span
+ >
+ </template>
+ </el-table-column>
<el-table-column
label="鍒涘缓浜�"
align="center"
diff --git a/src/views/patient/patient/outpatient.vue b/src/views/patient/patient/outpatient.vue
index e6bc381..9045b31 100644
--- a/src/views/patient/patient/outpatient.vue
+++ b/src/views/patient/patient/outpatient.vue
@@ -152,12 +152,12 @@
<el-table-column
label="灏辫瘖鏃堕棿"
align="center"
- key="createTime"
- prop="createTime"
+ key="admitdate"
+ prop="admitdate"
width="160"
>
<template slot-scope="scope">
- <span>{{ formatTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.admitdate) }}</span>
</template>
</el-table-column>
diff --git a/src/views/patient/patient/physical.vue b/src/views/patient/patient/physical.vue
index 35e4ad0..90f9831 100644
--- a/src/views/patient/patient/physical.vue
+++ b/src/views/patient/patient/physical.vue
@@ -254,12 +254,12 @@
<el-table-column
label="灏辫瘖鏃堕棿"
align="center"
- key="createTime"
- prop="createTime"
+ key="admitdate"
+ prop="admitdate"
width="160"
>
<template slot-scope="scope">
- <span>{{ formatTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.admitdate) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -269,7 +269,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ formatTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.updateTime) }}</span>
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/patient/patient/profile/index.vue b/src/views/patient/patient/profile/index.vue
index 4cacbcc..edb58b7 100644
--- a/src/views/patient/patient/profile/index.vue
+++ b/src/views/patient/patient/profile/index.vue
@@ -364,12 +364,12 @@
<el-table-column
label="灏辫瘖鏃堕棿"
align="center"
- key="createTime"
- prop="createTime"
+ key="admitdate"
+ prop="admitdate"
width="160"
>
<template slot-scope="scope">
- <span>{{ formatTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.admitdate) }}</span>
</template>
</el-table-column>
@@ -531,8 +531,8 @@
<el-table-column
label="浣忛櫌鍙�"
align="center"
- key="patno"
- prop="patno"
+ key="inhospno"
+ prop="inhospno"
width="120"
/>
<el-table-column
diff --git a/src/views/patient/propaganda/Missionotice.vue b/src/views/patient/propaganda/Missionotice.vue
index 4e1f701..a870188 100644
--- a/src/views/patient/propaganda/Missionotice.vue
+++ b/src/views/patient/propaganda/Missionotice.vue
@@ -199,8 +199,8 @@
<el-table-column
label="灏辫瘖鏃堕棿"
align="center"
- key="visitTime"
- prop="visitTime"
+ key="admitdate"
+ prop="admitdate"
width="160"
>
</el-table-column>
--
Gitblit v1.9.3