From c0f889457372d7f0744bac71161179186a963b14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Fri, 12 Apr 2024 10:23:08 +0800 Subject: [PATCH 1/8] =?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/views/manage/Auditing/index.vue | 183 ++++++++++++++++++++++-- src/views/manage/manualReview/index.vue | 24 +--- src/views/manage/patientInfo/index.vue | 1 - 3 files changed, 179 insertions(+), 29 deletions(-) diff --git a/src/views/manage/Auditing/index.vue b/src/views/manage/Auditing/index.vue index 5a8d36d..fab5399 100644 --- a/src/views/manage/Auditing/index.vue +++ b/src/views/manage/Auditing/index.vue @@ -1,25 +1,124 @@ @@ -29,8 +128,7 @@ export default { display: flex; justify-content: space-evenly; padding: 20px 0; - height: calc(100vh - 84px); - background-color: #F1F3F5; + height: calc(100vh - 119px); .cardleft { width: 35%; @@ -38,10 +136,73 @@ export default { overflow: scroll; padding: 20px; - .headsculpture { - width: 50px; - height: 50px; + ::v-deep .el-collapse-item__header { + font-size: 16px; + font-weight: bold; } + + .texts { + margin: 16px 0 20px; + flex-wrap: wrap; + width: 100%; + display: flex; + font-size: 14px; + + .text { + margin-bottom: 10px; + width: 50%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; + } + } + + .title { + display: flex; + align-items: center; + justify-content: space-between; + + .source { + display: flex; + + .situation { + background-color: #F1FAF7; + padding: 3px 6px; + color: #83CAC0 !important; + border: 1px solid #83CAC0 !important; + } + + .item { + font-size: 14px; + margin-left: 5px; + border: 1px solid #fff; + padding: 3px 6px; + border-radius: 5px; + justify-content: center; + display: flex; + align-items: center; + + img { + margin-right: 2px; + width: 16px; + height: 16px; + } + } + } + + .name {} + + .genderandage {} + + .time {} + + .headsculpture { + width: 35px; + height: 35px; + } + } + } .cardright { @@ -50,4 +211,4 @@ export default { width: 62%; } } - \ No newline at end of file + diff --git a/src/views/manage/manualReview/index.vue b/src/views/manage/manualReview/index.vue index a6ed3b3..ee6f01a 100644 --- a/src/views/manage/manualReview/index.vue +++ b/src/views/manage/manualReview/index.vue @@ -210,22 +210,12 @@ export default { }, /** 审核操作 */ handleAuthRole(row) { - // this.$router.push({ - // path: "/patient/patientdetails", - // query: { - // patientId: row.id, - // cardNo: row.cardNo, - // patientName: row.patientName, - // patientPhone: row.patientPhone, - // sex: row.sex, - // birthDate: row.birthDate, - // familyMemberPhone: row.familyMemberPhone, - // address: row.address, - // patientSource: row.patientSource, - // createTime: row.createTime, - // age: row.birthDate ? getAge(row.birthDate) : '' - // }, - // }); + this.$router.push({ + path: "/task/Auditing", + query: { + patientId: row.patientId, + }, + }); }, /** 查询患者信息列表 */ getList() { @@ -358,4 +348,4 @@ export default { }, } }; - \ No newline at end of file + diff --git a/src/views/manage/patientInfo/index.vue b/src/views/manage/patientInfo/index.vue index 85b5cef..8a3c6ad 100644 --- a/src/views/manage/patientInfo/index.vue +++ b/src/views/manage/patientInfo/index.vue @@ -231,7 +231,6 @@ export default { }, /** 详情操作 */ handleAuthRole(row) { - this.$router.push({ path: "/patient/patientdetails", query: { From 67897c7417f9f3eb62c5b09ce2a8adde63254d4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Fri, 12 Apr 2024 10:23:12 +0800 Subject: [PATCH 2/8] =?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/Auditing.js | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/api/manage/Auditing.js diff --git a/src/api/manage/Auditing.js b/src/api/manage/Auditing.js new file mode 100644 index 0000000..6667d3e --- /dev/null +++ b/src/api/manage/Auditing.js @@ -0,0 +1,11 @@ +import request from '@/utils/request' + +// 查询管理任务路径及节点 +export function getRouteNodeList(query) { + return request({ + url: '/manage/signnode/getRouteNodeList', + method: 'get', + params: query + }) +} + From ba4075215aa32efff8ca1454c2e23e97090aedd0 Mon Sep 17 00:00:00 2001 From: shidongli Date: Fri, 12 Apr 2024 10:49:01 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E9=9A=8F=E8=AE=BF?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/followup/index.vue | 17 +- src/views/system/followupdetails/index.vue | 648 +++++++++++++++++++++ 2 files changed, 663 insertions(+), 2 deletions(-) create mode 100644 src/views/system/followupdetails/index.vue diff --git a/src/views/system/followup/index.vue b/src/views/system/followup/index.vue index 3cadf21..43ccf00 100644 --- a/src/views/system/followup/index.vue +++ b/src/views/system/followup/index.vue @@ -333,7 +333,7 @@ size="mini" type="text" icon="el-icon-notebook-2" - @click="handleUpdate(scope.row)" + @click="handleadtail(scope.row)" >详情 @@ -782,7 +782,20 @@ export default { }, // 详情 - handledatail(row) { + handleadtail(row) { + this.$router.push({ + path: "/task/followupdetails", + query: { + patientId: row.patientId, + taskType: row.taskType, + templateId: row.templateId, + manageRouteId:row.manageRouteId, + + visitRecordId:row.visitRecordId, + taskExecuteRecordId:row.taskExecuteRecordId, + routeHandleRemark:row.routeHandleRemark, + }, + }); console.log(row) diff --git a/src/views/system/followupdetails/index.vue b/src/views/system/followupdetails/index.vue new file mode 100644 index 0000000..0194d24 --- /dev/null +++ b/src/views/system/followupdetails/index.vue @@ -0,0 +1,648 @@ + + + + + \ No newline at end of file From 6f52366df141666d165706ee4ce3d7e293ae1f14 Mon Sep 17 00:00:00 2001 From: shidongli Date: Fri, 12 Apr 2024 11:13:12 +0800 Subject: [PATCH 4/8] =?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/views/system/followup/index.vue | 2 +- src/views/system/followupdetails/index.vue | 28 +++++++++++++++------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/views/system/followup/index.vue b/src/views/system/followup/index.vue index 43ccf00..c9a5f28 100644 --- a/src/views/system/followup/index.vue +++ b/src/views/system/followup/index.vue @@ -793,7 +793,7 @@ export default { visitRecordId:row.visitRecordId, taskExecuteRecordId:row.taskExecuteRecordId, - routeHandleRemark:row.routeHandleRemark, + routeHandleRemark:row.routeHandleRemark?row.routeHandleRemark:null, }, }); console.log(row) diff --git a/src/views/system/followupdetails/index.vue b/src/views/system/followupdetails/index.vue index 0194d24..e93c538 100644 --- a/src/views/system/followupdetails/index.vue +++ b/src/views/system/followupdetails/index.vue @@ -70,6 +70,7 @@ > { if (response.data) { @@ -322,18 +334,15 @@ }, methods: { // 问卷和随访 - selectlist() { + selectlist() { selectPatientQuestionSubmit(this.$route.query.taskExecuteRecordId).then((res) => { - console.log(res, "res"); this.questiondata = res.data; if (this.$route.query.routeHandleRemark) { this.questiondata.routeHandleRemark = this.$route.query.routeHandleRemark; } - this.questiondata.subjectResultList.forEach((e) => { e.optionResults.forEach((el) => { - // console.log(el, "el"); if ( (el.optionChooseSign == "0" && e.questionType == "MULTIPLE_CHOICE") || @@ -341,9 +350,8 @@ ) { e.checked = el.id; } else if ( - (el.optionChooseSign == "0" && - e.questionType == "MULTIPLE_CHOICE_QUESTIONS") || - e.questionType == "COMBINATION_MULTIPLE_SUBJECT" + el.optionChooseSign == "0" && + e.questionType == "MULTIPLE_CHOICE_QUESTIONS" ) { this.checkeddata.push(el.id); } else if ( @@ -351,6 +359,11 @@ e.questionType == "SCORING_QUESTIONS" ) { e.checked = el.id; + } else if ( + e.questionType == "COMBINATION_MULTIPLE_SUBJECT" && + el.optionChooseSign == "0" + ) { + this.checkeddata.push(el.id); } }); }); @@ -364,7 +377,6 @@ timepickerselect(e, index) { this.questiondata.subjectResultList[index].fillBlanksAnswer = e }, - // 选中某个单选框时，由radio时触发 radioChange(e, item, index) { console.log(e, item, index, '选中某个单选框时') From 4f95adf5fc3746a13fee2f0355f2c0762016a058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Fri, 12 Apr 2024 11:38:12 +0800 Subject: [PATCH 5/8] =?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/views/system/ManuallyCreatingTasks/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/system/ManuallyCreatingTasks/index.vue b/src/views/system/ManuallyCreatingTasks/index.vue index fadda35..e5b1bdb 100644 --- a/src/views/system/ManuallyCreatingTasks/index.vue +++ b/src/views/system/ManuallyCreatingTasks/index.vue @@ -190,7 +190,7 @@ export default { questionExpirationDate: 7, questionInfoId: "", questionnaireName: "", - phoneTemplateId: "", + phoneId: "", phoneTemplateName: "", propagandaInfoId: '', propagandaTitle: "", @@ -208,7 +208,7 @@ export default { questionExpirationDate: 7, questionInfoId: "", questionnaireName: "", - phoneTemplateId: "", + phoneId: "", phoneTemplateName: "", propagandaInfoId: '', propagandaTitle: "", @@ -252,7 +252,7 @@ export default { }, //话术传值 scriptphoneontemplate(item) { - this.formInline.phoneTemplateId = item.templateId + this.formInline.phoneId = item.templateId this.formInline.phoneTemplateName = item.templateName }, clicktimelineitem(item, index) { @@ -267,7 +267,7 @@ export default { questionExpirationDate: 7, questionInfoId: "", questionnaireName: "", - phoneTemplateId: "", + phoneId: "", phoneTemplateName: "", propagandaInfoId: '', propagandaTitle: "", From 34d4ee77e8dbe401b60bc4cd87b9e50daade1a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Fri, 12 Apr 2024 11:44:18 +0800 Subject: [PATCH 6/8] =?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/views/manage/signRecord/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue index b4ad50c..fea7b0c 100644 --- a/src/views/manage/signRecord/index.vue +++ b/src/views/manage/signRecord/index.vue @@ -338,7 +338,7 @@ export default { { required: true, message: "患者信息表id不能为空", trigger: "blur" } ], }, - addTaskitem: {}, + addTaskitem: null, }; }, created() { From 50b3db5fec19147033c4b2c2087c783d2b90a5e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Fri, 12 Apr 2024 11:49:40 +0800 Subject: [PATCH 7/8] =?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/views/system/ManuallyCreatingTasks/index.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/views/system/ManuallyCreatingTasks/index.vue b/src/views/system/ManuallyCreatingTasks/index.vue index e5b1bdb..82104b3 100644 --- a/src/views/system/ManuallyCreatingTasks/index.vue +++ b/src/views/system/ManuallyCreatingTasks/index.vue @@ -247,8 +247,13 @@ export default { }, //问卷传值 questionontemplate(item) { - this.formInline.questionInfoId = item.templateId - this.formInline.questionnaireName = item.templateName + if (this.formInline.taskType == 'ARTIFICIAL_FOLLOW_UP') { + this.formInline.followTemplateId = item.templateId + this.formInline.followTemplateName = item.templateName + } else { + this.formInline.questionInfoId = item.templateId + this.formInline.questionnaireName = item.templateName + } }, //话术传值 scriptphoneontemplate(item) { From 5e3174a155278ea1b7488bbddcb56e3a61690592 Mon Sep 17 00:00:00 2001 From: shidongli Date: Fri, 12 Apr 2024 13:12:01 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/followupdetails/index.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/system/followupdetails/index.vue b/src/views/system/followupdetails/index.vue index e93c538..b12a0a8 100644 --- a/src/views/system/followupdetails/index.vue +++ b/src/views/system/followupdetails/index.vue @@ -273,6 +273,15 @@ placeholder="请输入话术简介" /> +
+ + +