diff --git a/src/views/manage/Auditing/index.vue b/src/views/manage/Auditing/index.vue index 726fbab..ecefcc3 100644 --- a/src/views/manage/Auditing/index.vue +++ b/src/views/manage/Auditing/index.vue @@ -3,6 +3,7 @@
取 消 审核通过 + 忽略
@@ -241,8 +242,45 @@ export default { this.propagandaopen = false this.lookitem = {} }, + // 忽略 + ignore() { + 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 + } + 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.$prompt('请输入审核备注信息?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -251,7 +289,7 @@ export default { routeCheckPerson: JSON.parse(localStorage.getItem('user')).nickName, routeCheckRemark: value, routeCheckStatus: 'AGREE', - manageRouteNodeIds: this.nodelist.map(e => e.manageRouteId) + manageRouteNodeIds: manageRouteNodeIds } audit(obj).then(res => { this.$notify({ diff --git a/src/views/manage/components/RehabilitationPlanandRecords.vue b/src/views/manage/components/RehabilitationPlanandRecords.vue index c4a7333..584830e 100644 --- a/src/views/manage/components/RehabilitationPlanandRecords.vue +++ b/src/views/manage/components/RehabilitationPlanandRecords.vue @@ -90,7 +90,8 @@ {{ item.suitRange == 'OUTPATIENT_SERVICE_DISCHARGE' ? '门诊+出院' : "" }}
- 路径详情: 预览 + 路径详情: 预览
@@ -198,11 +199,11 @@ export default { }, methods: { //查看专病节点 - lookspecialDiseaseNode() { + lookspecialDiseaseNode(item) { this.lookitem = { - routeName: '路径名称', - suitRange: 'IN_THE_HOSPITAL', - id: 1 + routeName: item.routeName, + suitRange: item.suitRange, + id: item.specialDiseaseRoute.specialDiseaseRouteId } this.specialDiseaseNodeopen = true }, @@ -252,9 +253,7 @@ export default { getList(this.query).then(res => { this.itemindex = index this.loading.close(); - if (res.data.length > 0) { - this.categorylist = res.data - } + this.categorylist = res.data }) }, } diff --git a/src/views/manage/components/specialDiseaseNodeopen.vue b/src/views/manage/components/specialDiseaseNodeopen.vue index f8fd498..1d8c4d9 100644 --- a/src/views/manage/components/specialDiseaseNodeopen.vue +++ b/src/views/manage/components/specialDiseaseNodeopen.vue @@ -48,10 +48,10 @@ -

{{ uitem.taskType }}

+

{{ uitem.taskTypeName }}

已审核 未审核 -

{{ uitem.taskSubdivision }}

+

{{ uitem.taskSubdivisionName }}

 @@ -61,23 +61,23 @@ - + - - + - + + :label="item.taskStatusName" :value="item.taskStatusCode"> @@ -333,10 +333,10 @@ export default { beforeDestroy() { }, watch: { lookitem(newValue, oldValue) { - if (newValue) { - this.updata = newValue; - this.updata.specialDiseaseRouteId = newValue.id - } + this.updata = newValue; + this.updata.specialDiseaseRouteId = newValue.id + this.taskinfo(); + this.info(); } }, mounted() { @@ -448,27 +448,24 @@ export default { }) }, //任务细分 - changeTaskType(name, taskSubdivision) { - let id = this.selectTaskTypeList?.find(e => e.taskTypeName == name).id + changeTaskType(code, taskSubdivision) { + let id = this.selectTaskTypeList?.find(e => e.taskTypeCode == code)?.id + this.form.taskTypeName = this.selectTaskTypeList?.find(e => e.taskTypeCode == code)?.taskTypeName taskPartitionList(id).then(res => { this.taskPartitionList = res.data this.form.taskSubdivision = '' this.form.taskSubdivisionName = '' this.form.taskSubdivisiontemplateType = '' - this.selectTaskTypeList.forEach(el => { - if (name == el.taskTypeName) { - this.form.taskTypeId = el.id - } - }) if (taskSubdivision) { + this.form.taskSubdivision = taskSubdivision this.changetaskSubdivision(taskSubdivision, 1) } }) }, - changetaskSubdivision(name, type) { - this.form.taskSubdivision = name + changetaskSubdivision(code, type) { + this.form.taskSubdivisionName = this.taskPartitionList?.find(e => e.taskPartitionCode == code).taskPartitionName this.taskPartitionList.forEach(el => { - if (name == el.taskTypeName) { + if (code == el.taskPartitionCode) { this.form.executionTime = el.executionTime this.form.taskSubdivisiontemplateType = el.templateType if (!type) { diff --git a/src/views/manage/manualReview/index.vue b/src/views/manage/manualReview/index.vue index a1ed265..b4394ff 100644 --- a/src/views/manage/manualReview/index.vue +++ b/src/views/manage/manualReview/index.vue @@ -218,7 +218,7 @@ export default { /** 查询患者信息列表 */ getList() { this.loading = true; - this.queryParams.params = {}; + this.queryParams.taskCreateType = 'MANUAL_CREATE' tasklist(this.queryParams).then(response => { response.rows.forEach(e => { e.birthDate ? e.age = getAge(e.birthDate) : '' diff --git a/src/views/manage/projectdevice/index.vue b/src/views/manage/projectdevice/index.vue index 01504f6..3c50ce9 100644 --- a/src/views/manage/projectdevice/index.vue +++ b/src/views/manage/projectdevice/index.vue @@ -1,28 +1,11 @@ @@ -464,7 +275,6 @@ export default { /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/, }, ], - deviceCode: [ { required: true, message: "设备编码不能为空", trigger: "blur" }, ], @@ -626,7 +436,7 @@ export default { this.getList(); this.$modal.msgSuccess("解绑成功"); }) - .catch(() => {}); + .catch(() => { }); }, /** 导出按钮操作 */ handleExport() { diff --git a/src/views/system/components/message.vue b/src/views/system/components/message.vue index 2dbe46c..cb9c72f 100644 --- a/src/views/system/components/message.vue +++ b/src/views/system/components/message.vue @@ -146,14 +146,10 @@ export default { this.Departmentlist(); }, templateId(newValue, oldValue) { - if (newValue) { - this.handleselectId = newValue; - } + this.handleselectId = newValue; }, templateName(newValue, oldValue) { - if (newValue) { - this.handleselectName = newValue; - } + this.handleselectName = newValue; } }, mounted() { diff --git a/src/views/system/components/miniProgram.vue b/src/views/system/components/miniProgram.vue index b0ff951..6db4100 100644 --- a/src/views/system/components/miniProgram.vue +++ b/src/views/system/components/miniProgram.vue @@ -146,14 +146,10 @@ export default { this.Departmentlist(); }, templateId(newValue, oldValue) { - if (newValue) { - this.handleselectId = newValue; - } + this.handleselectId = newValue; }, templateName(newValue, oldValue) { - if (newValue) { - this.handleselectName = newValue; - } + this.handleselectName = newValue; } }, mounted() { diff --git a/src/views/system/components/officialAccount.vue b/src/views/system/components/officialAccount.vue index 1e14a8d..7a59bbb 100644 --- a/src/views/system/components/officialAccount.vue +++ b/src/views/system/components/officialAccount.vue @@ -146,14 +146,10 @@ export default { this.Departmentlist(); }, templateId(newValue, oldValue) { - if (newValue) { - this.handleselectId = newValue; - } + this.handleselectId = newValue; }, templateName(newValue, oldValue) { - if (newValue) { - this.handleselectName = newValue; - } + this.handleselectName = newValue; } }, mounted() { diff --git a/src/views/system/components/propaganda.vue b/src/views/system/components/propaganda.vue index f4926c7..b07d128 100644 --- a/src/views/system/components/propaganda.vue +++ b/src/views/system/components/propaganda.vue @@ -165,14 +165,10 @@ export default { }, watch: { templateId(newValue, oldValue) { - if (newValue) { - this.handleselectId = newValue; - } + this.handleselectId = newValue; }, templateName(newValue, oldValue) { - if (newValue) { - this.handleselectName = newValue; - } + this.handleselectName = newValue; } }, computed: { diff --git a/src/views/system/components/question.vue b/src/views/system/components/question.vue index 8b4231d..b7c097a 100644 --- a/src/views/system/components/question.vue +++ b/src/views/system/components/question.vue @@ -125,14 +125,10 @@ export default { }, watch: { templateId(newValue, oldValue) { - if (newValue) { - this.handleselectId = newValue; - } + this.handleselectId = newValue; }, templateName(newValue, oldValue) { - if (newValue) { - this.handleselectName = newValue; - } + this.handleselectName = newValue; } }, methods: { diff --git a/src/views/system/editorialSpecialization/index.vue b/src/views/system/editorialSpecialization/index.vue index 8864aa5..4864b6b 100644 --- a/src/views/system/editorialSpecialization/index.vue +++ b/src/views/system/editorialSpecialization/index.vue @@ -4,6 +4,7 @@ + 返回 保存 @@ -413,6 +414,13 @@ export default { }) }) }, + back() { + this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { + this.$router.push({ + path: "/specialdisease/specialDiseaseRoute", + }); + }) + }, }, }; diff --git a/src/views/system/specialDiseaseNode/index.vue b/src/views/system/specialDiseaseNode/index.vue index 55301bc..5b55d23 100644 --- a/src/views/system/specialDiseaseNode/index.vue +++ b/src/views/system/specialDiseaseNode/index.vue @@ -360,12 +360,19 @@ export default { }, methods: { info() { + const loading = this.$loading({ + lock: true, + text: '数据加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); this.lists = [] if (this.$route.query) { this.updata.suitRange = this.$route.query.suitRange this.updata.routeName = this.$route.query.routeName this.updata.specialDiseaseRouteId = this.$route.query.id selectSpecialDisease(this.$route.query.id).then(res => { + loading.close(); this.agreeNumber = res.data.agreeNumber this.totalNumber = res.data.totalNumber res.data.specialDiseaseNodeList.forEach(e => { @@ -380,6 +387,7 @@ export default { } }) } else { + loading.close(); this.lists.push({ routeNodeName: "", routeNodeDay: '', @@ -452,17 +460,30 @@ export default { //暂存 TemporaryStorage() { this.$refs.wangeditor.emit() - this.updata.specialDiseaseNodeList = [] - this.lists.forEach(e => { - e.list.length > 0 ? e.list.forEach(el => { - el.routeNodeDay = e.routeNodeDay - el.routeNodeName = e.routeNodeName - this.updata.specialDiseaseNodeList.push(el) - }) : "" - }) - specialDiseaseNode(this.updata).then(res => { - this.info(); - this.$modal.msgSuccess("暂存成功!"); + this.$confirm('确认暂存时将过滤掉部分内容未填写完成的子节点,是否确认暂存？', '提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + }).then(() => { + const loading = this.$loading({ + lock: true, + text: '暂存中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); + this.updata.specialDiseaseNodeList = [] + this.lists.forEach(e => { + e.list.length > 0 ? e.list.forEach(el => { + el.routeNodeDay = e.routeNodeDay + el.routeNodeName = e.routeNodeName + this.updata.specialDiseaseNodeList.push(el) + }) : "" + }) + this.updata.specialDiseaseNodeList = this.updata.specialDiseaseNodeList.filter(e => e.routeNodeDay && e.routeNodeName && e.taskType && e.taskSubdivision && e.taskStatus) + specialDiseaseNode(this.updata).then(res => { + this.info(); + loading.close(); + this.$modal.msgSuccess("暂存成功!"); + }) }) }, //问卷传值 @@ -599,6 +620,26 @@ export default { spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' }); + if (!this.routeform.routeNodeDay) { + this.$message.error('请输入节点时间段天数'); + return + } + if (!this.routeform.routeNodeName) { + this.$message.error('请选择节点时间段'); + return + } + if (!this.routeform.taskType) { + this.$message.error('请选择任务类型'); + return + } + if (!this.routeform.taskSubdivision) { + this.$message.error('请选择任务细分'); + return + } + if (!this.routeform.taskStatus) { + this.$message.error('请选择任务状态'); + return + } updateRouteCheckStatus({ routeCheckStatus: this.routeform.routeCheckStatus, id: this.form.specialDiseaseNodeId,