diff --git a/src/components/doctorCheck/QueueCheckList.vue b/src/components/doctorCheck/QueueCheckList.vue index 18d58d4..2d6aa6a 100644 --- a/src/components/doctorCheck/QueueCheckList.vue +++ b/src/components/doctorCheck/QueueCheckList.vue @@ -51,15 +51,16 @@
- - - + + + +
@@ -86,15 +87,16 @@
- - - + + + +
@@ -107,15 +109,16 @@
- - - + + + +
diff --git a/src/components/doctorCheck/RegisterCheckEdit.vue b/src/components/doctorCheck/RegisterCheckEdit.vue index 05af3f8..b882616 100644 --- a/src/components/doctorCheck/RegisterCheckEdit.vue +++ b/src/components/doctorCheck/RegisterCheckEdit.vue @@ -1,6 +1,11 @@ diff --git a/src/components/sumDoctorCheck/SumSug.vue b/src/components/sumDoctorCheck/SumSug.vue index 6ec9745..c23981f 100644 --- a/src/components/sumDoctorCheck/SumSug.vue +++ b/src/components/sumDoctorCheck/SumSug.vue @@ -9,7 +9,7 @@ :disabled="sumBtnDisabledAddSummary">新增综述
-
+
@@ -90,7 +90,7 @@
-
+
@@ -258,6 +258,19 @@
+
+ + + + + + +
@@ -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) diff --git a/src/views/diagnosis/diagnosis.vue b/src/views/diagnosis/diagnosis.vue index 66cd0a9..87dac29 100644 --- a/src/views/diagnosis/diagnosis.vue +++ b/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; } diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue index 5b71ba4..ab4fc33 100644 --- a/src/views/fee-settings/Item.vue +++ b/src/views/fee-settings/Item.vue @@ -692,26 +692,15 @@ - - - + + + + - + @@ -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; }