From d4ba9a3a8893bd17e538ccfc1aabf134b60f4238 Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Wed, 3 Apr 2024 16:54:51 +0800 Subject: [PATCH] dj --- src/assets/css/global_button.css | 6 ++ .../doctorCheck/PatientRegisterBase.vue | 89 ++++++------------- .../patientRegister/PatientRegisterEdit.vue | 8 +- .../patientRegister/PatientRegisterItem.vue | 8 +- src/utlis/proFunc.js | 4 +- 5 files changed, 45 insertions(+), 70 deletions(-) diff --git a/src/assets/css/global_button.css b/src/assets/css/global_button.css index 522ac82..2126a4f 100644 --- a/src/assets/css/global_button.css +++ b/src/assets/css/global_button.css @@ -57,6 +57,11 @@ background-color: rgba(20, 96, 243, 0.4); } +.el-button.is-disabled:hover, +.el-button.is-disabled:focus { + background-color: rgba(20, 96, 243, 0.4); +} + .commonbutton:hover, .commonbutton:focus { border-color: #c6e2ff; @@ -75,6 +80,7 @@ .difference { border: 1px solid #396FFA; color: #396FFA !important; + background-color: #fff; font-size: 14px; font-weight: 500; font-family: "NotoSansSC-Medium"; diff --git a/src/components/doctorCheck/PatientRegisterBase.vue b/src/components/doctorCheck/PatientRegisterBase.vue index e42c529..8da4bf4 100644 --- a/src/components/doctorCheck/PatientRegisterBase.vue +++ b/src/components/doctorCheck/PatientRegisterBase.vue @@ -103,14 +103,13 @@ export default { nationId: '', //民族 mobileTelephone: '', //手机 }, - prBaseInit: {}, + prBaseInit:{}, PatientRegisterForChooseParams: {}, // 参数 - }; }, created() { - this.prBaseInit = Object.assign({}, this.prBase) + this.prBaseInit = deepCopy(this.prBase) }, //挂载完成 @@ -129,13 +128,12 @@ export default { ...mapMutations(['doctorCheckPrBaseInit', 'sumPREditInit']), dddw, moment, - //查询找到相关信息处理 - findPR(rd) { - // debugger + //查询后触发相关信息处理 + afterFind(rd) { // console.log('rd,this.doctorCheck.prBase',rd.id,this.doctorCheck.prBase.id) - objCopy(rd, this.prBase) - this.dataTransOpts.tableS.patient_register.id = rd.id - this.doctorCheck.prBase = Object.assign({}, this.doctorCheck.prBase, rd) + this.prBase = deepCopy(this.prBaseInit) + objCopy(rd,this.prBase) + this.doctorCheck.prBase = Object.assign({}, this.doctorCheck.prBase, rd) //待优化 setTimeout(() => { //触发检查医生诊台相关刷新 this.dataTransOpts.refresh.register_check.M++ @@ -143,41 +141,12 @@ export default { //触发总检医生诊台相关刷新 this.dataTransOpts.refresh.sumDoctor.M++ this.dataTransOpts.refresh.sum_diagnosis.M++ - }, 20); - // objCopy(rd,this.doctorCheck.prBase) - - // this.sumPREditInit() - this.sumDoctorCheck.sumPREdit = Object.assign({}, this.sumDoctorCheck.sumPREdit, rd) - // objCopy(rd,this.sumDoctorCheck.sumPREdit) + }, 10); + //显示照片 this.patientRegister.photo = rd.photo }, - //查询未找到相关信息处理 - unfindPR(queryType) { - - this.$message.warning("没有找到相应的数据") - let val = this.prBase[queryType] - - this.doctorCheckPrBaseInit() - this.dataTransOpts.tableS.patient_register.id = '' - setTimeout(() => { - //触发检查医生诊台相关刷新 - this.dataTransOpts.refresh.register_check.M++ - - //触发总检医生诊台相关刷新 - this.dataTransOpts.refresh.sumDoctor.M++ - this.dataTransOpts.refresh.sum_diagnosis.M++ - }, 20); - - this.sumPREditInit() - - setTimeout(() => { - this.prBase[queryType] = val - }, 100); - - this.patientRegister.photo = '' - }, //按条码号查个人数据 onQueryByPatientRegisterNo() { @@ -187,16 +156,17 @@ export default { patientRegisterNo, isFilterPreRegistration: 'Y' //是否需要过滤预登记数据 Y=过滤预登记数据 N=不过滤 默认为N (备注：只有CompleteFlag参数的值不为0的情况才有效，null值也有效) } - console.log(`/api/app/patientregister/getpatientregisterorpatient`, body) + // console.log(`/api/app/patientregister/getpatientregisterorpatient`, body) + this.dataTransOpts.tableS.patient_register = { id: '' } postapi('/api/app/patientregister/getpatientregisterorpatient', body) .then((res) => { if (res.code != -1) { - if (res.data) { - this.findPR(res.data) - } else { - this.unfindPR('patientRegisterNo') - } + + this.dataTransOpts.tableS.patient_register = deepCopy(res.data) } + }) + .finally(() => { + this.afterFind(this.dataTransOpts.tableS.patient_register) }); }, @@ -208,16 +178,16 @@ export default { patientNo, isFilterPreRegistration: 'Y' //是否需要过滤预登记数据 Y=过滤预登记数据 N=不过滤 默认为N (备注：只有CompleteFlag参数的值不为0的情况才有效，null值也有效) } - console.log(`/api/app/patientregister/getpatientregisterorpatient`, body) + // console.log(`/api/app/patientregister/getpatientregisterorpatient`, body) + this.dataTransOpts.tableS.patient_register = { id: '' } postapi('/api/app/patientregister/getpatientregisterorpatient', body) .then((res) => { if (res.code != -1) { - if (res.data) { - this.findPR(res.data) - } else { - this.unfindPR('patientRegisterNo') - } + this.dataTransOpts.tableS.patient_register = deepCopy(res.data) } + }) + .finally(() => { + this.afterFind(this.dataTransOpts.tableS.patient_register) }); }, @@ -242,21 +212,18 @@ export default { //根据ID 获取 人员信息 getPatientRegister(patientRegisterId) { if (!patientRegisterId) { - this.prBase = deepCopy(this.prBaseInit) + this.afterFind({ id: '' }) return } postapi(`/api/app/patientregister/getinfoorpatient?PatientRegisterId=${patientRegisterId}`) - .then(res => { + .then((res) => { if (res.code != -1) { - this.prBase = res.data - //触发检查医生诊台相关刷新 - this.dataTransOpts.refresh.register_check.M++ - - //触发总检医生诊台相关刷新 - this.dataTransOpts.refresh.sumDoctor.M++ - this.dataTransOpts.refresh.sum_diagnosis.M++ + this.dataTransOpts.tableS.patient_register = deepCopy(res.data) } }) + .finally(() => { + this.afterFind(this.dataTransOpts.tableS.patient_register) + }); }, diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue index 3e4181d..3049013 100644 --- a/src/components/patientRegister/PatientRegisterEdit.vue +++ b/src/components/patientRegister/PatientRegisterEdit.vue @@ -1297,11 +1297,13 @@ export default { postapi(`/api/PatientRegister/CreatePatientRegister`, body) .then(res => { if (res.code == 1) { + + this.dataTransOpts.tableS.patient_register = deepCopy(res.data) //触发已选组合项目保存 this.prAsbOpraOpts.formId = res.data.id - this.dataTransOpts.tableS.patient_register = deepCopy(res.data) - let temp = Object.assign({}, res.data, { id: '' }) - objCopy(temp, this.form) + setTimeout(() => { + this.dataTransOpts.refresh.register_check_asbitem.D++ + }, 10); // 用于刷新登记的列表 // this.refreshRegister(Object.assign({}, res.data)) diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue index 7bcf4e7..885b064 100644 --- a/src/components/patientRegister/PatientRegisterItem.vue +++ b/src/components/patientRegister/PatientRegisterItem.vue @@ -225,7 +225,7 @@ export default { }) }, mounted() { - + this.getPrAsb(this.dataTransOpts.tableS.patient_register.id) }, methods: { @@ -1094,12 +1094,12 @@ export default { // } // }, - "dataTransOpts.refresh.register_check_asbitem.M":{ - immediate: true, // 立即执行 + "dataTransOpts.refresh.register_check_asbitem.D":{ + // immediate: true, // 立即执行 // deep: true, // 深度监听复杂类型内变化 handler(newVal,oldVal){ console.log('watch: 刷新 人员登记/编辑 时的组合项目: ',this.dataTransOpts.tableS.patient_register.id) - this.getPrAsb(this.dataTransOpts.tableS.patient_register.id) + if(newVal != oldVal) this.getPrAsb(this.dataTransOpts.tableS.patient_register.id) } }, diff --git a/src/utlis/proFunc.js b/src/utlis/proFunc.js index ea290f8..82e6f76 100644 --- a/src/utlis/proFunc.js +++ b/src/utlis/proFunc.js @@ -360,8 +360,8 @@ const sumBtnDisabled = (btnFlagName, patientRegister) => { if (!patientRegister.isLock) return true switch (btnFlagName) { - case 'save': - if (patientRegister.completeFlag == '3' || patientRegister.isAudit == 'Y') ret = true + case 'save': + if (patientRegister.completeFlag == '3') ret = true break; case 'edit': case 'del':