pengjun 4 months ago
parent
commit
25d975f743
  1. 21
      src/components/doctorCheck/QueueCheckList.vue
  2. 28
      src/components/doctorCheck/RegisterCheckEdit.vue
  3. 61
      src/components/sumDoctorCheck/SumSug.vue
  4. 2
      src/views/diagnosis/diagnosis.vue
  5. 23
      src/views/fee-settings/Item.vue

21
src/components/doctorCheck/QueueCheckList.vue

@ -51,15 +51,16 @@
<div style="display: flex" @contextmenu.prevent="onContextmenu">
<el-table :data="waitDetail" style="width: 100%" border highlight-current-row @row-click="rowClickWait"
:row-style="{ height: '28px' }" :height="Math.floor((tableHeight - 72) / 3)" @row-contextmenu="rClick">
<el-table-column prop="queueRegisterNumber" label="号" min-width="30" align="center" />
<el-table-column prop="patientName" label="姓名" min-width="80" align="center" />
<el-table-column prop="isVip" label="Vip" min-width="40" align="center">
<el-table-column type="index" label="序" width="30" align="center" />
<el-table-column prop="patientName" label="姓名" width="80" align="center" />
<el-table-column prop="isVip" label="Vip" width="30" align="center">
<template slot-scope="scope">
<div style="font-family: 'Microsoft YaHei'">
{{ scope.row.isVip == "Y" ? "√" : "" }}
</div>
</template>
</el-table-column>
<el-table-column prop="queueRegisterNumber" label="号" min-width="30" align="center" />
</el-table>
<div style="margin-top: 20px">
<div>
@ -86,15 +87,16 @@
<div style="display: flex" @contextmenu.prevent="onContextmenu">
<el-table :data="alreadyCalledDetail" style="width: 100%" border highlight-current-row @row-contextmenu="rClick"
@row-click="rowClickAlready" :row-style="{ height: '28px' }" :height="Math.floor((tableHeight - 72) / 3)">
<el-table-column prop="queueRegisterNumber" label="号" min-width="30" align="center" />
<el-table-column prop="patientName" label="姓名" min-width="80" align="center" />
<el-table-column prop="isVip" label="Vip" min-width="40" align="center">
<el-table-column type="index" label="序" width="30" align="center" />
<el-table-column prop="patientName" label="姓名" width="80" align="center" />
<el-table-column prop="isVip" label="Vip" width="30" align="center">
<template slot-scope="scope">
<div style="font-family: 'Microsoft YaHei'">
{{ scope.row.isVip == "Y" ? "√" : "" }}
</div>
</template>
</el-table-column>
<el-table-column prop="queueRegisterNumber" label="号" min-width="30" align="center" />
</el-table>
<div style="margin-top: 20px">
<div>
@ -107,15 +109,16 @@
<div style="display: flex" @contextmenu.prevent="onContextmenu">
<el-table :data="overNumberDetail" style="width: 100%" border highlight-current-row @row-click="rowClickOver"
:row-style="{ height: '28px' }" :height="Math.floor((tableHeight - 72) / 3)" @row-contextmenu="rClick">
<el-table-column prop="queueRegisterNumber" label="号" min-width="30" align="center" />
<el-table-column prop="patientName" label="姓名" min-width="80" align="center" />
<el-table-column prop="isVip" label="Vip" min-width="40" align="center">
<el-table-column type="index" label="序" width="30" align="center" />
<el-table-column prop="patientName" label="姓名" width="80" align="center" />
<el-table-column prop="isVip" label="Vip" width="30" align="center">
<template slot-scope="scope">
<div style="font-family: 'Microsoft YaHei'">
{{ scope.row.isVip == "Y" ? "√" : "" }}
</div>
</template>
</el-table-column>
<el-table-column prop="queueRegisterNumber" label="号" width="30" align="center" />
</el-table>
<div style="margin-top: 20px">
<div>

28
src/components/doctorCheck/RegisterCheckEdit.vue

@ -1,6 +1,11 @@
<template>
<div style="display: flex;height:32px;">
<div style="display: flex; flex-wrap: wrap;height:32px; width: 100%">
<div v-if="false">
<el-select v-model="doctorCheck.RegisterCheckEdit.completeFlag" style="width: 60px" size="small" disabled>
<el-option v-for="item in dict.checkCompleteFlag" :key="item.id" :label="item.displayName" :value="item.id" />
</el-select>
</div>
<div>
<span class="query">检查医生</span>
<el-select v-model="doctorCheck.RegisterCheckEdit.checkDoctorId" filterable clearable placeholder="请选择"
@ -11,6 +16,23 @@
<div>
<span class="query">检查日期</span>
<el-date-picker v-model="doctorCheck.RegisterCheckEdit.checkDate" type="datetime" style="width: 90px" size="small" />
</div>
<div>
<span class="query">审核医生</span>
<el-select v-model="doctorCheck.RegisterCheckEdit.auditorUserId" filterable clearable placeholder="请选择"
style="width: 80px" size="small" disabled>
<el-option v-for="item in users" :key="item.id" :label="item.surname" :value="item.id" />
</el-select>
</div>
<div>
<span class="query">审核日期</span>
<el-date-picker v-model="doctorCheck.RegisterCheckEdit.auditTime" type="datetime" style="width: 90px" size="small" disabled/>
</div>
<div>
<el-select v-model="doctorCheck.RegisterCheckEdit.isAudit" style="width: 60px" size="small" disabled>
<el-option label="已审" value="Y" />
<el-option label="未审" value="N" />
</el-select>
</div>
<div>
<span class="query">操作者</span>
@ -22,11 +44,7 @@
:value="doctorCheck.RegisterCheckEdit.lastModificationTime ? lmoment(doctorCheck.RegisterCheckEdit.lastModificationTime, 'yyyy-MM-DD') : ''"
style="width: 90px" size="small" disabled></el-input>
</div>
<div>
<el-select v-model="doctorCheck.RegisterCheckEdit.completeFlag" style="width: 60px" size="small" disabled>
<el-option v-for="item in dict.checkCompleteFlag" :key="item.id" :label="item.displayName" :value="item.id" />
</el-select>
</div>
</div>
</div>
</template>

61
src/components/sumDoctorCheck/SumSug.vue

@ -9,7 +9,7 @@
:disabled="sumBtnDisabledAddSummary">新增综述</el-button>
</div>
</div>
<div style="width:50%;background-color: #B9CEE9;" @contextmenu="onContextmenu">
<div :style="`width:${sugWidth - 200}px;background-color: #B9CEE9;`" @contextmenu="onContextmenu">
<el-table id="tableSummary" row-key="id" :data="sumDoctorCheck.summaryList" width="100%"
:height="sumHeight - (history_summary_years_limit == '0' ? 0 : 94)" border size="small">
<el-table-column type="index" width="30" align="center" />
@ -90,7 +90,7 @@
</div>
</div>
</div>
<div style="width:50%;background-color: #B9CEE9;" @contextmenu="onContextmenuSug">
<div :style="`width:${sugWidth}px;background-color: #B9CEE9;`" @contextmenu="onContextmenuSug">
<el-table id="tableSuggestion" row-key="id" :data="sumDoctorCheck.suggestionList" width="100%"
:height="sumHeight" border size="small" ref="tableSuggestion" @row-contextmenu="onCellRightClick">
<el-table-column width="30" align="center">
@ -258,6 +258,19 @@
</el-table-column>
</el-table>
</div>
<div style="width:200px;">
<el-table id="tableSuggestionEasy" row-key="id" :data="sumDoctorCheck.suggestionList" width="100%"
:height="sumHeight" border size="small" ref="tableSuggestionEasy" @row-contextmenu="onCellRightClick">
<el-table-column width="30" align="center">
<template slot-scope="scope">
<el-tag class="moveTag" style="cursor: move;background-color: #EEEEEE;">
<div style="width: 16px;">{{ scope.$index + 1 }}</div>
</el-tag>
</template>
</el-table-column>
<el-table-column prop="suggestionTitle" label="诊断目录索引" show-overflow-tooltip/>
</el-table>
</div>
</div>
<!--弹窗-->
<div>
@ -432,6 +445,7 @@ export default {
// this.rowDrop();
this.rowDropSuggestion();
this.rowDropSuggestionEasy();
await this.dictInit()
// document.addEventListener('DOMContentLoaded', function () {
@ -458,6 +472,12 @@ export default {
frameHeight() {
return this.window.pageHeight - 42 - 10
},
//
sugWidth() {
return Math.floor((this.window.pageWidth - 120) / 2)
},
// AIdiagnosisHeight
AIDH() {
return Math.floor((this.AI.height - 24 - 42 - 4) / 21.5)
@ -1304,7 +1324,7 @@ export default {
});
},
//
//--
rowDropSuggestion() {
this.$nextTick(() => {
const el = document.querySelector("#tableSuggestion tbody");
@ -1323,18 +1343,37 @@ export default {
});
},
//--
rowDropSuggestionEasy() {
this.$nextTick(() => {
const el = document.querySelector("#tableSuggestionEasy tbody");
console.log('tbody', el)
const that = this;
Sortable.create(el, {
handle: ".moveTag",
animation: 150, // ms, number ms
//
onEnd({ newIndex, oldIndex }) {
that.isshow = false;
const currRow = that.sumDoctorCheck.suggestionList.splice(oldIndex, 1)[0];
that.sumDoctorCheck.suggestionList.splice(newIndex, 0, currRow);
},
});
});
},
//
cutSugRows(cutNum) {
// cutNum == 0
if (cutNum == 0) {
this.dataTransOpts.sumCutRows = this.sumDoctorCheck.suggestionList.slice()
this.sumDoctorCheck.suggestionList = []
} else {
this.dataTransOpts.sumCutRows = this.sumDoctorCheck.suggestionList.slice(this.rckParam.curRow, Number(this.rckParam.curRow) + Number(cutNum))
this.sumDoctorCheck.suggestionList = arrayReduce(this.sumDoctorCheck.suggestionList, this.dataTransOpts.sumCutRows, "id=id")
}
console.log('cutSugRows',cutNum,this.dataTransOpts.sumCutRows,this.sumDoctorCheck.suggestionList)
console.log('cutSugRows', cutNum, this.dataTransOpts.sumCutRows, this.sumDoctorCheck.suggestionList)
//this.sumDoctorCheck.suggestionList.splice(this.rckParam.curRow, cutNum)
},
@ -1582,9 +1621,9 @@ export default {
// ]
// }
]
//
console.log('this.dataTransOpts.sumCutRows.length',this.dataTransOpts.sumCutRows.length)
console.log('this.dataTransOpts.sumCutRows.length', this.dataTransOpts.sumCutRows.length)
if (this.dataTransOpts.sumCutRows.length > 0) {
menus.push({ type: 'separator' })
menus.push({ label: '粘贴诊断到当前行前面', itemId: '粘贴诊断到当前行前面', enabled: true })
@ -1627,17 +1666,17 @@ export default {
//
onContextMenuDIY(data) {
//this.$message({showClose:true,message:data})
console.log('onContextMenuDIY',data)
console.log('onContextMenuDIY', data)
switch (data) {
case '粘贴诊断到当前行前面':
this.insRows(0)
break;
case '粘贴诊断到当前行后面':
if(length == 0){
if (length == 0) {
this.insRows(0)
}else{
} else {
this.insRows(1)
}
}
break;
case '剪切所有诊断':
this.cutSugRows(0)

2
src/views/diagnosis/diagnosis.vue

@ -669,7 +669,7 @@
::v-deep .dddwSelect .el-select-dropdown__wrap {
background-color: #FFF;
max-height: 600px;
max-height: 500px;
max-width: 350px;
}

23
src/views/fee-settings/Item.vue

@ -692,26 +692,15 @@
<el-dialog :title="ruesttiele == 1 ? '新增' : '修改'" :visible.sync="ruesttieledialogVisible" width="80%"
:close-on-click-modal="false">
<el-form :model="rusetform" ref="rusetform" label-width="100px" :rules="rusetformcheck">
<el-row>
<!-- <el-col :span="8">
<el-form-item label="项目">
<el-select v-model="rusetform.itemId" placeholder="请选择">
<el-option
v-for="item in itemId"
:key="item.id"
:label="item.displayName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-row>
<el-col :span="24">
<el-form-item label="结果" prop="result">
<el-input v-model="rusetform.result" ref="ruseInput" @change="changeUpdate($event)"
@input="change($event)" size="small"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="诊断编号">
<el-select v-model="rusetform.diagnosisId" placeholder="请选择" filterable :filter-method="remoteMethod"
@ -734,7 +723,7 @@
@change="quckRusetform" />
</el-form-item>
</el-col>
<el-col :span="9">
<el-col :span="8">
<el-form-item label="结果状态" prop="resultStatusId">
<el-select v-model="rusetform.resultStatusId" placeholder="请选择" filterable @change="quckRusetform"
size="small">
@ -2764,7 +2753,7 @@ export default {
::v-deep .dddwSelect .el-select-dropdown__wrap {
background-color: #FFF;
max-height: 600px;
max-height: 500px;
max-width: 350px;
}

Loading…
Cancel
Save