diff --git a/src/components/360View/afterPart/index.vue b/src/components/360View/afterPart/index.vue
index abb7b46..7af501c 100644
--- a/src/components/360View/afterPart/index.vue
+++ b/src/components/360View/afterPart/index.vue
@@ -5,29 +5,95 @@
-
+
描述项模板
+新增
+
+
+ {{ node.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.name }}
+
+ 视盘:视神经
+
+
+ 视盘:CDR
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+ {{ scope.row.name }}
+
+ 视盘:视神经
+
+
+ 视盘:CDR
+
+
+
+
+
-
+
@@ -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,10 @@ export default {
patientId: {
type: String,
default: ''
+ },
+ isSearch: {
+ type: String,
+ default: ''
}
},
inject: ['refresh'],
@@ -224,32 +294,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.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,17 +414,47 @@ export default {
}
},
// 移动
- moveHandle(value) {
- if (value.type === 1) {
- this.tableData[value.index].od = value.row
+ 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[value.index].os = value.row
+ 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 {
+ 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() {
@@ -334,7 +463,7 @@ export default {
jsonText: JSON.stringify(this.tableData),
name: '后段检查',
patientId: this.patientId,
- platform: '1'
+ platform: this.isSearch
}
let url = ''
if (this.collectId) {
@@ -359,12 +488,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.type = event.type
+ this.parentId = event.id
+ this.treeFlag = event.flag
this.dialogFormVisible = true
},
// 新增保存树-眼睛部位下拉选择
@@ -375,7 +505,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) {
@@ -436,7 +566,7 @@ export default {
params: {
doctorId: this.doctorId,
type: type,
- platform: 1
+ platform: this.isSearch
}
}).then(res => {
if (res.data.code === 0) {
@@ -454,6 +584,13 @@ 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)
}
@@ -504,7 +641,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) {
@@ -550,26 +687,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
}
})
@@ -597,7 +719,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
}
})
@@ -632,6 +754,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 c990680..cf27304 100644
--- a/src/components/360View/business.vue
+++ b/src/components/360View/business.vue
@@ -156,7 +156,7 @@ export default {
diff --git a/src/components/360View/forePart/index.vue.bak b/src/components/360View/forePart/index.vue.bak
new file mode 100644
index 0000000..c39deb5
--- /dev/null
+++ b/src/components/360View/forePart/index.vue.bak
@@ -0,0 +1,855 @@
+
+
+
+
+
+
描述项模板
+
+新增
+
+
+
+ {{ node.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 结膜:充血
+
+
+ 结膜:分泌物
+
+
+
+
+ {{ scope.row.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 结膜:充血
+
+
+ 结膜:分泌物
+
+
+
+
+ {{ scope.row.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/360View/img-reccrd.vue b/src/components/360View/img-reccrd.vue
index ba0ace0..955f836 100644
--- a/src/components/360View/img-reccrd.vue
+++ b/src/components/360View/img-reccrd.vue
@@ -596,7 +596,8 @@ export default {
const params = {
searchType: this.examineType,
searchChild: this.searchChild,
- patientId: this.patientInfo.patientId,
+ // patientId: this.patientInfo.patientId,
+ patientId: '2553716',
eyeType: this.eyeType,
fileType: this.fileType
}
diff --git a/src/components/360View/index1.vue b/src/components/360View/index1.vue
index b6e9669..d279bad 100644
--- a/src/components/360View/index1.vue
+++ b/src/components/360View/index1.vue
@@ -46,7 +46,7 @@
-
+
-
+
@@ -384,7 +385,6 @@ export default {
// }
});
window.open(href, '_blank');
- // this.isActive = true
},
// 关闭360弹框
closePacs() {
diff --git a/src/components/360View/key-indicators.vue b/src/components/360View/key-indicators.vue
index cd773dc..d0c4cae 100644
--- a/src/components/360View/key-indicators.vue
+++ b/src/components/360View/key-indicators.vue
@@ -76,6 +76,10 @@ export default {
patientId: {
type: String,
default: ''
+ },
+ patientIdNumber: {
+ type: String,
+ default: ''
}
},
data() {
@@ -170,7 +174,8 @@ export default {
const { data: res } = await this.$http.get('/patient/view/getKPIValue', {
params: {
id: obj.id,
- patientId: this.patientId
+ patientId: this.patientId,
+ patientIdNumber: this.patientIdNumber
}
})
if (res.code === 0) {
@@ -196,7 +201,7 @@ export default {