pengqiang
/
xiangan_pc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

冲突解决

360view
bianyaqi 2 years ago
parent
a28c77c727
commit
aa5e73f27e
3 changed files with 49 additions and 103 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 137
      src/components/360View/afterPart/index.vue
  2. 14
      src/components/360View/medicalRecord/outPatientRecord/afterForm.vue
  3. 1
      src/components/360View/medicalRecord/outPatientRecord/index.vue

137
src/components/360View/afterPart/index.vue
View File

@ -23,75 +23,20 @@
<span>{{ node.label }}</span>
</span>
<span>
<el-button v-if="!data.treeId" icon="el-icon-plus" style="font-size: 12px;color: #409EFF" type="text" @click.stop="append(2, data)"></el-button>
<el-button icon="el-icon-delete" style="font-size: 12px;color: #F56C6C" type="text" @click.stop="remove(node, data)"></el-button>
<el-button v-if="!data.treeId" icon="el-icon-plus" style="font-size: 12px;color: #409EFF" type="text" @click.stop="append(2, data)" />
<el-button icon="el-icon-delete" style="font-size: 12px;color: #F56C6C" type="text" @click.stop="remove(node, data)" />
</span>
</span>
</el-tree>
</div>
<el-table
id="foreCheck"
ref="multipleTable"
:data="tableData"
style="margin: 8px 8px 0 0"
@select="selection"
>
<el-table-column
type="selection"
width="55"
/>
<el-table-column
align="center"
label="OD"
>
<template slot-scope="scope">
<div>
<span v-if="scope.row.sort === 99">
<treeSelect v-model="scope.row.od" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
</span>
<span v-if="!scope.row.sort && !scope.row.id">{{ scope.row.name }}</span>
<span v-if="scope.row.sort === 3">
<span style="margin-right: 16px">视盘：视神经</span><treeSelect v-model="scope.row.od" :props="treeProps" style="display: inline-block;width: 60%" :options="scope.row.data" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" />
</span>
<span v-if="scope.row.sort === 4">
<span style="margin-right: 16px">视盘：CDR</span><treeSelect v-model="scope.row.od" :props="treeProps" style="display: inline-block;width: 60%" :options="scope.row.data" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" />
</span>
</div>
</template>
</el-table-column>
<el-table-column
class="move"
align="center"
width="120"
>
<template slot-scope="scope">
<div>
<p @click="moveHandle(scope.$index,1, scope.row)"><i class="el-icon-back" /></p>
<p style="margin-top: 5px" @click="moveHandle(scope.$index,2, scope.row)"><i class="el-icon-back" style="transform: rotateY(180deg)" /></p>
</div>
</template>
</el-table-column>
<el-table-column
align="center"
label="OS"
width="300"
>
<template slot-scope="scope">
<div>
<span v-if="scope.row.sort === 99">
<treeSelect v-model="scope.row.os" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" />
</span>
<span v-if="!scope.row.sort && !scope.row.id">{{ scope.row.name }}</span>
<span v-if="scope.row.sort === 3">
<span style="margin-right: 16px">视盘：视神经</span><treeSelect v-model="scope.row.os" :props="treeProps" style="display: inline-block;width: 60%" :options="scope.row.data" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" />
</span>
<span v-if="scope.row.sort === 4">
<span style="margin-right: 16px">视盘：CDR</span><treeSelect v-model="scope.row.os" :props="treeProps" style="display: inline-block;width: 60%" :options="scope.row.data" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" />
</span>
</div>
</template>
</el-table-column>
</el-table>
<after-form
:table-data="tableData"
@selection="selection"
@moveHandle="moveHandle"
@handleNode="handleNode"
@addTree="addTree"
@removeTree="removeTree"
/>
</div>
<el-dialog :title="title" :visible.sync="dialogFormVisible" width="40%">
<el-form :model="form" style="margin-top: 16px">
@ -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
},
// 新增保存树-眼睛部位下拉选择

14
src/components/360View/medicalRecord/outPatientRecord/afterForm.vue
View File

@ -4,7 +4,7 @@
ref="multipleTable"
:data="tableData"
style="margin: 8px 8px 0 0"
@selection-change="handleSelectionChange"
@select="selection"
>
<el-table-column
type="selection"
@ -35,9 +35,9 @@
width="120"
>
<template slot-scope="scope">
<div v-if="scope.row.id&&!isPrint">
<p @click="moveHandle(scope.$index,1, scope.row.os)"><i class="el-icon-back" /></p>
<p style="margin-top: 5px" @click="moveHandle(scope.$index,2, scope.row.od)"><i class="el-icon-back" style="transform: rotateY(180deg)" /></p>
<div>
<p @click="moveHandle(scope.$index,1, scope.row)"><i class="el-icon-back" /></p>
<p style="margin-top: 5px" @click="moveHandle(scope.$index,2, scope.row)"><i class="el-icon-back" style="transform: rotateY(180deg)" /></p>
</div>
</template>
</el-table-column>
@ -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 })
}
}
}

1
src/components/360View/medicalRecord/outPatientRecord/index.vue
View File

@ -217,7 +217,6 @@ export default {
height: 100%;
position: relative;
overflow: hidden;
overflow-y: scroll;
.btnBox{
text-align: right;
position: absolute;

Write Preview
Loading…
Cancel
Save