diff --git a/src/components/customerOrg/customerOrgTree.vue b/src/components/customerOrg/customerOrgTree.vue index 25598c8..702ef17 100644 --- a/src/components/customerOrg/customerOrgTree.vue +++ b/src/components/customerOrg/customerOrgTree.vue @@ -139,7 +139,7 @@ export default { filterNode(value, data) { //console.log(value,data) if (!value) return true; - return data['displayName'].indexOf(value) !== -1; + return data['displayName'].indexOf(value) !== -1 || data['simpleCode'].indexOf(value.toUpperCase()) !== -1; } }, diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue index cc76bdc..a9fa2c3 100644 --- a/src/components/patientRegister/PatientRegisterList.vue +++ b/src/components/patientRegister/PatientRegisterList.vue @@ -712,24 +712,8 @@ export default { }, //点击体检次数行 - rowClick(row) { - this.patientRegister.photo = ""; //清除照片缓存 - - this.patientRegister.patientRegisterId = row.id; - this.patientRegister.photo = row.photo || "/pic/Photo.jpg"; - this.patientRegister.patientRegisterRd = row; - this.patientRegister.query.customerOrgParentId = row.customerOrgParentId; - this.patientRegister.customerOrgGroupChange = 0; //控制体检列表记录切换时,0 无需触发更换分组操作 - this.patientRegister.medicalPackageChange = 0; //控制体检列表记录切换时,0 无需触发更换套餐操作 - this.getCustomerOrgGroup(row.customerOrgParentId); - this.dict.asbItem = [...this.dict.asbItemAll]; - this.getPatientRegisterAbs(row.id); - - console.log( - "this.patientRegister.prList", - this.window, - this.patientRegister.prList - ); + rowClick(row) { + //console.log("this.patientRegister.prList",this.window,this.patientRegister.prList); // 按住了shift键 if (this.window.shift) { @@ -741,38 +725,56 @@ export default { if (this.startPoint == -1) { this.patientRegister.prList[row.index].choosed = true; - this.startPoint = row.index; - return; - } - - if (this.startPoint > row.index) { - for (let i = row.index; i <= this.startPoint; i++) { - this.patientRegister.prList[i].choosed = true; - } - } else if (this.startPoint <= row.index) { - for (let i = this.startPoint; i <= row.index; i++) { - this.patientRegister.prList[i].choosed = true; + this.startPoint = row.index; + }else{ + if (this.startPoint > row.index) { + for (let i = row.index; i <= this.startPoint; i++) { + this.patientRegister.prList[i].choosed = true; + } + } else if (this.startPoint <= row.index) { + for (let i = this.startPoint; i <= row.index; i++) { + this.patientRegister.prList[i].choosed = true; + } } } - return; - } - - // 按住了ctrl 键 - if (this.window.ctrl) { + }else if (this.window.ctrl) { // 按住了ctrl 键 + this.patientRegister.prList[row.index].choosed = true; + if (this.startPoint == -1){ + this.startPoint = row.index; + } + }else{ + // 未按住了ctrl 、shift 键 + //清除所有选择 + console.log("清除所有选择"); + this.patientRegister.prList.forEach((e) => { + e.choosed = false; + return e; + }); this.patientRegister.prList[row.index].choosed = true; this.startPoint = row.index; - return; } - // 未按住了ctrl 、shift 键 - //清除所有选择 - console.log("清除所有选择"); - this.patientRegister.prList.forEach((e) => { - e.choosed = false; - return e; - }); - this.patientRegister.prList[row.index].choosed = true; - this.startPoint = row.index; + //选中了多个点编辑时,排序最前的为当前选中的 + console.log('row.index <= this.startPoint',row.index,this.startPoint) + let lfind = -1 + for(let i=0;i -1 && this.patientRegister.patientRegisterId != this.patientRegister.prList[lfind].id){ + this.patientRegister.patientRegisterId = this.patientRegister.prList[lfind].id + this.patientRegister.photo = this.patientRegister.prList[lfind].photo || "/pic/Photo.jpg"; + this.patientRegister.patientRegisterRd = this.patientRegister.prList[lfind]; + this.patientRegister.query.customerOrgParentId = this.patientRegister.prList[lfind].customerOrgParentId; + this.patientRegister.customerOrgGroupChange = 0; //控制体检列表记录切换时,0 无需触发更换分组操作 + this.patientRegister.medicalPackageChange = 0; //控制体检列表记录切换时,0 无需触发更换套餐操作 + this.getCustomerOrgGroup(this.patientRegister.prList[lfind].customerOrgParentId); + this.dict.asbItem = [...this.dict.asbItemAll]; + this.getPatientRegisterAbs(this.patientRegister.prList[lfind].id); + } + }, //体检次数 相关操作 @@ -1591,28 +1593,27 @@ export default { padding-right: 1px; } -::v-deep .el-table th.el-table__cell { - text-align: center; - padding-left: 1px; - padding-right: 1px; +/* 表格 表头 列间距控制 */ +::v-deep .el-table th.el-table__cell>.cell{ + text-align: center; /* 表格 表头 对齐方式,默认 left */ + padding-right: 2px; /* 表格 表头 列间距控制,默认 10px */ + padding-left: 2px; /* 表格 表头 列间距控制,默认 10px */ } -/* 表格:单元格 行间距*/ -::v-deep .el-table__cell { - padding-top: 2px; - /* 表格:单元格 行间距,默认 8px */ - padding-bottom: 2px; - /* 表格:单元格 行间距,默认 8px */ +/* 表格 表体 首列左间距控制 */ +::v-deep .el-table--border .el-table__cell:first-child .cell { + padding-left: 2px; /* 表格 表体 首列左间距控制,默认 10px */ } -::v-deep .el-table td.el-table__cell { - padding-left: 1px; - padding-right: 1px; +/* 表格 行列间距控制 ,默认 10 px*/ +::v-deep .el-table__cell { + padding: 2px 2px 2px 2px; /* 上,右,下,左 */ } -::v-deep .el-table .cell { - padding-left: 1px; - padding-right: 1px; +/* 表格单元格 .el-table .cell ,默认 10 px*/ +::v-deep .cell { + padding-left: 2px; + padding-right: 2px; } ::v-deep input[type="number"]::-webkit-inner-spin-button,