From 5ca62addd20db74a4dfabcb34292cf99241f5fd7 Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Thu, 18 Jul 2024 16:12:09 +0800 Subject: [PATCH] sample --- .../patientRegister/PatientRegisterList.vue | 3 + .../report/PatientRegisterListNobtn.vue | 62 +-- src/views/common-settings/SampleGroup.vue | 364 ++++++------------ 3 files changed, 153 insertions(+), 276 deletions(-) diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue index 9bca321..0d89947 100644 --- a/src/components/patientRegister/PatientRegisterList.vue +++ b/src/components/patientRegister/PatientRegisterList.vue @@ -82,6 +82,9 @@
{{ scope.row[dragCol[index].prop] + '_' }}
+
+ {{ scope.row[dragCol[index].prop] == scope.row['customerOrgParentName'] ? '':scope.row[dragCol[index].prop] }} +
{{ scope.row[dragCol[index].prop] }}
diff --git a/src/components/report/PatientRegisterListNobtn.vue b/src/components/report/PatientRegisterListNobtn.vue index 862efb8..321f0e4 100644 --- a/src/components/report/PatientRegisterListNobtn.vue +++ b/src/components/report/PatientRegisterListNobtn.vue @@ -5,36 +5,36 @@ :height="(window.pageHeight < 600) ? 230 : (window.pageHeight - 370)" highlight-current-row @row-click="rowClick" size="small" @selection-change="handleSelectionChange"> - + - + - + - + - - - - - - - - - + + + + + + + + + - + - - + + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + diff --git a/src/views/common-settings/SampleGroup.vue b/src/views/common-settings/SampleGroup.vue index 33d0982..9e6ee55 100644 --- a/src/views/common-settings/SampleGroup.vue +++ b/src/views/common-settings/SampleGroup.vue @@ -7,147 +7,91 @@ 条码分组
- - + +
-
+ ">
- - + + - + + + + - + - + - +
-
+
- 项目类别 - + ">项目类别 +
-
- +
+ @@ -156,89 +100,45 @@
- 添加 + 添加
- 全部添加 + 全部添加
- 移除 + 移除
- 全部移除 + 全部移除
- 快速选择 - - + ">快速选择 + +
-
- +
+ @@ -248,15 +148,13 @@
-
+ ">
新增
@@ -270,133 +168,86 @@ 置顶
- 置底 + 置底
- 排序 + 排序
- 确定项目 + 确定项目
- - + + - + + + - + - - + + + + - - + + + + + + + - + - + - + - + - 取 消 - 确 定 + 取 消 + 确 定
@@ -457,6 +308,7 @@ export default { displayName: "", sampleTypeId: "", sampleContainerId: "", + samplePrintCount: 1, }, dialogVisible: false, title: 1, @@ -591,9 +443,9 @@ export default { this.dict.asbItemQuick.forEach((item) => { if ( item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > - -1 || + -1 || item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > - -1 || + -1 || item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > -1 ) { this.quickAsb.push(item); @@ -897,7 +749,7 @@ export default { } }); }, - handlechang(value, direction, movedkeys) {}, + handlechang(value, direction, movedkeys) { }, //取消按钮 cancellation() { this.$message.info("取消操作"); @@ -926,11 +778,11 @@ export default { }, quckDepartments(e) { if (e) { - this.tableData.forEach((item,index) => { + this.tableData.forEach((item, index) => { if (e == item.id) { this.$refs["info"].setCurrentRow(item); this.rowick(item); - this.searchup(item,index) + this.searchup(item, index) } }); } else { @@ -943,7 +795,7 @@ export default { this.initTableData.forEach((item) => { if ( item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > - -1 || + -1 || item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > -1 // || item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1 ) { @@ -956,12 +808,12 @@ export default { }, searchup(data, index) { this.$nextTick(() => { - if(index==0){ - index=1 - } + if (index == 0) { + index = 1 + } const targetTop = this.$refs["info"].$el .querySelectorAll(".el-table__body tr") - [index - 1].getBoundingClientRect().top; + [index - 1].getBoundingClientRect().top; const containerTop = this.$refs["info"].$el .querySelector(".el-table__body") .getBoundingClientRect().top; @@ -1093,6 +945,7 @@ export default { displayName: this.form.displayName, sampleTypeId: this.form.sampleTypeId, sampleContainerId: this.form.sampleContainerId, + samplePrintCount: Number(this.form.samplePrintCount) }).then((res) => { if (res.code != -1) { // this.getlist(); 改为局部刷新 @@ -1107,6 +960,7 @@ export default { displayName: this.form.displayName, sampleTypeId: this.form.sampleTypeId, sampleContainerId: this.form.sampleContainerId, + samplePrintCount: Number(this.form.samplePrintCount) }).then((res) => { if (res.code != -1) { // this.getlist(); 改为局部刷新 @@ -1125,7 +979,7 @@ export default { let currentRow = {}; let lfind = arrayExistObj(this.tableData, "id", this.form.id); if (lfind > -1) { - objCopy(this.form, this.tableData[lfind]); + this.tableData[lfind] = Object.assign({}, this.tableData[lfind], this.form) currentRow = this.tableData[lfind]; } else { currentRow = deepCopy(this.form); @@ -1235,9 +1089,11 @@ export default { @import "../../assets/css/global_form.css"; @import "../../assets/css/global_input.css"; @import "../../assets/css/global.css"; + .mainleftbox { flex: 1; } + .Selectbutton { margin: 0 20px; display: flex; @@ -1245,75 +1101,93 @@ export default { justify-content: center; align-items: center; } + .mainbox { display: flex; justify-content: center; margin-top: 5px; } + .box { display: flex; flex-direction: column; } + /* form表单每一项的下边距 */ :deep .el-form-item { margin-bottom: 14px; } + /* 去掉input textarea的手动扩张样式 */ :deep(.el-textarea__inner) { resize: none; } + /* el-dialog的头部样式 */ :deep .el-dialog__header { padding: 11px 20px 11px; } + /* el-dialog的主体样式 */ :deep .el-dialog__body { padding: 0px 20px 0px; } + /* el-divider样式 */ :deep .el-divider--horizontal { margin: 0px 0 12px; } + /* el-dialog的底部样式 */ :deep .el-dialog__footer { padding: 0px 20px 14px; } + /* 默认结果后面下拉框样式 */ :deep .downText .el-input--suffix .el-input__inner { width: 0; height: 100%; padding: 0 19px; } + /* 默认结果后面下拉框图标样式 */ :deep .downText .el-input--suffix .el-input__suffix { right: 12px; } + /* 默认结果后面下拉框 */ :deep .downText { display: flex !important; } + /* 诊断函数后面按钮样式 */ :deep .el-input-group__append { padding: 0 11px; } + /* 默认结果整体样式 */ .my-el-form-item :deep .el-form-item__content { line-height: 0 !important; } + .my-el-form-item :deep .el-input__icon { line-height: 0 !important; } + /* 指引信息 */ .guidelines :deep .el-form-item { margin-bottom: 0; } + .seachinput { width: 250px; margin-right: 110px; } + :deep .seachinput .el-select { width: 100%; } + .layeredleftright { display: flex; flex-direction: column;