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/discharge/index.vue | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 8208b99..50992c8 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -90,6 +90,17 @@
end-placeholder="缁撴潫鏃ユ湡"
></el-date-picker>
</el-form-item>
+ <el-form-item label="搴旈殢璁挎椂闂�">
+ <el-date-picker
+ v-model="dateRangefs"
+ style="width: 240px"
+ value-format="yyyy-MM-dd"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker>
+ </el-form-item>
<el-form-item label="鎮ｈ�呭鍚�" prop="sendname">
<el-input
@@ -213,6 +224,8 @@
<el-table-column
label="浠诲姟鍚嶇О"
fixed
+ width="150"
+ show-overflow-tooltip
align="center"
key="taskName"
prop="taskName"
@@ -462,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
@@ -781,6 +800,7 @@
initPassword: undefined,
// 鏃ユ湡鑼冨洿
dateRange: [],
+ dateRangefs: [],
// 宀椾綅閫夐」
postOptions: [],
ruleForm: {
@@ -880,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: [],
@@ -1163,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);
},
// 鎮ｈ�呰寖鍥村鐞�
@@ -1188,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);
},
@@ -1415,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);
--
Gitblit v1.9.3