From 88481a34a70b92804b622c1fcaa3f1c3e01f5402 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 17 三月 2025 11:25:11 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/record/detailpage/index.vue | 2 --
src/views/patient/patient/index.vue | 15 +++++++++++++--
src/views/followvisit/discharge/index.vue | 37 +++++++++++++++++++++++--------------
3 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 773b2af..50992c8 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -92,7 +92,7 @@
</el-form-item>
<el-form-item label="搴旈殢璁挎椂闂�">
<el-date-picker
- v-model="dateRange"
+ v-model="dateRangefs"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
@@ -475,18 +475,24 @@
</el-table-column> -->
<el-table-column
label="浠诲姟缁撴灉璇存槑"
- width="200"
+ width="220"
align="center"
key="remark"
prop="remark"
>
- <template slot-scope="scope" v-if="scope.row.remark">
- <el-tag
- type="warning"
- v-if="scope.row.sendstate != 5 && scope.row.sendstate != 4"
- >{{ scope.row.remark }}</el-tag
+ <template slot-scope="scope" v-if="scope.row.remark">
+ <el-tooltip
+ :content="scope.row.remark"
+ placement="top"
+ effect="dark"
>
- <el-tag type="warning" v-else>{{ scope.row.remark }}</el-tag>
+ <el-tag
+ type="warning"
+ v-if="scope.row.sendstate != 5 && scope.row.sendstate != 4"
+ >{{ scope.row.remark }}</el-tag
+ >
+ <el-tag type="warning" v-else>{{ scope.row.remark }}</el-tag>
+ </el-tooltip>
</template>
</el-table-column>
<el-table-column
@@ -794,6 +800,7 @@
initPassword: undefined,
// 鏃ユ湡鑼冨洿
dateRange: [],
+ dateRangefs: [],
// 宀椾綅閫夐」
postOptions: [],
ruleForm: {
@@ -893,8 +900,8 @@
topqueryParams: {
pageNum: 1,
pageSize: 10,
- sendstate:2,
- sort: 1,
+ sendstate: 2,
+ sort: 2, //0 鍑洪櫌鏃堕棿(姝ｅ簭) 1 鍑洪櫌鏃堕棿(鍊掑簭) 2 鍙戦�佹椂闂�(姝ｅ簭) 3 鍙戦�佹椂闂�(鍊掑簭)
serviceType: 2,
searchscope: 3,
scopetype: [],
@@ -1176,7 +1183,8 @@
this.topqueryParams.pageNum = 1;
this.topqueryParams.startOutHospTime = this.dateRange[0];
this.topqueryParams.endOutHospTime = this.dateRange[1];
-
+ this.topqueryParams.startSendDateTime = this.dateRangefs[0];
+ this.topqueryParams.endSendDateTime = this.dateRangefs[1];
this.getList(refresh);
},
// 鎮ｈ�呰寖鍥村鐞�
@@ -1201,13 +1209,14 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.dateRange = [];
+ this.dateRangefs = [];
this.topqueryParams = {
pageNum: 1,
pageSize: 10,
serviceType: 2,
- sendstate:2,
+ sendstate: 2,
searchscope: 2,
- sort: 1,
+ sort: 2,
};
this.handleQuery(1);
},
@@ -1428,7 +1437,7 @@
},
// 鍒涘缓鍐嶆闅忚鏈嶅姟
setupsubtask() {
- this.$refs['zcform'].validate((valid) => {
+ this.$refs["zcform"].validate((valid) => {
if (valid) {
let form = structuredClone(this.zcform);
form.longSendTime = this.formatTime(form.date1);
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 9b23f52..e0c8665 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -203,7 +203,6 @@
<el-col :span="12"
><el-form-item label="鑱旂郴鐢佃瘽">
<el-input
- disabled
placeholder="鑱旂郴鐢佃瘽缂哄け"
v-model="userform.telcode"
></el-input> </el-form-item
@@ -211,7 +210,6 @@
<el-col :span="12"
><el-form-item label="鑱旂郴浜虹數璇�">
<el-input
- disabled
placeholder="鑱旂郴浜虹數璇濈己澶�"
v-model="userform.relativetelcode"
></el-input> </el-form-item
diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue
index d383669..ad5972f 100644
--- a/src/views/patient/patient/index.vue
+++ b/src/views/patient/patient/index.vue
@@ -1027,6 +1027,7 @@
pageNum: 1,
allhosp: "1",
pageSize: 10,
+ notrequiredFlag:0,
searchscope: 2,
idcardno: undefined,
name: undefined,
@@ -1179,8 +1180,18 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.dateRange = [];
- this.resetForm("queryForm");
- this.$refs.tree.setCurrentKey(null);
+ this.queryParams= {
+ pageNum: 1,
+ allhosp: "1",
+ pageSize: 10,
+ notrequiredFlag:0,
+ searchscope: 2,
+ idcardno: undefined,
+ name: undefined,
+ status: undefined,
+ tagIds: undefined,
+ telcode: undefined,
+ },
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
--
Gitblit v1.9.3