From 574b449a39019a59dc90ecc19dda9f63d3aa9636 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期三, 18 十一月 2026 15:35:47 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/operation/index.vue | 84 ++++++++++++++++++++++++-----------------
1 files changed, 49 insertions(+), 35 deletions(-)
diff --git a/src/views/followvisit/operation/index.vue b/src/views/followvisit/operation/index.vue
index d0d9125..0f45670 100644
--- a/src/views/followvisit/operation/index.vue
+++ b/src/views/followvisit/operation/index.vue
@@ -126,6 +126,17 @@
end-placeholder="缁撴潫鏃ユ湡"
></el-date-picker>
</el-form-item>
+ <el-form-item label="闅忚瀹屾垚鏃堕棿">
+ <el-date-picker
+ v-model="dateRangefts"
+ 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="鎮h�呭鍚�" prop="sendname">
<el-input
@@ -173,6 +184,8 @@
v-model="topqueryParams.scopetype"
placeholder="榛樿鍏ㄩ儴"
:options="sourcetype"
+ filterable
+ clearable
:props="{ expandTrigger: 'hover' }"
@change="handleChange"
></el-cascader>
@@ -600,8 +613,8 @@
<el-table-column
label="绉戝"
align="center"
- key="deptname"
- prop="deptname"
+ key="leaveldeptname"
+ prop="leaveldeptname"
width="120"
>
</el-table-column>
@@ -693,7 +706,7 @@
size="medium"
type="text"
@click="handlestop(scope.row)"
- v-hasPermi="['system:user:edit']"
+
><span class="button-sc"
><i class="el-icon-remove-outline"></i>鏆傚仠鏈嶅姟</span
></el-button
@@ -1074,7 +1087,7 @@
<el-input
style="width: 400px"
disabled
- v-model="zcform.deptname"
+ v-model="zcform.leaveldeptname"
></el-input>
</el-form-item>
<el-form-item label="鐥呭尯">
@@ -1163,6 +1176,8 @@
dialogFormVisible: false,
// 鎬绘潯鏁�
total: 0,
+ jgvalue: 0,
+
// 鐢ㄦ埛琛ㄦ牸鏁版嵁
userList: null,
// 寮瑰嚭灞傛爣棰�
@@ -1178,6 +1193,7 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
dateRangefs: [],
+ dateRangefts: [],
// 宀椾綅閫夐」
postOptions: [],
ruleForm: {
@@ -1187,8 +1203,8 @@
dynamicTags: ["閫夐」涓�", "閫夐」浜�", "閫夐」涓�"], //閫夐」
inputVisible: false,
Labelchange: false,
- ycvalue: "",
- jgvalue: "",
+ ycvalue: 0,
+ jgvalue: 0,
yfsvalue: "",
inputValue: "",
preachform: "",
@@ -1341,8 +1357,7 @@
topqueryParams: {
pageNum: 1,
pageSize: 10,
- sendstateView:
- localStorage.getItem("orgname") == "鍗楀崕澶у闄勫睘绗竴鍖婚櫌" ? 1 : 2,
+ sendstateView:1,
sort: localStorage.getItem("orgname") == "涓芥按甯備腑鍖婚櫌" ? 8 : 2, //0 鎵嬫湳瀹屾垚鏃堕棿(姝e簭) 1 鎵嬫湳瀹屾垚鏃堕棿(鍊掑簭) 2 鍙戦�佹椂闂�(姝e簭) 3 鍙戦�佹椂闂�(鍊掑簭) 7搴旈殢璁挎棩鏈�(鍊掑簭) 搴旈殢璁挎棩鏈�(姝e簭)
serviceType: 19,
searchscope: 3,
@@ -1533,7 +1548,7 @@
this.topqueryParams.leavehospitaldistrictcodes =
store.getters.belongWards.map((obj) => obj.districtCode);
}
- if (this.endOut == 0) {
+ if (this.endOut == 0 && !this.topqueryParams.endSendDateTime) {
this.topqueryParams.endSendDateTime = this.formatDateToYYYYMMDDHHMMSS(
this.getEndOfDay()
);
@@ -1578,15 +1593,12 @@
this.loading = false;
this.userList.forEach((item) => {
let idArray = null;
- if (item.endtime) {
- item.endDay = this.daysBetween(item.endtime);
- }
+
+ item.endDay = this.daysBetween(item.endtime);
if (item.preachform) {
- if (item.endtime) {
- item.preachformson = item.preachform;
- idArray = item.preachform.split(",");
- }
+ item.preachformson = item.preachform;
+ idArray = item.preachform.split(",");
item.preachform = idArray.map((value) => {
// 鏌ユ壘id瀵瑰簲鐨勫璞�
@@ -1642,8 +1654,10 @@
this.getList(1);
},
onthatday() {
- this.topqueryParams.startSendDateTime = this.getCurrentDate();
- this.topqueryParams.endSendDateTime = this.getCurrentDate();
+ this.topqueryParams.sendstateView = 1; // 寰呴殢璁�
+ this.topqueryParams.sendstate = null;
+ this.topqueryParams.startSendDateTime = null;
+ this.topqueryParams.endSendDateTime = this.getCurrentDate(); // 寮�濮嬮殢璁挎棩鏈� <= 浠婂ぉ
this.getList(1);
},
getCurrentDate() {
@@ -1651,13 +1665,12 @@
return now.toISOString().slice(0, 10); // 鎴彇鍓�10涓瓧绗︼紝鍗� YYYY-MM-DD
},
buidegetTasklist(type) {
- if (this.topqueryParams.searchscope == 3) {
- this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
- (obj) => obj.deptCode
- );
- this.topqueryParams.leavehospitaldistrictcodes =
- store.getters.belongWards.map((obj) => obj.districtCode);
- }
+ // 鐢ㄦ埛鏉冮檺涓嬫墍鏈夊緟闅忚浠诲姟锛氫紶閫掑叏閮ㄧ瀹ゅ拰鐥呭尯
+ this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+ (obj) => obj.deptCode
+ );
+ this.topqueryParams.leavehospitaldistrictcodes =
+ store.getters.belongWards.map((obj) => obj.districtCode);
// 鎺ュ彈寮傚父璺宠浆
if (this.errtype) {
this.topqueryParams.leavehospitaldistrictcodes.push(
@@ -1669,7 +1682,7 @@
pageSize: 10,
leavehospitaldistrictcodes:
this.topqueryParams.leavehospitaldistrictcodes,
- sendstates: [2, 3],
+ sendstateView: 1,
leaveldeptcodes: this.topqueryParams.leaveldeptcodes,
};
buidegetTasklist(obj).then((response) => {
@@ -1688,15 +1701,11 @@
this.loading = false;
this.userList.forEach((item) => {
let idArray = null;
- if (item.endtime) {
- item.endDay = this.daysBetween(item.endtime);
- }
+ item.endDay = this.daysBetween(item.endtime);
if (item.preachform) {
- if (item.endtime) {
- item.preachformson = item.preachform;
- idArray = item.preachform.split(",");
- }
+ item.preachformson = item.preachform;
+ idArray = item.preachform.split(",");
item.preachform = idArray.map((value) => {
// 鏌ユ壘id瀵瑰簲鐨勫璞�
@@ -1779,6 +1788,8 @@
this.topqueryParams.endOutHospTime = this.dateRange[1];
this.topqueryParams.startSendDateTime = this.dateRangefs[0];
this.topqueryParams.endSendDateTime = this.dateRangefs[1];
+ this.topqueryParams.finishtimeStart = this.dateRangefts[0];
+ this.topqueryParams.finishtimeEnd = this.dateRangefts[1];
}
this.getList(refresh);
},
@@ -1835,11 +1846,14 @@
resetQuery() {
this.dateRange = [];
this.dateRangefs = [];
+ this.dateRangefts = [];
+
+ this.serviceStatusValue = 10;
+
this.topqueryParams = {
pageNum: 1,
pageSize: 10,
- sendstateView:
- localStorage.getItem("orgname") == "鍗楀崕澶у闄勫睘绗竴鍖婚櫌" ? 1 : 2,
+ sendstateView:1,
sort: 2, //0 鎵嬫湳瀹屾垚鏃堕棿(姝e簭) 1 鎵嬫湳瀹屾垚鏃堕棿(鍊掑簭) 2 鍙戦�佹椂闂�(姝e簭) 3 鍙戦�佹椂闂�(鍊掑簭)
serviceType: 19,
searchscope: 3,
--
Gitblit v1.9.3