diff --git a/src/components/360View/afterPart/index.vue b/src/components/360View/afterPart/index.vue index 993dcd8..e33dced 100644 --- a/src/components/360View/afterPart/index.vue +++ b/src/components/360View/afterPart/index.vue @@ -23,75 +23,20 @@ {{ node.label }} - - + + - - - - - - - - - - - - + @@ -136,9 +81,11 @@ import eventBus from '@/page-subspecialty/utils/eventBus' import treeSelect from '@/components/360View/itemSelect' import axios from 'axios' import Cookies from 'js-cookie' +import AfterForm from '@/components/360View/medicalRecord/outPatientRecord/afterForm.vue' const Base64 = require('js-base64').Base64 export default { components: { + AfterForm, treeSelect }, mixins: [], @@ -313,26 +260,26 @@ export default { } }, // 表格复选框 - selection(selection, val) { - if (!val.id) { - const data = this.tableData.filter(item => item.name === val.name) - if (val.flag) { + selection(value) { + if (!value.val.id) { + const data = this.tableData.filter(item => item.name === value.val.name) + if (value.val.flag) { data.forEach(row => { row.flag = false - this.$refs.multipleTable.toggleRowSelection(row, false); + this.$refs.multipleTable.toggleRowSelection(row, false) }) } else { data.forEach(row => { row.flag = true - this.$refs.multipleTable.toggleRowSelection(row, true); + this.$refs.multipleTable.toggleRowSelection(row, true) }) } } else { - const data = this.tableData.filter(item => item.id === val.id) - if (val.flag) { + const data = this.tableData.filter(item => item.id === value.val.id) + if (value.val.flag) { data.forEach(row => { row.flag = false - }); + }) } else { data.forEach(row => { row.flag = true @@ -341,11 +288,11 @@ export default { } }, // 保留下拉框的label,添加到数据集用于展示 - handleNode(index, type, event) { - if (type === 'os') { - this.tableData[index].osValue = event + handleNode(val) { + if (val.type === 'os') { + this.tableData[val.index].osValue = val.event } else { - this.tableData[index].odValue = event + this.tableData[val.index].odValue = val.event } }, // 添加数据集 @@ -418,24 +365,24 @@ export default { } }, // 移动 - moveHandle(index, type, row) { - if (row.id) { - if (type === 1) { - this.tableData[index].od = row.os - this.tableData[index].odValue = row.osValue + moveHandle(val) { + if (val.row.id) { + if (val.type === 1) { + this.tableData[val.index].od = val.row.os + this.tableData[val.index].odValue = val.row.osValue } else { - this.tableData[index].os = row.od - this.tableData[index].osValue = row.odValue + this.tableData[val.index].os = val.row.od + this.tableData[val.index].osValue = val.row.odValue } - const sort = this.tableData[index].sort - this.tableData[index].sort = '' + const sort = this.tableData[val.index].sort + this.tableData[val.index].sort = '' this.$nextTick(() => { - this.tableData[index].sort = sort + this.tableData[val.index].sort = sort }) } else { - if (type === 1) { + if (val.type === 1) { this.tableData.forEach(item => { - if (item.name === row.name) { + if (item.name === val.row.name) { item.od = item.os item.odValue = item.osValue const sort = item.sort @@ -447,7 +394,7 @@ export default { }) } else { this.tableData.forEach(item => { - if (item.name === row.name) { + if (item.name === val.row.name) { item.os = item.od item.osValue = item.odValue const sort = item.sort @@ -492,13 +439,13 @@ export default { } }, // 新增树 - addTree(item, event) { + addTree(val) { this.title = '新增子级' this.addType = 1 this.form.name = '' - this.type = event.type - this.parentId = event.id - this.treeFlag = event.flag + this.type = val.event.type + this.parentId = val.event.id + this.treeFlag = val.event.flag this.dialogFormVisible = true }, // 新增保存树-眼睛部位下拉选择 diff --git a/src/components/360View/medicalRecord/outPatientRecord/afterForm.vue b/src/components/360View/medicalRecord/outPatientRecord/afterForm.vue index c5c762e..b42d8e0 100644 --- a/src/components/360View/medicalRecord/outPatientRecord/afterForm.vue +++ b/src/components/360View/medicalRecord/outPatientRecord/afterForm.vue @@ -4,7 +4,7 @@ ref="multipleTable" :data="tableData" style="margin: 8px 8px 0 0" - @selection-change="handleSelectionChange" + @select="selection" > @@ -82,9 +82,6 @@ export default { } }, methods: { - handleSelectionChange(val) { - this.$emit('handleSelectionChange', val) - }, moveHandle(index, type, row) { this.$emit('moveHandle', { index, type, row }) }, @@ -96,6 +93,9 @@ export default { }, removeTree(item) { this.$emit('removeTree', item) + }, + selection(selection, val) { + this.$emit('selection', { selection, val }) } } } diff --git a/src/components/360View/medicalRecord/outPatientRecord/index.vue b/src/components/360View/medicalRecord/outPatientRecord/index.vue index 30cb034..4c7a49e 100644 --- a/src/components/360View/medicalRecord/outPatientRecord/index.vue +++ b/src/components/360View/medicalRecord/outPatientRecord/index.vue @@ -217,7 +217,6 @@ export default { height: 100%; position: relative; overflow: hidden; - overflow-y: scroll; .btnBox{ text-align: right; position: absolute;