diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue index 08ecda5..12a8953 100644 --- a/src/components/doctorCheck/CheckItemList.vue +++ b/src/components/doctorCheck/CheckItemList.vue @@ -1126,14 +1126,14 @@ export default { this.moreResult.result = result; this.selection.start = this.selection.start + symbols.length; this.selection.end = this.selection.start; - console.log('插入结果后光标',this.selection) + //console.log('插入结果后光标',this.selection) }, // 获取光标位置的函数 getCaretPosition() { let input = document.getElementById("resultBox"); this.selection.start = input.selectionStart; this.selection.end = input.selectionEnd; - console.log('点击后光标',this.selection) + //console.log('点击后光标',this.selection) }, watchSelection() { this.$nextTick(() => { diff --git a/src/components/doctorCheck/CheckPicture.vue b/src/components/doctorCheck/CheckPicture.vue index db67da8..de745dc 100644 --- a/src/components/doctorCheck/CheckPicture.vue +++ b/src/components/doctorCheck/CheckPicture.vue @@ -41,7 +41,7 @@ z-index: 2; "> - @@ -588,7 +588,7 @@ export default { let dotIndex = fileName.lastIndexOf('\\'); let pointIndex = fileName.lastIndexOf('.'); if (dotIndex > -1) fileName = Date.now() + fileName.substring(dotIndex + 1, pointIndex || fileName.length); - + let body = { registerCheckId: this.dataTransOpts.tableS.register_check.id, pictureBaseStrs: [{ @@ -895,6 +895,11 @@ export default { // 删除图片 btnDelImage(index) { let body = [this.checkPictures[index].id]; + this.delImageBatch(body) + }, + + // 批量删除图片 + delImageBatch(body) { this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", { confirmButtonText: "是", cancelButtonText: "否", @@ -904,8 +909,12 @@ export default { return postapi(`/api/app/registercheckpicture/deleteregistercheckpicturemany`, body); }) .then((res) => { - if (res && res.code > -1) { - this.checkPictures.splice(index, 1); + if (res?.code > -1) { + let lfind = -1 + body.forEach(id => { + lfind = arrayExistObj(this.checkPictures, 'id', id) + if (lfind > -1) this.checkPictures.splice(lfind, 1); + }); } }) .catch((err) => { @@ -934,11 +943,11 @@ export default { postapi('/api/app/RegisterCheckPicture/BatchUpdateRegisterCheckIdByRegisterCheckPictureId', body) .then(res => { if (res.code > -1) { - this.$message.success({showClose:true,message:'操作成功！'}) + this.$message.success({ showClose: true, message: '操作成功！' }) if (imageSeq == -1) { this.checkPictures = deepCopy(this.dataTransOpts.doctorCutPics) - }else{ - this.checkPictures.splice(imageSeq,0,deepCopy(this.dataTransOpts.doctorCutPics)) + } else { + this.checkPictures.splice(imageSeq, 0, deepCopy(this.dataTransOpts.doctorCutPics)) } this.dataTransOpts.doctorCutPics = [] //清除剪切的缓存 } @@ -1023,7 +1032,30 @@ export default { } } - + // 删除图片 + if (picNum > 0) { + items.push({ + label: "----------------" + }) + if (imageSeq >= 0) { + items.push({ + label: "删除当前图片", + onClick: () => { + this.delImageBatch([this.checkPictures[imageSeq].id]) + }, + }) + } + items.push({ + label: "删除所有图片", + onClick: () => { + let body = [] + this.checkPictures.forEach(e => { + body.push(e.id) + }); + this.delImageBatch(body) + }, + }) + } // items.push({ // label: "一级菜单", diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue index c8789d8..7490c92 100644 --- a/src/components/doctorCheck/PatientRegisterList.vue +++ b/src/components/doctorCheck/PatientRegisterList.vue @@ -92,14 +92,16 @@ - + @row-click="rowClick" @row-dblclick="rowDblclick" ref="info" id="info" style="border-radius:10px;" + :row-class-name="tableRowClassName"> + - - + + @@ -107,10 +109,10 @@
{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}
 - - - - + + + + - - + + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - + - +
@@ -231,7 +233,7 @@ export default { isAuditCheck: '', //检查项目审核 medicalTypeIds: [], checkDoctorIds: [], - summaryDoctorIds:[], + summaryDoctorIds: [], }, completeFlag: [] }, @@ -320,7 +322,7 @@ export default { this.dict.sex = res.data; } }); - + //体检类别 getapi("/api/app/medical-type/in-filter").then((res) => { if (res.code == 1) { @@ -449,7 +451,7 @@ export default { if (this.report.dataCusOrgOCX.length > 0) { this.report.dataCusOrgOCX.forEach(e => { let dateType = '1' - switch (e.dateType) { + switch (e.dateType) { case 'medicalStartDate': dateType = '2' break; @@ -495,15 +497,15 @@ export default { if (this.local.query.haveImage) body.isPicture = 'Y' if (this.local.query.checkCompleteFlag) body.asbitemCompleteFlag = this.local.query.checkCompleteFlag if (this.local.query.isAuditCheck) body.asbitemIsAudit = this.local.query.isAuditCheck - if(Array.isArray(this.local.query.medicalTypeIds) && this.local.query.medicalTypeIds.length > 0){ + if (Array.isArray(this.local.query.medicalTypeIds) && this.local.query.medicalTypeIds.length > 0) { body.medicalTypeIds = this.local.query.medicalTypeIds } - if(Array.isArray(this.local.query.checkDoctorIds) && this.local.query.checkDoctorIds.length > 0){ + if (Array.isArray(this.local.query.checkDoctorIds) && this.local.query.checkDoctorIds.length > 0) { body.checkDoctorIds = this.local.query.checkDoctorIds } - if(Array.isArray(this.local.query.summaryDoctorIds) && this.local.query.summaryDoctorIds.length > 0){ + if (Array.isArray(this.local.query.summaryDoctorIds) && this.local.query.summaryDoctorIds.length > 0) { body.summaryDoctorIds = this.local.query.summaryDoctorIds - } + } body.isFilterPreRegistration = 'Y' //是否需要过滤预登记数据 Y=过滤预登记数据 N=不过滤 默认为N (备注：只有CompleteFlag参数的值不为0的情况才有效，null值也有效) // "patientName": "string", @@ -577,6 +579,18 @@ export default { } }, + // 表格行底色样式 + tableRowClassName({ row, rowIndex }) { + if(row.isAudit == 'Y' && row.completeFlag == '3'){ + return 'complete4'; + }else if(row.completeFlag == '3'){ + return 'complete3'; + }else if(row.completeFlag == '2'){ + return 'complete2'; + } + return ''; + } + }, //监听事件 @@ -586,6 +600,26 @@ export default { };