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 + }) +} + 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: { 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() { diff --git a/src/views/system/ManuallyCreatingTasks/index.vue b/src/views/system/ManuallyCreatingTasks/index.vue index fadda35..82104b3 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: "", @@ -247,12 +247,17 @@ 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) { - this.formInline.phoneTemplateId = item.templateId + this.formInline.phoneId = item.templateId this.formInline.phoneTemplateName = item.templateName }, clicktimelineitem(item, index) { @@ -267,7 +272,7 @@ export default { questionExpirationDate: 7, questionInfoId: "", questionnaireName: "", - phoneTemplateId: "", + phoneId: "", phoneTemplateName: "", propagandaInfoId: '', propagandaTitle: "", diff --git a/src/views/system/followup/index.vue b/src/views/system/followup/index.vue index 3cadf21..c9a5f28 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?row.routeHandleRemark:null, + }, + }); 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..b12a0a8 --- /dev/null +++ b/src/views/system/followupdetails/index.vue @@ -0,0 +1,669 @@ + + + + + \ No newline at end of file