diff --git a/src/api/manage/Auditing.js b/src/api/manage/Auditing.js index 79259c2..8749412 100644 --- a/src/api/manage/Auditing.js +++ b/src/api/manage/Auditing.js @@ -24,4 +24,29 @@ export function audit(data) { method: 'post', data }) -} \ No newline at end of file +} + +//路径信息 +export function getRouteAuditinfo(signRecordId) { + return request({ + url: `/manage/signroute/getRouteAuditInfo/${signRecordId}`, + method: 'get', + }) +} + +//路径任务 +export function getRouteNodeInfo(signRecordId) { + return request({ + url: `/manage/signroute/getRouteNodeInfo/${signRecordId}`, + method: 'get', + }) +} + +//路径审核 +export function updateRouteCheckStatus(data) { + return request({ + url: `/manage/signRecord/updateRouteCheckStatus`, + method: 'post', + data + }) +} diff --git a/src/api/manage/Portraitedit.js b/src/api/manage/Portraitedit.js index 0a25dd3..60d8ed8 100644 --- a/src/api/manage/Portraitedit.js +++ b/src/api/manage/Portraitedit.js @@ -26,9 +26,9 @@ export function groupingValue(query) { }) } // 提交 -export function inserList(data) { +export function insertLabelField(data) { return request({ - url: '/manage/nodeParamsCurrent/inserList', + url: '/manage/labelfieldcontent/insertLabelField', method: 'post', data: data }) diff --git a/src/api/system/preview.js b/src/api/system/preview.js index 3e92caf..82ba112 100644 --- a/src/api/system/preview.js +++ b/src/api/system/preview.js @@ -2,17 +2,26 @@ import request from '@/utils/request' //新增 export function insertScriptEdgeNode(data) { - return request({ - url: '/manage/script/updateScriptEdgeNode', - method: 'post', - data: data - }) + return request({ + url: '/manage/script/updateScriptEdgeNode', + method: 'post', + data: data + }) } // 话术列表 export function selectScriptEdgeNode(id) { - return request({ - url: `/manage/script/selectScriptEdgeNode?id=${id}`, - method: 'get' - }) - } + return request({ + url: `/manage/script/selectScriptEdgeNode?id=${id}`, + method: 'get' + }) +} + + +//路径任务话术预览 +export function getFlowScheme(id) { + return request({ + url: `/manage/signroute/getFlowScheme/${id}`, + method: 'get' + }) +} diff --git a/src/views/manage/Auditing/index.vue b/src/views/manage/Auditing/index.vue index e2c1b9c..8a6e57b 100644 --- a/src/views/manage/Auditing/index.vue +++ b/src/views/manage/Auditing/index.vue @@ -5,11 +5,18 @@ -
+
取 消 审核通过 忽略
+
+ 取 消 + 审核通过 + 忽略 +
@@ -76,7 +83,7 @@ list.mainDiagnosis }} - {{ list.surgicalName @@ -100,7 +107,7 @@
- +
@@ -109,7 +116,8 @@ import { getRouteNodeList, getByPatientId, - audit + audit, + updateRouteCheckStatus } from '@/api/manage/Auditing.js' import { getAge } from "@/utils/age"; import portrait from '../components/portrait.vue' @@ -126,14 +134,19 @@ export default { baseUrl: process.env.VUE_APP_BASE_API, activeNames: ['-1', '-2', '-3'], list: {}, - nodelist: [], + // nodelist: [], lookitem: {}, + routeCheckStatus: undefined, }; }, created() { this.info(); }, methods: { + //路径审核页面传值 + onrouteCheckStatus(e) { + this.routeCheckStatus = e.routeCheckStatus + }, portraitlist(val) { console.log(val, '999999999') }, @@ -142,70 +155,99 @@ export default { }, // 忽略 ignore() { - let manageRouteNodeIds = [] - this.nodelist.map(e => { - manageRouteNodeIds = [...manageRouteNodeIds, ...e.nodeList.map(el => el.id)] - }) + // let manageRouteNodeIds = [] + // this.nodelist.map(e => { + // manageRouteNodeIds = [...manageRouteNodeIds, ...e.nodeList.map(el => el.id)] + // }) this.$prompt('请输入忽略备注信息?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', }).then(({ value }) => { - let obj = { - routeCheckPerson: JSON.parse(localStorage.getItem('user')).nickName, - routeCheckRemark: value, - routeCheckStatus: 'DISAGREE', - manageRouteNodeIds: manageRouteNodeIds + if (this.activeNametab == 'route') { + let obj = { + routeCheckRemark: value, + routeCheckStatus: 'DISAGREE', + signPatientRecordId: this.$route.query.signRecordId + } + updateRouteCheckStatus(obj).then(res => { + this.$notify({ + type: 'success', + title: '提示', + message: '路径审核已忽略', + duration: 3000 + }); + setTimeout(() => { + this.$refs.PathReview.info(); + }, 1500); + }) + } else { + let obj = { + routeCheckPerson: JSON.parse(localStorage.getItem('user')).nickName, + routeCheckRemark: value, + routeCheckStatus: 'DISAGREE', + // manageRouteNodeIds: manageRouteNodeIds + } + audit(obj).then(res => { + this.$notify({ + type: 'success', + title: '提示', + message: '已忽略,即将返回上一页', + duration: 3000 + }); + setTimeout(() => { + this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { + this.$router.push({ + path: "/task/manualReview", + }); + }) + }, 3000); + }) } - audit(obj).then(res => { - this.$notify({ - type: 'success', - title: '提示', - message: '已忽略,即将返回上一页', - duration: 3000 - }); - setTimeout(() => { - this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { - this.$router.push({ - path: "/task/manualReview", - }); - }) - }, 3000); - }) }) }, //审核 auditing() { let manageRouteNodeIds = [] - this.nodelist.map(e => { - manageRouteNodeIds = [...manageRouteNodeIds, ...e.nodeList.map(el => el.id)] - }) + // this.nodelist.map(e => { + // manageRouteNodeIds = [...manageRouteNodeIds, ...e.nodeList.map(el => el.id)] + // }) this.$prompt('请输入审核备注信息?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', }).then(({ value }) => { - let obj = { - routeCheckPerson: JSON.parse(localStorage.getItem('user')).nickName, - routeCheckRemark: value, - routeCheckStatus: 'AGREE', - manageRouteNodeIds: manageRouteNodeIds + if (this.activeNametab == 'route') { + let obj = { + routeCheckRemark: value, + routeCheckStatus: 'AGREE', + signPatientRecordId: this.$route.query.signRecordId + } + updateRouteCheckStatus(obj).then(res => { + this.$notify({ + type: 'success', + title: '提示', + message: '路径审核通过', + duration: 3000 + }); + setTimeout(() => { + this.$refs.PathReview.info(); + }, 1500); + }) + } else { + let obj = { + routeCheckPerson: JSON.parse(localStorage.getItem('user')).nickName, + routeCheckRemark: value, + routeCheckStatus: 'AGREE', + // manageRouteNodeIds: manageRouteNodeIds + } + audit(obj).then(res => { + this.$notify({ + type: 'success', + title: '提示', + message: '画像审核通过', + duration: 3000 + }); + }) } - console.log(obj) - // return - audit(obj).then(res => { - this.$notify({ - type: 'success', - title: '提示', - message: '审核通过,即将返回上一页', - duration: 3000 - }); - setTimeout(() => { - this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { - this.$router.push({ - path: "/task/manualReview", - }); - }) - }, 3000); - }) }) }, info() { @@ -213,9 +255,9 @@ export default { res.data.birthDate ? res.data.age = getAge(res.data.birthDate) : '' this.list = res.data }) - getRouteNodeList({ patientId: this.$route.query.patientId, taskCreateType: 'MANUAL_CREATE', routeCheckStatus: "UNAUDITED" }).then(res => { - this.nodelist = res.data - }) + // getRouteNodeList({ patientId: this.$route.query.patientId, taskCreateType: 'MANUAL_CREATE', routeCheckStatus: "UNAUDITED" }).then(res => { + // this.nodelist = res.data + // }) }, cancel() { this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { diff --git a/src/views/manage/Portraitedit/index.vue b/src/views/manage/Portraitedit/index.vue index 0e89dc4..f561d84 100644 --- a/src/views/manage/Portraitedit/index.vue +++ b/src/views/manage/Portraitedit/index.vue @@ -27,73 +27,16 @@ :key="index" @click="bottomclickevent(ulitem)" > -
+
{{ ulitem.taskPartitionDictName }}
- -
@@ -112,7 +55,7 @@ label-width="100px" :rules="rules" > - + diff --git a/src/views/manage/components/questionopen.vue b/src/views/manage/components/questionopen.vue index ad7cd0b..80be8f5 100644 --- a/src/views/manage/components/questionopen.vue +++ b/src/views/manage/components/questionopen.vue @@ -133,12 +133,12 @@ export default { };