From 8904734d9acaac1341ba6c65501792e7fb916d56 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 15 八月 2024 09:42:55 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 90 ++++----
src/views/patient/propaganda/Missioncreation.vue | 65 +++++
src/views/patient/propaganda/particty.vue | 235 ++++++----------------
src/views/patient/propaganda/QuestionnaireTask.vue | 186 +++++++-----------
4 files changed, 251 insertions(+), 325 deletions(-)
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index cd4b95d..e569728 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -415,27 +415,36 @@
taskoptions: [
{
value: "1",
- label: "瀹ｆ暀鏈嶅姟",
+ label: "鐩戞祴璇勪及",
},
{
value: "2",
- label: "闂ㄨ瘖闅忚",
- },
- {
- value: "3",
label: "鍑洪櫌闅忚",
},
{
+ value: "3",
+ label: "闂ㄨ瘖闅忚",
+ },
+ {
value: "4",
- label: "澶嶈瘖鏈嶅姟",
+ label: "瀹ｆ暀鍏虫��",
},
{
value: "5",
- label: "浣撴閫氱煡",
+ label: "澶嶈瘖绠＄悊",
},
{
value: "6",
+ label: "婊℃剰搴﹁皟鏌�",
+ },
+ {
+ value: "7",
label: "鎮ｈ�呮姤鍛�",
+ },
+
+ {
+ value: "8",
+ label: "鍏朵粬閫氱煡",
},
],
tasktopic: "2", //鏂板绫诲瀷
@@ -616,7 +625,7 @@
this.getConfigKey("sys.user.initPassword").then((response) => {
this.initPassword = response.msg;
});
- this.taskoptions = store.getters.Serviceauthority;
+ // this.taskoptions = store.getters.Serviceauthority;
},
// 鎼滅储
mounted() {
@@ -631,30 +640,25 @@
this.tasktopic = this.$route.query.tasktopic
? this.$route.query.tasktopic
: this.tasktopic;
- if (this.tasktopic == 1) {
- this.topqueryParams.type = 3;
- this.TaskOperation.taskType = 3;
- } else if (this.tasktopic == 2) {
- this.topqueryParams.type = 1;
- this.TaskOperation.taskType = 1;
- } else if (this.tasktopic == 3) {
- this.topqueryParams.type = 1;
- this.TaskOperation.taskType = 1;
- } else if (this.tasktopic == 4) {
- this.topqueryParams.type = 1;
- this.TaskOperation.taskType = 1;
- } else if (this.tasktopic == 5) {
- this.topqueryParams.type = 1;
-
- this.TaskOperation.taskType = 1;
- } else if (this.tasktopic == 6) {
+ this.topqueryParams.serviceType = Number(this.tasktopic);
+ if (this.tasktopic == 1 || this.tasktopic == 7 || this.tasktopic == 6) {
this.topqueryParams.type = 2;
this.TaskOperation.taskType = 2;
+ } else if (this.tasktopic == 4 || this.tasktopic == 8) {
+ this.topqueryParams.type = 1;
+ this.TaskOperation.taskType = 3;
+ } else if (
+ this.tasktopic == 2 ||
+ this.tasktopic == 3 ||
+ this.tasktopic == 5
+ ) {
+ this.topqueryParams.type = 3;
+ this.TaskOperation.taskType = 1;
}
- this.topqueryParams.typename = this.findLabelByValue(
- this.taskoptions,
- this.tasktopic
- );
+ // this.topqueryParams.typename = this.findLabelByValue(
+ // this.taskoptions,
+ // this.tasktopic
+ // );
getTasklist(this.addDateRange(this.topqueryParams, this.dateRange)).then(
(response) => {
this.userList = response.rows;
@@ -742,27 +746,29 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
- const typename = this.findLabelByValue(this.taskoptions, this.tasktopic);
-
- if (
- this.tasktopic == 2 ||
- this.tasktopic == 3 ||
- this.tasktopic == 4 ||
- this.tasktopic == 5
- ) {
+ if (this.topqueryParams.type == 3) {
this.$router.push({
path: "/followvisit/particty",
- query: { type: 1, typename: typename },
+ query: {
+ type: this.topqueryParams.type,
+ serviceType: this.tasktopic,
+ },
});
- } else if (this.tasktopic == 6) {
+ } else if (this.topqueryParams.type == 2) {
this.$router.push({
path: "/followvisit/QuestionnaireTask",
- query: { type: 2, typename: typename },
+ query: {
+ type: this.topqueryParams.type,
+ serviceType: this.tasktopic,
+ },
});
- } else if (this.tasktopic == 1) {
+ } else if (this.topqueryParams.type == 1) {
this.$router.push({
path: "/followvisit/Missioncreation",
- query: { type: 3, typename: typename },
+ query: {
+ type: this.topqueryParams.type,
+ serviceType: this.tasktopic,
+ },
});
}
},
diff --git a/src/views/patient/propaganda/Missioncreation.vue b/src/views/patient/propaganda/Missioncreation.vue
index 85e3be6..26c7732 100644
--- a/src/views/patient/propaganda/Missioncreation.vue
+++ b/src/views/patient/propaganda/Missioncreation.vue
@@ -161,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>
@@ -802,6 +804,7 @@
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.listDept();
this.Acquisitiontype();
this.Getdetails();
@@ -846,7 +849,56 @@
this.currenttype = this.$route.query.type;
this.title = "瀹ｆ暀鍐呭鍒楄〃";
this.tableLabel = this.tableLabelxj;
- this.checkboxlist = ["鐭俊", "寰俊", "浜哄伐鐢佃瘽", "鏅鸿兘鏈哄櫒浜�"];
+ if (this.form.serviceType == 4) {
+ this.checkboxlist = [
+ {
+ value: "2",
+ label: "绾歌川",
+ },
+
+ {
+ value: "4",
+ label: "鐭俊",
+ },
+ {
+ value: "5",
+ label: "寰俊鍏紬鍙�",
+ },
+ {
+ value: "6",
+ label: "寰俊灏忕▼搴�",
+ },
+
+ {
+ value: "8",
+ label: "鏅鸿兘鏈哄櫒浜�",
+ },
+ ];
+ } else if (this.form.serviceType == 8) {
+ this.checkboxlist = [
+ {
+ value: "4",
+ label: "鐭俊",
+ },
+ {
+ value: "5",
+ label: "寰俊鍏紬鍙�",
+ },
+ {
+ value: "6",
+ label: "寰俊灏忕▼搴�",
+ },
+
+ {
+ value: "8",
+ label: "鏅鸿兘鏈哄櫒浜�",
+ },
+ {
+ value: "9",
+ label: "閽夐拤",
+ },
+ ];
+ }
getlibrarylist(queryParams).then((response) => {
this.userList = response.rows;
this.total = response.total;
@@ -859,8 +911,8 @@
},
// 淇濆瓨
submitForm(formName) {
- // this.form.preachform = this.checkList.join(",");
- this.formatFn(1);
+ this.form.preachform = this.checkList.join(",");
+ // this.formatFn(1);
this.form.hospType = this.currenttype;
if (!this.form.patTaskRelevances[0]) {
this.$modal.msgError("璇烽�夋嫨鐥呬汉");
@@ -1095,7 +1147,8 @@
? this.form.patTaskRelevances
: [];
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(",");
if (this.form.showTimeMorn) {
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index 2a871f3..19a1f63 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -162,8 +162,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>
@@ -233,88 +235,6 @@
<div class="examine-jic">
<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.topic"
- 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.topic"
- 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.topic"
- 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
@@ -408,29 +328,11 @@
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.topic"
- 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> -->
<el-form-item>
<el-button
@@ -902,6 +804,7 @@
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.listDept();
this.Acquisitiontype();
this.Getdetails();
@@ -946,7 +849,70 @@
this.currenttype = this.$route.query.type;
this.title = "闂嵎鍐呭鍒楄〃";
this.tableLabel = this.tableLabelwj;
- this.checkboxlist = ["鐭俊", "寰俊", "浜哄伐鐢佃瘽", "鏅鸿兘鏈哄櫒浜�"];
+ if (this.form.serviceType == 1) {
+ this.checkboxlist = [
+ {
+ value: "1",
+ label: "浜哄伐",
+ },
+
+ {
+ value: "2",
+ label: "绾歌川",
+ },
+ ];
+ } else if (this.form.serviceType == 6) {
+ this.checkboxlist = [
+ {
+ value: "3",
+ label: "鐢佃瘽",
+ },
+ {
+ value: "4",
+ label: "鐭俊",
+ },
+ {
+ value: "5",
+ label: "寰俊鍏紬鍙�",
+ },
+ {
+ value: "6",
+ label: "寰俊灏忕▼搴�",
+ },
+
+ {
+ value: "8",
+ label: "鏅鸿兘鏈哄櫒浜�",
+ },
+ ];
+ } else if (this.form.serviceType == 7) {
+ this.checkboxlist = [
+ {
+ value: "1",
+ label: "浜哄伐",
+ },
+ {
+ value: "2",
+ label: "绾歌川",
+ },
+ {
+ value: "3",
+ label: "鐢佃瘽",
+ },
+ {
+ value: "4",
+ label: "鐭俊",
+ },
+ {
+ value: "5",
+ label: "寰俊鍏紬鍙�",
+ },
+ {
+ value: "6",
+ label: "寰俊灏忕▼搴�",
+ },
+ ];
+ }
getQtemplatelist(queryParams).then((response) => {
this.userList = response.rows;
this.total = response.total;
@@ -959,8 +925,8 @@
},
// 淇濆瓨
submitForm(formName) {
- // this.form.preachform = this.checkList.join(",");
- this.formatFn(1);
+ this.form.preachform = this.checkList.join(",");
+
if (!this.form.patTaskRelevances[0]) {
this.$modal.msgError("璇烽�夋嫨鐥呬汉");
return;
@@ -1180,7 +1146,7 @@
? this.form.patTaskRelevances
: [];
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(",");
if (this.form.showTimeMorn) {
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 8d0b0e2..a67e388 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -162,8 +162,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 +236,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
@@ -408,7 +330,10 @@
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>
@@ -522,81 +447,7 @@
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-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">
@@ -710,12 +561,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 },
@@ -833,7 +679,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();
@@ -881,7 +727,61 @@
// 鍑洪櫌銆侀棬璇娿�佷笓鐥呴殢璁�
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;
@@ -895,7 +795,8 @@
// 淇濆瓨
submitForm(formName) {
this.form.preachform = this.checkList.join(",");
- this.formatFn(1);
+
+ // this.formatFn(1);
if (!this.form.patTaskRelevances[0]) {
this.$modal.msgError("璇烽�夋嫨鐥呬汉");
return;
@@ -1111,7 +1012,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);
--
Gitblit v1.9.3