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 | 354 +++++++++++++++++++++++-----------------------------------
1 files changed, 141 insertions(+), 213 deletions(-)
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index eb521a4..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>
@@ -162,8 +161,10 @@
<el-checkbox
v-for="(item, index) in checkboxlist"
:key="index"
- :label="item"
- ></el-checkbox>
+ :label="item.value"
+ >
+ {{ item.label }}</el-checkbox
+ >
</el-checkbox-group>
</el-form-item>
</el-form>
@@ -234,87 +235,7 @@
<div class="jic-value">
<el-row :gutter="20">
<!--鐢ㄦ埛鏁版嵁-->
- <!-- <el-form
- :model="topqueryParams"
- ref="queryForm"
- size="small"
- :inline="true"
- v-show="showSearch"
- label-width="98px"
- >
- <el-form-item label="鎮ｈ�呭悕绉�">
- <el-input v-model="topqueryParams.name"></el-input>
- </el-form-item>
- <el-form-item label="鎮ｈ�呰寖鍥�" prop="status">
- <el-select
- v-model="topqueryParams.scriptTopic"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in taskoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
-
- <el-form-item label="鎮ｈ�呯姸鎬�" prop="status">
- <el-select
- v-model="topqueryParams.scriptTopic"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in topicoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="闅忚缁撴灉" prop="status">
- <el-select
- v-model="topqueryParams.scriptTopic"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in topicoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鎮ｈ�呯數璇�">
- <el-input v-model="topqueryParams.name"></el-input>
- </el-form-item>
- <el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="medium"
- @click="handleQuery"
- >鎼滅储</el-button
- >
- <el-button
- icon="el-icon-refresh"
- size="medium"
- @click="resetQuery"
- >閲嶇疆</el-button
- >
- <el-button
- icon="el-icon-upload2"
- size="medium"
- type="warning"
- >褰撳墠鎮ｈ�呬竴閿彂閫�</el-button
- >
- </el-form-item>
- </el-form>
- <el-divider></el-divider> -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-select
@@ -389,7 +310,7 @@
</div>
<!-- 娣诲姞鎮ｈ�� -->
<el-dialog
- title="娣诲姞娲惧彂鎮ｈ��"
+ title="閫夋嫨鎮ｈ��"
:visible.sync="dialogVisiblepatient"
width="70%"
:before-close="handleClosehz"
@@ -408,28 +329,21 @@
label-width="98px"
>
<el-form-item label="鎮ｈ�呭悕绉帮細">
- <el-input v-model="patientqueryParams.name"></el-input>
+ <el-input
+ v-model="patientqueryParams.name"
+ @keyup.enter.native="handleQuery"
+ ></el-input>
</el-form-item>
-
- <el-form-item label="灏辫瘖绉戝" prop="status">
- <el-select
- v-model="patientqueryParams.scriptTopic"
- placeholder="璇烽�夋嫨"
- >
- <el-option-group
- v-for="group in topicoptions[0].children"
- :key="group.deptName"
- :label="group.deptName"
- >
- <el-option
- v-for="item in group.children"
- :key="item.deptId"
- :label="item.deptName"
- :value="item.deptId"
- >
- </el-option>
- </el-option-group>
- </el-select>
+ <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>
@@ -444,7 +358,7 @@
icon="el-icon-refresh"
size="medium"
@click="resetQuery"
- >鍙栨秷鍒涘缓</el-button
+ >閲嶇疆</el-button
>
</el-form-item>
</el-form>
@@ -533,91 +447,11 @@
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-input
- v-model="topqueryParams.name"
- ></el-input> </el-form-item
- ><el-form-item
- label="閫氱煡鍚嶇О"
- v-if="currenttype == 4 || currenttype == 5"
- >
+ <el-form-item label="闅忚鍚嶇О">
<el-input v-model="topqueryParams.name"></el-input>
- </el-form-item>
-
- <el-form-item
- label="闅忚绫诲瀷"
- prop="status"
- v-if="currenttype == 1 || currenttype == 8"
- >
- <el-select
- v-model="topqueryParams.scriptTopic"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in taskoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item
- label="閫氱煡绫诲瀷"
- prop="status"
- v-if="currenttype == 4 || currenttype == 5"
- >
- <el-select
- v-model="topqueryParams.scriptTopic"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in taskoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item
- label="闅忚绫诲瀷"
- prop="status"
- v-if="currenttype == 2 || currenttype == 3 || currenttype == 7"
- >
- <el-select
- v-model="topqueryParams.scriptTopic"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in taskoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
-
- <el-form-item label="閫傜敤褰㈠紡" prop="status">
- <el-select v-model="topqueryParams.topica" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in taskoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
</el-form-item>
<el-form-item label="閫傜敤绉戝" prop="status">
@@ -693,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, //鏄惁渚濈収鏂板
@@ -715,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" },
],
@@ -731,12 +569,7 @@
{ label: "鍒涘缓浜猴紙缂猴級", width: "", prop: "updateBy" },
],
- // 鍙橀噺
- tableLabelvariable: [
- { label: "鍙橀噺鍚嶇О", width: "", prop: "variablename" },
- { label: "鍖归厤绗�", width: "", prop: "character" },
- { label: "鏇挎崲鍊�", width: "", prop: "Replacementvalue" },
- ],
+ // 鏈嶅姟褰㈠紡
preachform: [
{ label: "绾夸笅", value: 1 },
{ label: "鐢佃瘽", value: 2 },
@@ -854,7 +687,7 @@
created() {
this.id = this.$route.query.id;
this.form.type = this.$route.query.type;
- this.form.typename = this.$route.query.typename;
+ this.form.serviceType = Number(this.$route.query.serviceType);
this.form.nhh = this.$route.query.nhh;
this.listDept();
this.Acquisitiontype();
@@ -898,11 +731,63 @@
isavailable: "",
};
this.currenttype = this.$route.query.type;
- console.log(this.currenttype, "1");
// 鍑洪櫌銆侀棬璇娿�佷笓鐥呴殢璁�
this.title = "闅忚鍐呭鍒楄〃";
this.tableLabel = this.tableLabelmz;
- this.checkboxlist = ["鐭俊", "寰俊", "浜哄伐鐢佃瘽", "鏅鸿兘鏈哄櫒浜�"];
+ if (this.form.serviceType == 2 || this.form.serviceType == 3) {
+ this.checkboxlist = [
+ {
+ value: "1",
+ label: "浜哄伐",
+ },
+ {
+ value: "3",
+ label: "鐢佃瘽",
+ },
+ {
+ value: "4",
+ label: "鐭俊",
+ },
+ {
+ value: "5",
+ label: "寰俊鍏紬鍙�",
+ },
+ {
+ value: "6",
+ label: "寰俊灏忕▼搴�",
+ },
+
+ {
+ value: "8",
+ label: "鏅鸿兘鏈哄櫒浜�",
+ },
+ ];
+ } else if (this.form.serviceType == 5) {
+ this.checkboxlist = [
+ {
+ value: "3",
+ label: "鐢佃瘽",
+ },
+ {
+ value: "4",
+ label: "鐭俊",
+ },
+ {
+ value: "5",
+ label: "寰俊鍏紬鍙�",
+ },
+ {
+ value: "6",
+ label: "寰俊灏忕▼搴�",
+ },
+
+ {
+ value: "8",
+ label: "鏅鸿兘鏈哄櫒浜�",
+ },
+ ];
+ }
+
getFollowuplist(queryParams).then((response) => {
this.userList = response.rows;
this.total = response.total;
@@ -915,8 +800,8 @@
},
// 淇濆瓨
submitForm(formName) {
- // this.form.preachform = this.checkList.join(",");
- this.formatFn(1);
+ this.form.preachform = this.checkList.join(",");
+ // this.formatFn(1);
if (!this.form.patTaskRelevances[0]) {
this.$modal.msgError("璇烽�夋嫨鐥呬汉");
return;
@@ -939,7 +824,10 @@
} else {
this.$modal.msgSuccess("淇敼鎴愬姛");
}
- this.$router.go(-1);
+ this.$router.push({
+ path: "/followvisit/tasklist",
+ query: { tasktopic: this.form.serviceType },
+ });
}
});
},
@@ -999,6 +887,27 @@
this.overallCase.forEach((item) => {
this.allpids.push(item.patid);
});
+ if (this.patientqueryParams.allhosp == 1) {
+ this.tableLabelhz = [
+ { label: "鎮ｈ�呭悕绉�", width: "", prop: "name" },
+ { label: "鎬у埆", width: "", prop: "sex" },
+ { label: "骞撮緞", width: "", prop: "age" },
+ { label: "涓讳换鍖诲笀", width: "", prop: "drname" },
+ { label: "灏辫瘖绉戝", width: "", prop: "deptName" },
+ { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "birthdate" },
+ { label: "鍒涘缓浜�", width: "", prop: "createBy" },
+ ];
+ } else if (this.patientqueryParams.allhosp == 2) {
+ this.tableLabelhz = [
+ { label: "鎮ｈ�呭悕绉�", width: "", prop: "name" },
+ { label: "鎬у埆", width: "", prop: "sex" },
+ { label: "骞撮緞", width: "", prop: "age" },
+ { label: "璇婃柇", width: "", prop: "diagname" },
+ { label: "灏辫瘖绉戝", width: "", prop: "deptName" },
+ { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "birthdate" },
+ { label: "鍒涘缓浜�", width: "", prop: "createBy" },
+ ];
+ }
if (this.allpids[0]) {
this.patientqueryParams.pids = this.allpids;
console.log(this.patientqueryParams.pids);
@@ -1006,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;
@@ -1032,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);
@@ -1042,10 +953,12 @@
// 鍒囨崲椤靛悗鎭㈠閫変腑
Restorecheck() {
console.log(this.overallCase, "this.overallCase");
- const allid = this.overallCase.map((item) => item.patid);
+ const allid = this.overallCase.map((item) => item.id);
const overlap = this.patientuserList.filter((value) => {
- return allid.includes(value.patid);
+ return allid.includes(value.id);
});
+ console.log(overlap, "overlap");
+
// 淇濇寔ids鍜屽綋鍓嶉〉闈㈢殑鍚屾鎬�
this.SelectPatientslist = overlap;
console.log(this.SelectPatientslist, "杩涘叆鍒嗛〉SelectPatientslist");
@@ -1083,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;
},
@@ -1109,7 +1033,7 @@
if (res.code == 200) {
this.form = res.data;
this.overallCase = this.form.patTaskRelevances.concat();
- this.formatFn(2);
+ this.checkList = this.form.preachform.split(",");
console.log(this.form.showDate, "this.form");
this.daytime = this.form.showDate.split(",");
this.changeTimeday(this.daytime);
@@ -1224,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(",");
@@ -1234,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