diff --git a/src/components/360View/afterPart/index.vue b/src/components/360View/afterPart/index.vue
index 7af501c..abb7b46 100644
--- a/src/components/360View/afterPart/index.vue
+++ b/src/components/360View/afterPart/index.vue
@@ -5,95 +5,29 @@
-
+
描述项模板
+新增
-
-
- {{ node.label }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.name }}
-
- 视盘:视神经
-
-
- 视盘:CDR
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.name }}
-
- 视盘:视神经
-
-
- 视盘:CDR
-
-
-
-
-
+
-
+
@@ -104,20 +38,18 @@
确 定
-
+
-
+
@@ -136,9 +68,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: [],
@@ -150,10 +84,6 @@ export default {
patientId: {
type: String,
default: ''
- },
- isSearch: {
- type: String,
- default: ''
}
},
inject: ['refresh'],
@@ -294,61 +224,32 @@ export default {
const { data: res } = await this.$http.get('/case/getCase', {
params: {
patientId: this.patientId,
- platform: this.isSearch,
+ platform: 1,
flag: flag // 1病史采集2前段检查3后段检查4专科检查
}
})
if (res.code === 0) {
- this.tableData = res.data ? JSON.parse(res.data.jsonText) : []
- this.tableData.forEach(item => {
- item.flag = false
- })
+ // this.tableData = res.data ? JSON.parse(res.data.jsonText) : []
this.collectId = res.data ? res.data.id : ''
} else {
this.$message.error(res.msg)
}
},
// 表格复选框
- 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
- })
- }
- }
+ handleSelectionChange(val) {
+ this.multipleSelection = val
},
- // 保留下拉框的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
}
},
// 添加数据集
addAfterData() {
- const selectData = this.tableData.filter(item => item.flag === true)
- if (!selectData.length) return this.$message.warning('请勾选数据!')
- const data = selectData.filter(item => {
+ if (!this.multipleSelection.length) return this.$message.warning('请勾选数据!')
+ const data = this.multipleSelection.filter(item => {
return item.type !== undefined
})
eventBus.$emit('sendForData', data)
@@ -414,47 +315,17 @@ 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(value) {
+ if (value.type === 1) {
+ this.tableData[value.index].od = value.row
} else {
- this.tableData[index].os = row.od
- this.tableData[index].osValue = row.odValue
+ this.tableData[value.index].os = value.row
}
const sort = this.tableData[index].sort
this.tableData[index].sort = ''
this.$nextTick(() => {
this.tableData[index].sort = sort
})
- } else {
- 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
- })
- }
- })
- }
- }
},
// 保存后段检查
async saveAfter() {
@@ -463,7 +334,7 @@ export default {
jsonText: JSON.stringify(this.tableData),
name: '后段检查',
patientId: this.patientId,
- platform: this.isSearch
+ platform: '1'
}
let url = ''
if (this.collectId) {
@@ -488,13 +359,12 @@ export default {
}
},
// 新增树
- addTree(item, event) {
+ addTree(value) {
this.title = '新增子级'
this.addType = 1
this.form.name = ''
- this.type = event.type
- this.parentId = event.id
- this.treeFlag = event.flag
+ this.type = value.event.type
+ this.parentId = value.event.id
this.dialogFormVisible = true
},
// 新增保存树-眼睛部位下拉选择
@@ -505,7 +375,7 @@ export default {
flag: this.treeFlag, // 1公共树,2个人树
type: this.type,
parentId: this.parentId,
- platform: this.isSearch
+ platform: 1
}
const { data: res } = await this.$http.post('/treetag/addTree', params)
if (res.code === 0) {
@@ -566,7 +436,7 @@ export default {
params: {
doctorId: this.doctorId,
type: type,
- platform: this.isSearch
+ platform: 1
}
}).then(res => {
if (res.data.code === 0) {
@@ -584,13 +454,6 @@ export default {
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)
}
@@ -641,7 +504,7 @@ export default {
name: this.form.name,
weight: this.weight,
parentId: this.parentId,
- platform: this.isSearch
+ platform: 1
}
const { data: res } = await this.$http.post('/treetemplate/addTree', params)
if (res.code === 0) {
@@ -687,11 +550,26 @@ 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: this.isSearch,
+ platform: 1,
doctorId: this.doctorId
}
})
@@ -719,7 +597,7 @@ export default {
const { data: res } = await this.$http.get('/treetemplate/findTreeCase', {
params: {
type: 3, // 2前段检查 3后段检查
- platform: this.isSearch,
+ platform: 1,
doctorId: this.doctorId
}
})
@@ -754,9 +632,6 @@ export default {
top: 40px;
z-index: 9;
}
- .custom-tree-node{
- width: 100%;
- }
}
diff --git a/src/components/360View/forePart/index.vue b/src/components/360View/forePart/index.vue
index 0736ac6..23e83fb 100644
--- a/src/components/360View/forePart/index.vue
+++ b/src/components/360View/forePart/index.vue
@@ -1,147 +1,38 @@
+
+
+
+
+
+
+
+
-
+
描述项模板
+新增
-
-
- {{ node.label }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 结膜:充血
-
-
- 结膜:分泌物
-
-
-
-
- {{ scope.row.name }}
-
-
-
-
-
-
-
-
-
-
-
- 结膜:充血
-
-
- 结膜:分泌物
-
-
-
-
- {{ scope.row.name }}
-
-
-
-
-
+
@@ -152,20 +43,18 @@
确 定
-
+
-
+
@@ -180,15 +69,15 @@