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/system/record/record.vue b/src/views/system/record/record.vue index 9ef9e0b..33540f6 100644 --- a/src/views/system/record/record.vue +++ b/src/views/system/record/record.vue @@ -380,6 +380,7 @@ @@ -483,9 +484,8 @@ export default { ) { 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 ( @@ -493,6 +493,11 @@ export default { e.questionType == "SCORING_QUESTIONS" ) { e.checked = el.id; + } else if ( + e.questionType == "COMBINATION_MULTIPLE_SUBJECT" && + el.optionChooseSign == "0" + ) { + this.checkeddata.push(el.id); } }); }); @@ -550,6 +555,11 @@ export default { };