diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue index 3d1831e..1f87bf0 100644 --- a/src/components/doctorCheck/CheckItemList.vue +++ b/src/components/doctorCheck/CheckItemList.vue @@ -1,6 +1,6 @@ - +
@@ -71,7 +71,7 @@ import { arrayExistObj, dddw, deepCopy } from '../../utlis/proFunc' export default { components: {}, - props: ["isCheckPicture", "registerCheckId"], + props: ["isCheckPicture", "registerCheckId","doctor_check_check_charge"], data() { return { resultStatus: [], //结果状态提示数据 @@ -109,7 +109,7 @@ export default { start: 0, end: 0 }, symbols: [], //特殊符号 - userId:'', + userId: '', }; }, @@ -397,7 +397,7 @@ export default { }, // 清除结果值 - btnClear(){ + btnClear() { this.moreResult.result = '' }, @@ -435,7 +435,10 @@ export default { .then(res => { if (res.code > -1) { this.doctorCheck.RegisterCheckEdit = res.data - if(this.doctorCheck.RegisterCheckEdit.completeFlag == '0'){ + if (res.data.isCharge != 'Y' && this.doctor_check_check_charge == 'Y') { + this.$message.warning({showClose:true,message:`该体检人员未缴清费用!`}) + } + if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') { this.doctorCheck.RegisterCheckEdit.checkDoctorId = this.userId this.doctorCheck.RegisterCheckEdit.checkDate = new Date() } diff --git a/src/components/doctorCheck/RegisterCheckList.vue b/src/components/doctorCheck/RegisterCheckList.vue index 935a0ce..d90c9c3 100644 --- a/src/components/doctorCheck/RegisterCheckList.vue +++ b/src/components/doctorCheck/RegisterCheckList.vue @@ -156,7 +156,6 @@ export default { this.dataTransOpts.tableS.register_check.id = '' } - this.dataTransOpts.refresh.register_check.S++ //刷新检查医生 this.dataTransOpts.refresh.register_check_item.M++ //刷新检查明细 diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue index 9ec812a..14b7af2 100644 --- a/src/views/doctorCheck/doctorCheck.vue +++ b/src/views/doctorCheck/doctorCheck.vue @@ -33,7 +33,7 @@
-
{ if (res.code == 1) { @@ -350,8 +355,12 @@ export default { case 'btnExpPic': // 导图(图片上传) case 'btnSavePic': // 图片保存 case 'btnDelImage': // 图片删除 - // console.log('btnFlagName RegisterCheckEdit', btnFlagName, RegisterCheckEdit.completeFlag) - if (RegisterCheckEdit.completeFlag && RegisterCheckEdit.completeFlag == '0') ret = false + // console.log('btnFlagName RegisterCheckEdit', btnFlagName, RegisterCheckEdit.completeFlag) + if (this.doctor_check_check_charge == 'Y') { + if (RegisterCheckEdit.completeFlag && RegisterCheckEdit.completeFlag == '0' && RegisterCheckEdit.isCharge == 'Y') ret = false + } else { + if (RegisterCheckEdit.completeFlag && RegisterCheckEdit.completeFlag == '0') ret = false + } break; case 'audit': if (RegisterCheckEdit.completeFlag && RegisterCheckEdit.completeFlag != '0' && RegisterCheckEdit.isAudit && RegisterCheckEdit.isAudit != 'Y') ret = false @@ -570,7 +579,7 @@ export default { if (summarys.length == 0) { - this.$message.warning({showClose:true,message:'请生成小结!'}) + this.$message.warning({ showClose: true, message: '请生成小结!' }) return } @@ -588,7 +597,7 @@ export default { } }) }, - + //更新检查医生 updateDoctorCheck(successTip) {