From a346cfbcb03a303dca252d910d2181f00e7adc20 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 03 九月 2024 10:39:10 +0800
Subject: [PATCH] 测试完成
---
src/views/patient/propaganda/particty.vue | 79 +++++++++++++++++++++++++--------------
1 files changed, 51 insertions(+), 28 deletions(-)
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index d668ffe..acc683b 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -14,7 +14,6 @@
title="浠诲姟涓讳綋"
description="鍦ㄦ湰閮ㄩ�夋嫨鏈嶅姟鎮ｈ��"
></el-step>
- <el-step icon="el-icon-user" title="妯＄増纭"></el-step>
</el-steps>
</div>
</div>
@@ -67,7 +66,7 @@
placeholder="璇疯緭鍏ヤ换鍔℃弿杩�"
/>
</el-form-item>
- <el-form-item label="鍙戦�佽缃細" v-if="currenttype != 2">
+ <el-form-item label="鍙戦�佽缃細">
<el-radio-group v-model="form.sendType">
<el-radio :label="1">鏃堕棿娈靛彂閫�</el-radio>
<el-radio :label="3">鏃堕棿鐐瑰彂閫�</el-radio>
@@ -335,6 +334,17 @@
@keyup.enter.native="handleQuery"
></el-input>
</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-form-item>
<el-form-item>
<el-button
@@ -348,7 +358,7 @@
icon="el-icon-refresh"
size="medium"
@click="resetQuery"
- >鍙栨秷鍒涘缓</el-button
+ >閲嶇疆</el-button
>
</el-form-item>
</el-form>
@@ -437,16 +447,10 @@
v-show="showSearch"
label-width="98px"
>
- <el-form-item
- label="闅忚涓婚"
- v-if="currenttype == 1 || currenttype == 8"
- >
+ <el-form-item label="闅忚涓婚">
<el-input v-model="topqueryParams.name"></el-input>
</el-form-item>
- <el-form-item
- label="闅忚鍚嶇О"
- v-if="currenttype == 2 || currenttype == 3 || currenttype == 7"
- >
+ <el-form-item label="闅忚鍚嶇О">
<el-input v-model="topqueryParams.name"></el-input>
</el-form-item>
@@ -523,13 +527,18 @@
export default {
name: "ServiceDetails",
data() {
+ const endDate = new Date();
+ const startDate = new Date();
+ startDate.setDate(endDate.getDate() - 7); // 璁剧疆寮�濮嬫棩鏈熶负褰撳墠鏃ユ湡鍓�7澶�
return {
title: "闅忚鍐呭鍒楄〃",
- currenttype: 1, //1闅忚2闂ㄨ瘖3鍑洪櫌4澶嶈瘖5浣撴6闂嵎
+ currenttype: 1, //1闅忚2闂嵎3閫氱煡瀹ｆ暀
id: "", //
previewid: "", //浠诲姟妯＄増浼犻�抜d
libName: "",
overallCase: [], //閫夋嫨鎮ｈ�呮��
+ // 鏃ユ湡鑼冨洿
+ dateRange: [startDate, endDate],
allpids: [],
libId: null, //妯℃澘搴撴ā鐗坕d
nhh: null, //鏄惁渚濈収鏂板
@@ -545,12 +554,11 @@
questionList: [],
// 鎮ｈ�呰〃鍗�
tableLabelhz: [
- { label: "搴忓彿", width: "", prop: "patid" },
{ label: "鎮ｈ�呭悕绉�", width: "", prop: "name" },
{ label: "鎬у埆", width: "", prop: "sex" },
{ label: "骞撮緞", width: "", prop: "age" },
{ label: "灏辫瘖绉戝", width: "", prop: "deptName" },
- { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "inhosptime" },
+ { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "birthdate" },
{ label: "鍒涘缓浜猴紙缂猴級", width: "", prop: "update_by" },
],
@@ -723,7 +731,6 @@
isavailable: "",
};
this.currenttype = this.$route.query.type;
- console.log(this.currenttype, "1");
// 鍑洪櫌銆侀棬璇娿�佷笓鐥呴殢璁�
this.title = "闅忚鍐呭鍒楄〃";
this.tableLabel = this.tableLabelmz;
@@ -733,7 +740,6 @@
value: "1",
label: "浜哄伐",
},
-
{
value: "3",
label: "鐢佃瘽",
@@ -795,7 +801,6 @@
// 淇濆瓨
submitForm(formName) {
this.form.preachform = this.checkList.join(",");
-
// this.formatFn(1);
if (!this.form.patTaskRelevances[0]) {
this.$modal.msgError("璇烽�夋嫨鐥呬汉");
@@ -819,7 +824,10 @@
} else {
this.$modal.msgSuccess("淇敼鎴愬姛");
}
- this.$router.go(-1);
+ this.$router.push({
+ path: "/followvisit/tasklist",
+ query: { tasktopic: this.form.serviceType },
+ });
}
});
},
@@ -881,24 +889,22 @@
});
if (this.patientqueryParams.allhosp == 1) {
this.tableLabelhz = [
- { label: "搴忓彿", width: "", prop: "patid" },
{ label: "鎮ｈ�呭悕绉�", width: "", prop: "name" },
{ label: "鎬у埆", width: "", prop: "sex" },
{ label: "骞撮緞", width: "", prop: "age" },
{ label: "涓讳换鍖诲笀", width: "", prop: "drname" },
{ label: "灏辫瘖绉戝", width: "", prop: "deptName" },
- { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "inhosptime" },
+ { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "birthdate" },
{ label: "鍒涘缓浜�", width: "", prop: "createBy" },
];
} else if (this.patientqueryParams.allhosp == 2) {
this.tableLabelhz = [
- { label: "搴忓彿", width: "", prop: "patid" },
{ label: "鎮ｈ�呭悕绉�", width: "", prop: "name" },
{ label: "鎬у埆", width: "", prop: "sex" },
{ label: "骞撮緞", width: "", prop: "age" },
{ label: "璇婃柇", width: "", prop: "diagname" },
{ label: "灏辫瘖绉戝", width: "", prop: "deptName" },
- { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "inhosptime" },
+ { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "birthdate" },
{ label: "鍒涘缓浜�", width: "", prop: "createBy" },
];
}
@@ -909,8 +915,9 @@
this.patientqueryParams.pids = null;
}
- getTaskpatient(this.patientqueryParams).then((response) => {
- console.log(response);
+ getTaskpatient(
+ this.addDateRange(this.patientqueryParams, this.dateRange)
+ ).then((response) => {
this.patientuserList = response.rows;
this.patienttotal = response.total;
this.loading = false;
@@ -935,6 +942,7 @@
if (!isExist) {
console.log(this.patientqueryParams.allhosp, "allhosp");
item.isoperation = 1;
+ item.patid = item.id;
item.hospType = this.patientqueryParams.allhosp;
this.overallCase.push(item);
this.form.patTaskRelevances.push(item);
@@ -988,7 +996,18 @@
handleQuery() {
this.handleAddpatient();
},
- resetQuery() {},
+ resetQuery() {
+ this.dateRange = [];
+ // 鏌ヨ鍙傛暟
+ this.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ userName: undefined,
+ phonenumber: undefined,
+ status: undefined,
+ deptId: undefined,
+ };
+ },
handleClosehz() {
this.dialogVisiblepatient = false;
},
@@ -1129,6 +1148,7 @@
}
this.form.sendTimeslot = combinedData;
// 灞曠ず鏁版嵁涓存椂瀛樺偍鏃ユ湡銆佹棭銆佷腑銆佹櫄
+ console.log(this.daytime);
this.form.showDate = this.daytime.join(",");
if (this.time1) this.form.showTimeMorn = this.time1.join(",");
@@ -1139,15 +1159,18 @@
// 鏌ョ湅妯＄増
previewGo() {
this.$router.push({
- path: "/knowledge/templateku/configurat/",
+ path: "/knowledge/tpuconfigurat/",
query: { id: this.previewid, task: true, data: this.form },
});
},
previewFn() {
let id = this.Tasktemplate.id;
this.Tasktemplate.id = null;
- this.Tasktemplate.ivrLibaTemplateScriptVOList.ivrTaskScriptTargetoptionList =
- this.Tasktemplate.ivrLibaTemplateScriptVOList.ivrLibaScriptTargetoptionList;
+ this.Tasktemplate.ivrLibaTemplateScriptVOList.forEach((item) => {
+ item.ivrTaskScriptTargetoptionList = item.ivrLibaScriptTargetoptionList;
+ });
+ console.log(this.Tasktemplate.ivrLibaTemplateScriptVOList);
+
this.Tasktemplate.ivrTaskTemplateScriptVOList =
this.Tasktemplate.ivrLibaTemplateScriptVOList;
this.Tasktemplate.ivrLibaTemplateTagList = null;
--
Gitblit v1.9.3