From 401c8356fba9004e3f3301002bbb2267cb1f973f Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 16 四月 2025 20:04:16 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 12 ++--
src/views/patient/patient/operation.vue | 4
src/views/patient/patient/hospital.vue | 17 ++++-
src/views/patient/patient/outpatient.vue | 106 ++++++++++++++++++++++-------------
src/views/patient/patient/behospitalized.vue | 17 ++++-
src/views/followvisit/discharge/index.vue | 1
6 files changed, 100 insertions(+), 57 deletions(-)
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 9e33b7b..e8b906a 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -1292,7 +1292,6 @@
let code = value.slice(-1)[0];
this.topqueryParams.leavehospitaldistrictcodes = [];
this.topqueryParams.leaveldeptcodes = [];
-
if (type == 1) {
this.topqueryParams.leaveldeptcodes.push(code);
this.topqueryParams.leavehospitaldistrictcodes = [];
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index e495ccf..fbcca62 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -528,10 +528,10 @@
value: "12",
label: "蹇冪數闅忚",
},
- // {
- // value: "13",
- // label: "涓撶闅忚",
- // },
+ {
+ value: "13",
+ label: "涓撶闅忚",
+ },
],
tasktopic: "2", //鏂板绫诲瀷
activname: "",
@@ -762,8 +762,8 @@
// this.taskoptions,
// this.tasktopic
// );
- this.topqueryParams.startOutHospTime = this.dateRange[0];
- this.topqueryParams.endOutHospTime = this.dateRange[1];
+ this.topqueryParams.beginTime = this.dateRange[0];
+ this.topqueryParams.endTime = this.dateRange[1];
getTasklist(this.topqueryParams).then((response) => {
this.userList = response.rows;
this.total = response.total;
diff --git a/src/views/patient/patient/behospitalized.vue b/src/views/patient/patient/behospitalized.vue
index d0b928d..8c16f65 100644
--- a/src/views/patient/patient/behospitalized.vue
+++ b/src/views/patient/patient/behospitalized.vue
@@ -54,7 +54,7 @@
></el-cascader>
</el-form-item>
<el-form-item label=" 鍏ラ櫌鏃ユ湡 " prop="createTime">
- <el-date-picker
+ <!-- <el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd"
@@ -62,7 +62,16 @@
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
+ ></el-date-picker> -->
+ <el-date-picker
+ v-model="dateRange"
+ type="datetimerange"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ :default-time="['12:00:00']"
+ >
+ </el-date-picker>
</el-form-item>
<el-row>
@@ -692,8 +701,8 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
- this.queryParams.startInHospTime = this.dateRange[0];
- this.queryParams.endInHospTime = this.dateRange[1];
+ this.queryParams.beginTime = this.dateRange[0];
+ this.queryParams.endTime = this.dateRange[1];
this.queryParams.pageNum = 1;
this.getList();
},
diff --git a/src/views/patient/patient/hospital.vue b/src/views/patient/patient/hospital.vue
index cddef99..8724581 100644
--- a/src/views/patient/patient/hospital.vue
+++ b/src/views/patient/patient/hospital.vue
@@ -57,7 +57,7 @@
></el-cascader>
</el-form-item>
<el-form-item label=" 鍑洪櫌鏃ユ湡 " prop="createTime">
- <el-date-picker
+ <!-- <el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd"
@@ -65,7 +65,16 @@
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
+ ></el-date-picker> -->
+ <el-date-picker
+ v-model="dateRange"
+ type="datetimerange"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ :default-time="['12:00:00']"
+ >
+ </el-date-picker>
</el-form-item>
<el-row>
@@ -675,8 +684,8 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
- this.queryParams.startOutHospTime = this.dateRange[0];
- this.queryParams.endOutHospTime = this.dateRange[1];
+ this.queryParams.beginTime = this.dateRange[0];
+ this.queryParams.endTime = this.dateRange[1];
this.queryParams.pageNum = 1;
this.getList();
},
diff --git a/src/views/patient/patient/operation.vue b/src/views/patient/patient/operation.vue
index 7af715a..94aedb7 100644
--- a/src/views/patient/patient/operation.vue
+++ b/src/views/patient/patient/operation.vue
@@ -599,8 +599,8 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
- this.queryParams.startOutHospTime = this.dateRange[0];
- this.queryParams.endOutHospTime = this.dateRange[1];
+ this.queryParams.beginTime = this.dateRange[0];
+ this.queryParams.endTime = this.dateRange[1];
this.queryParams.pageNum = 1;
this.getList();
},
diff --git a/src/views/patient/patient/outpatient.vue b/src/views/patient/patient/outpatient.vue
index cf24dc1..0619aca 100644
--- a/src/views/patient/patient/outpatient.vue
+++ b/src/views/patient/patient/outpatient.vue
@@ -11,8 +11,7 @@
v-show="showSearch"
label-width="98px"
>
- <el-form-item label="濮撳悕"
- width="100" prop="name">
+ <el-form-item label="濮撳悕" width="100" prop="name">
<el-input
v-model="queryParams.patname"
placeholder="璇疯緭鍏ュ鍚�"
@@ -32,22 +31,42 @@
</el-form-item>
<el-form-item label="鎮ｈ�呰寖鍥�" prop="status">
- <el-cascader
- v-model="queryParams.scopetype"
- placeholder="榛樿鍏ㄩ儴"
- :options="sourcetype"
- :props="{ expandTrigger: 'hover' }"
- @change="handleChange"
- ></el-cascader>
- </el-form-item>
+ <el-cascader
+ v-model="queryParams.scopetype"
+ placeholder="榛樿鍏ㄩ儴"
+ :options="sourcetype"
+ :props="{ expandTrigger: 'hover' }"
+ @change="handleChange"
+ ></el-cascader>
+ </el-form-item>
<el-row>
- <el-form-item label=" 灏辫瘖鏃ユ湡 " prop="admitdate">
+ <!-- <el-form-item label=" 灏辫瘖鏃ユ湡 " prop="admitdate">
<el-date-picker
clearable
v-model="queryParams.admitdate"
type="date"
value-format="yyyy-MM-dd"
placeholder="璇烽�夋嫨 灏辫瘖鏃ユ湡 "
+ >
+ </el-date-picker>
+ </el-form-item> -->
+ <el-form-item label="灏辫瘖鏃ユ湡">
+ <!-- <el-date-picker
+ v-model="dateRange"
+ style="width: 240px"
+ value-format="yyyy-MM-dd"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker> -->
+ <el-date-picker
+ v-model="dateRange"
+ type="datetimerange"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ :default-time="['12:00:00']"
>
</el-date-picker>
</el-form-item>
@@ -166,29 +185,35 @@
prop="outhospno"
/>
<el-table-column
- label="濮撳悕"
- width="100"
- align="center"
- key="patname"
- prop="patname"
- >
- <template slot-scope="scope">
- <el-button
- size="medium"
- type="text"
- @click="
- $router.push({
+ label="濮撳悕"
+ width="100"
+ align="center"
+ key="patname"
+ prop="patname"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="medium"
+ type="text"
+ @click="
+ $router.push({
path: '/patient/indexls/',
query: { sfzh: scope.row.idcardno },
})
- "
- ><span class="button-textsc"
- >{{scope.row.patname}}</span
- ></el-button
- >
- </template>
- </el-table-column>
- <el-table-column label="鎬у埆"width="100" align="center" key="sex" prop="sex">
+ "
+ ><span class="button-textsc">{{
+ scope.row.patname
+ }}</span></el-button
+ >
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鎬у埆"
+ width="100"
+ align="center"
+ key="sex"
+ prop="sex"
+ >
<template slot-scope="scope">
<span>{{ scope.row.sex == 1 ? "鐢�" : "濂�" }}</span>
</template>
@@ -334,9 +359,10 @@
<div class="uploading" v-else-if="dractive == 2">
<el-table :data="uploadingData" style="width: 100%">
<el-table-column prop="serial" label="搴忓彿"> </el-table-column>
- <el-table-column prop="name" label="濮撳悕"
- width="100"> </el-table-column>
- <el-table-column prop="sex" label="鎬у埆"width="100"> </el-table-column>
+ <el-table-column prop="name" label="濮撳悕" width="100">
+ </el-table-column>
+ <el-table-column prop="sex" label="鎬у埆" width="100">
+ </el-table-column>
<el-table-column prop="certificate" label="璇佷欢绫诲瀷">
</el-table-column>
<el-table-column prop="certificatenum" label="璇佷欢鍙风爜">
@@ -387,9 +413,7 @@
updatePatouthosp,
delPatouthosp,
} from "@/api/smartor/patouthosp";
-import {
- particularpatient,
-} from "@/api/patient/homepage";
+import { particularpatient } from "@/api/patient/homepage";
import { listtag } from "@/api/system/label";
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
@@ -590,6 +614,8 @@
this.queryParams.leavehospitaldistrictcodes =
store.getters.belongWards.map((obj) => obj.districtCode);
}
+ this.queryParams.beginTime = this.dateRange[0];
+ this.queryParams.endTime = this.dateRange[1];
listPatouthosp(this.queryParams).then((response) => {
this.userList = response.rows;
this.total = response.total;
@@ -678,11 +704,11 @@
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
- this.queryParams= {
+ (this.queryParams = {
pageNum: 1,
pageSize: 10,
- },
- this.handleQuery();
+ }),
+ this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
--
Gitblit v1.9.3