diff --git a/src/components/360View/addInfo.vue b/src/components/360View/addInfo.vue deleted file mode 100644 index 44b56b2..0000000 --- a/src/components/360View/addInfo.vue +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - diff --git a/src/components/360View/afterPart/index.vue b/src/components/360View/afterPart/index.vue index 645d3e9..993dcd8 100644 --- a/src/components/360View/afterPart/index.vue +++ b/src/components/360View/afterPart/index.vue @@ -5,29 +5,95 @@

-
+

描述项模板

- +新增 + +新增 + > + + + {{ node.label }} + + + + + + +
- + + + + + + + + + + + +
- + @@ -38,18 +104,20 @@ 确 定
- + - + @@ -68,11 +136,9 @@ 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: [], @@ -84,6 +150,14 @@ export default { patientId: { type: String, default: '' + }, + isSearch: { + type: String, + default: '' + }, + onlyRead: { + type: Boolean, + default: false } }, inject: ['refresh'], @@ -224,32 +298,61 @@ export default { const { data: res } = await this.$http.get('/case/getCase', { params: { patientId: this.patientId, - platform: 1, + platform: this.isSearch, flag: flag // 1病史采集2前段检查3后段检查4专科检查 } }) if (res.code === 0) { - // this.tableData = res.data ? JSON.parse(res.data.jsonText) : [] + this.tableData = res.data ? JSON.parse(res.data.jsonText) : this.tableData + this.tableData.forEach(item => { + item.flag = false + }) this.collectId = res.data ? res.data.id : '' } else { this.$message.error(res.msg) } }, // 表格复选框 - handleSelectionChange(val) { - this.multipleSelection = val + selection(selection, val) { + if (!val.id) { + const data = this.tableData.filter(item => item.name === val.name) + if (val.flag) { + data.forEach(row => { + row.flag = false + this.$refs.multipleTable.toggleRowSelection(row, false); + }) + } else { + data.forEach(row => { + row.flag = true + this.$refs.multipleTable.toggleRowSelection(row, true); + }) + } + } else { + const data = this.tableData.filter(item => item.id === val.id) + if (val.flag) { + data.forEach(row => { + row.flag = false + }); + } else { + data.forEach(row => { + row.flag = true + }) + } + } }, - handleNode(val) { - if (val.type === 'os') { - this.tableData[val.index].osValue = val.event + // 保留下拉框的label，添加到数据集用于展示 + handleNode(index, type, event) { + if (type === 'os') { + this.tableData[index].osValue = event } else { - this.tableData[val.index].odValue = val.event + this.tableData[index].odValue = event } }, // 添加数据集 addAfterData() { - if (!this.multipleSelection.length) return this.$message.warning('请勾选数据!') - const data = this.multipleSelection.filter(item => { + const selectData = this.tableData.filter(item => item.flag === true) + if (!selectData.length) return this.$message.warning('请勾选数据!') + const data = selectData.filter(item => { return item.type !== undefined }) eventBus.$emit('sendForData', data) @@ -315,19 +418,47 @@ export default { } }, // 移动 - moveHandle(value) { - if (value.type === 1) { - this.tableData[value.index].od = value.row - this.tableData[value.index].odValue = value.row.osValue + moveHandle(index, type, row) { + if (row.id) { + if (type === 1) { + this.tableData[index].od = row.os + this.tableData[index].odValue = row.osValue + } else { + this.tableData[index].os = row.od + this.tableData[index].osValue = row.odValue + } + const sort = this.tableData[index].sort + this.tableData[index].sort = '' + this.$nextTick(() => { + this.tableData[index].sort = sort + }) } else { - this.tableData[value.index].os = value.row - this.tableData[value.index].osValue = value.row.odValue + if (type === 1) { + this.tableData.forEach(item => { + if (item.name === row.name) { + 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.name === row.name) { + item.os = item.od + item.osValue = item.odValue + const sort = item.sort + item.sort = '' + this.$nextTick(() => { + item.sort = sort + }) + } + }) + } } - const sort = this.tableData[value.index].sort - this.tableData[value.index].sort = '' - this.$nextTick(() => { - this.tableData[value.index].sort = sort - }) }, // 保存后段检查 async saveAfter() { @@ -336,7 +467,7 @@ export default { jsonText: JSON.stringify(this.tableData), name: '后段检查', patientId: this.patientId, - platform: '1' + platform: this.isSearch } let url = '' if (this.collectId) { @@ -361,13 +492,13 @@ export default { } }, // 新增树 - addTree(value) { + addTree(item, event) { this.title = '新增子级' this.addType = 1 this.form.name = '' - this.type = value.event.type - this.parentId = value.event.id - this.treeFlag = value.event.flag + this.type = event.type + this.parentId = event.id + this.treeFlag = event.flag this.dialogFormVisible = true }, // 新增保存树-眼睛部位下拉选择 @@ -378,7 +509,7 @@ export default { flag: this.treeFlag, // 1公共树,2个人树 type: this.type, parentId: this.parentId, - platform: 1 + platform: this.isSearch } const { data: res } = await this.$http.post('/treetag/addTree', params) if (res.code === 0) { @@ -431,15 +562,14 @@ export default { }) }, queryTree(type) { - // 47.110.224.240:8036 - // 192.168.4.24:8036 + const baseUrl = window.SITE_CONFIG['apiURL'] + '/treetag/findTree' return new Promise((resolve, reject) => { axios.defaults.headers.common['token'] = Cookies.get('xa-token') || '' - axios.get('http://192.168.4.83:8036/xiangan-crf/treetag/findTree', { + axios.get(baseUrl, { params: { doctorId: this.doctorId, type: type, - platform: 1 + platform: this.isSearch } }).then(res => { if (res.data.code === 0) { @@ -456,6 +586,14 @@ export default { templateData(data, node) { if (data && data.caseJson) { this.tableData = JSON.parse(data.caseJson) + // 回显表格复选框 + this.$nextTick(() => { + this.tableData.forEach(item => { + if (item.flag) { + this.$refs.multipleTable.toggleRowSelection(item, true) + } + }) + }) } else { this.tableData = _.cloneDeep(this.sourceData) } @@ -506,7 +644,7 @@ export default { name: this.form.name, weight: this.weight, parentId: this.parentId, - platform: 1 + platform: this.isSearch } const { data: res } = await this.$http.post('/treetemplate/addTree', params) if (res.code === 0) { @@ -552,26 +690,11 @@ export default { this.$message.error(res.msg) } }, - // 描述项模板 - renderContent(h, { node, data, store }) { - return ( - - - {node.label} - - - this.append(2, data) }> - - this.remove(node, data) }> - - - ) - }, // 查询弹框模板树 async queryTemplate() { const { data: res } = await this.$http.get('/treetemplate/findTree', { params: { - platform: 1, + platform: this.isSearch, doctorId: this.doctorId } }) @@ -599,7 +722,7 @@ export default { const { data: res } = await this.$http.get('/treetemplate/findTreeCase', { params: { type: 3, // 2前段检查 3后段检查 - platform: 1, + platform: this.isSearch, doctorId: this.doctorId } }) @@ -634,6 +757,9 @@ export default { top: 40px; z-index: 9; } + .custom-tree-node{ + width: 100%; + } } diff --git a/src/components/360View/business.vue b/src/components/360View/business.vue index cf27304..70f940d 100644 --- a/src/components/360View/business.vue +++ b/src/components/360View/business.vue @@ -57,11 +57,9 @@ - - diff --git a/src/components/360View/dataInfo.vue b/src/components/360View/dataInfo.vue index d6486d0..ee6725d 100644 --- a/src/components/360View/dataInfo.vue +++ b/src/components/360View/dataInfo.vue @@ -131,7 +131,7 @@ - +