diff --git a/src/components/360View/afterPart/index.vue b/src/components/360View/afterPart/index.vue index 691975e..abb7b46 100644 --- a/src/components/360View/afterPart/index.vue +++ b/src/components/360View/afterPart/index.vue @@ -103,6 +103,7 @@ export default { type: '', doctorId: '', deleteId: '', + treeFlag: '', treeId: '', treeName: '', weight: '', @@ -119,6 +120,7 @@ export default { name: '黄斑' }, { name: '黄斑', + sort: 99, id: 14, type: 'hangman', od: '', @@ -143,6 +145,7 @@ export default { name: '视网膜' }, { name: '视网膜', + sort: 99, id: 17, type: 'showing', od: '', @@ -151,6 +154,7 @@ export default { name: '脉络膜' }, { name: '脉络膜', + sort: 99, id: 18, type: 'mailbomb', od: '', @@ -159,6 +163,7 @@ export default { name: '玻璃体 vitreous' }, { name: '玻璃体 vitreous', + sort: 99, id: 19, type: 'blit', od: '', @@ -167,6 +172,7 @@ export default { name: '血管' }, { name: '血管', + sort: 99, id: 20, type: 'began', od: '', @@ -175,6 +181,7 @@ export default { name: '巩膜' }, { name: '巩膜', + sort: 99, id: 21, type: 'gong', od: '', @@ -183,6 +190,7 @@ export default { name: '边缘 periphery' }, { name: '边缘 periphery', + sort: 99, id: 22, type: 'banyan', od: '', @@ -240,8 +248,9 @@ export default { }, // 添加数据集 addAfterData() { + if (!this.multipleSelection.length) return this.$message.warning('请勾选数据!') const data = this.multipleSelection.filter(item => { - return item.id >= 1 + return item.type !== undefined }) eventBus.$emit('sendForData', data) }, @@ -260,7 +269,12 @@ export default { item.forEach(row => { this.tableData.forEach(e => { if (e.type === row.type) { - e.data = [row] + e.data = item + const sort = item.sort + item.sort = '' + this.$nextTick(() => { + item.sort = sort + }) } }) }) @@ -278,12 +292,24 @@ export default { this.tableData.forEach(item => { if (item.sort) { item.od = item.os + item.odValue = item.osValue + const sort = item.sort + item.sort = '' + this.$nextTick(() => { + item.sort = sort + }) } }) } else { this.tableData.forEach(item => { if (item.sort) { item.os = item.od + item.osValue = item.odValue + const sort = item.sort + item.sort = '' + this.$nextTick(() => { + item.sort = sort + }) } }) } @@ -295,15 +321,20 @@ export default { } else { this.tableData[value.index].os = value.row } + const sort = this.tableData[index].sort + this.tableData[index].sort = '' + this.$nextTick(() => { + this.tableData[index].sort = sort + }) }, // 保存后段检查 async saveAfter() { const params = { - flag: 3, // 1病史采集2前段检查3后段检查4专科检查 + flag: '3', // 1病史采集2前段检查3后段检查4专科检查 jsonText: JSON.stringify(this.tableData), name: '后段检查', patientId: this.patientId, - platform: 1 + platform: '1' } let url = '' if (this.collectId) { @@ -341,7 +372,7 @@ export default { const params = { doctorId: this.doctorId, name: this.form.name, - flag: 1, // 1公共树,2个人树 + flag: this.treeFlag, // 1公共树,2个人树 type: this.type, parentId: this.parentId, platform: 1 @@ -423,18 +454,13 @@ export default { if (data && data.caseJson) { this.tableData = JSON.parse(data.caseJson) // 回显表格复选框 - this.$nextTick(() => { - this.tableData.forEach(item => { - this.$refs.multipleTable.toggleRowSelection(item, true) - }) - }) } else { this.tableData = _.cloneDeep(this.sourceData) } }, // 点击保存模板后弹框 handleTemplate() { - if (!this.multipleSelection.length) return this.$message.warning('请勾选模板内容!') + // if (!this.multipleSelection.length) return this.$message.warning('请勾选模板内容!') this.form.name = '' this.queryTemplate() this.templateFlag = true @@ -445,8 +471,9 @@ export default { }, // 保存模板树 async saveTreeTemplete() { + if (!this.treeId) return this.$message.warning('请选择节点!') const params = { - caseJson: JSON.stringify(this.multipleSelection), + caseJson: JSON.stringify(this.tableData), doctorId: this.doctorId, name: this.form.name, type: 3, // 2前段检查 3后段检查 @@ -455,7 +482,7 @@ export default { const { data: res } = await this.$http.post('/treetemplate/addTreeCase', params) if (res.code === 0) { this.templateFlag = false - this.queryTreeCase() + await this.queryTreeCase() this.$message.success('保存成功') } else { this.$message.error(res.msg) @@ -517,8 +544,8 @@ export default { const { data: res } = await this.$http.post(url, params) if (res.code === 0) { this.$message.success('删除成功') - this.queryTreeCase() - this.getforeList('2') + await this.queryTreeCase() + await this.getforeList('3') } else { this.$message.error(res.msg) } @@ -576,7 +603,6 @@ export default { }) if (res.code === 0) { this.treeCaseList = this.fn(res.data) - console.log(this.treeCaseList) } else { this.$message.error(res.msg) } diff --git a/src/components/360View/commonForm/deveopmentFIle.vue b/src/components/360View/commonForm/deveopmentFIle.vue index ec0ebb2..970a5df 100644 --- a/src/components/360View/commonForm/deveopmentFIle.vue +++ b/src/components/360View/commonForm/deveopmentFIle.vue @@ -1,7 +1,7 @@