From 9125bc973432d38a011f869ead5007b9586e3c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Wed, 10 Apr 2024 10:29:55 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/components/healthEducation.vue | 34 +++---------------- .../manage/components/signingRecords.vue | 7 ++-- src/views/manage/details/patientdetails.vue | 15 ++++---- 3 files changed, 17 insertions(+), 39 deletions(-) diff --git a/src/views/manage/components/healthEducation.vue b/src/views/manage/components/healthEducation.vue index 80b2804..c97b08f 100644 --- a/src/views/manage/components/healthEducation.vue +++ b/src/views/manage/components/healthEducation.vue @@ -1,6 +1,6 @@ +> \ No newline at end of file diff --git a/src/views/system/ManuallyCreatingTasks/index.vue b/src/views/system/ManuallyCreatingTasks/index.vue index 0a8893c..fadda35 100644 --- a/src/views/system/ManuallyCreatingTasks/index.vue +++ b/src/views/system/ManuallyCreatingTasks/index.vue @@ -2,7 +2,7 @@
- 执行 + 保存
@@ -85,7 +85,7 @@
+ :style="formInline.taskType == 'TEXT_REMIND' ? '' : 'height:160px'"> @@ -146,8 +146,8 @@
推送方式：人工电话 - + inactive-value="0"> +
@@ -167,6 +167,11 @@ export default { data() { return { updata: { + signPatientRecordId: '', + patientId: '', + patientName: '', + departmentId: '', + departmentName: '', routeName: '', suitRange: '', routeNodeList: [], @@ -193,7 +198,7 @@ export default { officialPushSign: '0', messagePushSign: '0', appletPushSign: '0', - phonePushSign:'0', + phonePushSign: '0', }, list: [ { @@ -211,7 +216,7 @@ export default { officialPushSign: '0', messagePushSign: '0', appletPushSign: '0', - phonePushSign:'0', + phonePushSign: '0', } ], listindex: 0, @@ -219,6 +224,11 @@ export default { }, created() { this.formInline = this.list[0] + this.updata.signPatientRecordId = this.$route.query.signPatientRecordId + this.updata.patientId = this.$route.query.patientId + this.updata.patientName = this.$route.query.patientName + this.updata.departmentId = this.$route.query.departmentId + this.updata.departmentName = this.$route.query.departmentName }, methods: { addtriggerCondition() { @@ -265,7 +275,7 @@ export default { officialPushSign: '0', messagePushSign: '0', appletPushSign: '0', - phonePushSign:'0', + phonePushSign: '0', }) }, delitem(item, index) { @@ -274,7 +284,19 @@ export default { upload() { this.updata.routeNodeList = this.list signrouteadd(this.updata).then(res => { - + this.$notify({ + type: 'success', + title: '提示', + message: '保存成功,即将返回签约患者列表', + duration: 3000 + }); + setTimeout(() => { + this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { + this.$router.push({ + path: "/patient/signRecord", + }); + }) + }, 3000); }) }, } diff --git a/src/views/system/components/script.vue b/src/views/system/components/script.vue index e6a1b9b..ad17561 100644 --- a/src/views/system/components/script.vue +++ b/src/views/system/components/script.vue @@ -164,7 +164,7 @@ export default { handleselect(item) { this.handleselectId = item.id this.handleselectName = item.commonScriptName - this.$emit("on-template", { templateId: item.id, templateName: item.commonScriptName }); + this.$emit("on-template", { templateId: item.id, templateName: item.commonScriptName, templateContent: item.scriptIntroduction }); this.classificationOpen = false }, classificationOpenfalse() { From 01176aa8e50dcd5f862fc1513dd132f1136b5ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Wed, 10 Apr 2024 11:41:42 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/manage/manualReview.js | 11 + src/views/manage/manualReview/index.vue | 386 ++++++++++++++++++++++++ 2 files changed, 397 insertions(+) create mode 100644 src/api/manage/manualReview.js create mode 100644 src/views/manage/manualReview/index.vue diff --git a/src/api/manage/manualReview.js b/src/api/manage/manualReview.js new file mode 100644 index 0000000..afeaa74 --- /dev/null +++ b/src/api/manage/manualReview.js @@ -0,0 +1,11 @@ +import request from '@/utils/request' + +// 查询患者列表 +export function tasklist(query) { + return request({ + url: '/manage/signnode/tasklist', + method: 'get', + params: query + }) +} + diff --git a/src/views/manage/manualReview/index.vue b/src/views/manage/manualReview/index.vue new file mode 100644 index 0000000..c53cad3 --- /dev/null +++ b/src/views/manage/manualReview/index.vue @@ -0,0 +1,386 @@ + + + \ No newline at end of file From f281d0267af604aa845bb8348784f6003f36321b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Wed, 10 Apr 2024 14:23:58 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/user.js | 2 - src/views/manage/manualReview/index.vue | 155 ++++++++++-------------- src/views/manage/signRecord/index.vue | 1 + 3 files changed, 66 insertions(+), 92 deletions(-) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index ba84d65..21a3aa8 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -52,10 +52,8 @@ const user = { return new Promise((resolve, reject) => { getInfo().then(res => { const user = res.user - console.log(user,'user') Cookies.set("userId",user.userId) Cookies.set("userName",user.userName) - // localStorage.setItem("userId",user.userId); const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; localStorage.setItem('user', JSON.stringify(user)) diff --git a/src/views/manage/manualReview/index.vue b/src/views/manage/manualReview/index.vue index c53cad3..878b12e 100644 --- a/src/views/manage/manualReview/index.vue +++ b/src/views/manage/manualReview/index.vue @@ -1,5 +1,10 @@