pengjun 2 years ago
parent
commit
677f3fabf3
  1. 80
      src/components/doctorCheck/ButtonList.vue
  2. 2
      src/components/doctorCheck/PatientRegisterList.vue
  3. 4
      src/components/patientRegister/PatientRegisterRefuseList.vue
  4. 2
      src/components/sumDoctorCheck/ButtonList.vue
  5. 9
      src/views/doctorCheck/doctorCheck.vue

80
src/components/doctorCheck/ButtonList.vue

@ -40,6 +40,10 @@
<el-button type="primary" class="commonbutton" @click="refuseItem" style="font-size:11px;" <el-button type="primary" class="commonbutton" @click="refuseItem" style="font-size:11px;"
:disabled="doctorBtnDisabled('refuseItem')">放弃明细项目检查</el-button> :disabled="doctorBtnDisabled('refuseItem')">放弃明细项目检查</el-button>
</div> </div>
<div v-show="checkPagePriv(pagePriv.privs, '放弃项目检查')" class="divBtnClass">
<el-button type="primary" class="commonbutton" @click="refuse"
:disabled="doctorBtnDisabled('refuse')">放弃项目检查</el-button>
</div>
<div v-show="checkPagePriv(pagePriv.privs, '删除明细项目')" class="divBtnClass"> <div v-show="checkPagePriv(pagePriv.privs, '删除明细项目')" class="divBtnClass">
<el-button type="primary" class="deleteButton" @click="delItem" <el-button type="primary" class="deleteButton" @click="delItem"
:disabled="doctorBtnDisabled('delItem')">删除明细项目</el-button> :disabled="doctorBtnDisabled('delItem')">删除明细项目</el-button>
@ -295,7 +299,7 @@ export default {
// //
btnDelPr() { btnDelPr() {
if (!this.dataTransOpts.tableS.patient_register.id) { if (!this.dataTransOpts.tableS.patient_register.id) {
this.$message.warning({ showClose: true, message: "未选中要删除的人员记录"})
this.$message.warning({ showClose: true, message: "未选中要删除的人员记录" })
return return
} }
let id = this.dataTransOpts.tableS.patient_register.id let id = this.dataTransOpts.tableS.patient_register.id
@ -329,7 +333,7 @@ export default {
// //
btnEditPr() { btnEditPr() {
if (!this.dataTransOpts.tableS.patient_register.id) { if (!this.dataTransOpts.tableS.patient_register.id) {
this.$message.warning({ showClose: true, message: "未选中要编辑的人员记录"})
this.$message.warning({ showClose: true, message: "未选中要编辑的人员记录" })
return return
} }
@ -352,11 +356,11 @@ export default {
// () step 1 -1 // () step 1 -1
btnStep(step) { btnStep(step) {
if (!this.medicalStartDate) { if (!this.medicalStartDate) {
this.$message.warning({ showClose: true, message: "请先设置体检日期"})
this.$message.warning({ showClose: true, message: "请先设置体检日期" })
return return
} }
if (this.medicalStartDateDatas.length == 0) { if (this.medicalStartDateDatas.length == 0) {
this.$message.warning({ showClose: true, message: "当前设置的体检日期,无体检人员信息"})
this.$message.warning({ showClose: true, message: "当前设置的体检日期,无体检人员信息" })
return return
} }
@ -369,10 +373,10 @@ export default {
lfind = arrayExistObj(this.medicalStartDateDatas, 'id', patientRegisterId) lfind = arrayExistObj(this.medicalStartDateDatas, 'id', patientRegisterId)
if (lfind > - 1) { if (lfind > - 1) {
if (lstep < 0 && lfind == 0) { if (lstep < 0 && lfind == 0) {
this.$message.warning({ showClose: true, message: "已是第一个人"})
this.$message.warning({ showClose: true, message: "已是第一个人" })
return return
} else if (lstep > 0 && lfind == this.medicalStartDateDatas.length - 1) { } else if (lstep > 0 && lfind == this.medicalStartDateDatas.length - 1) {
this.$message.warning({ showClose: true, message: "已是最后一人"})
this.$message.warning({ showClose: true, message: "已是最后一人" })
return return
} }
lfind = Number(lfind) + Number(lstep) lfind = Number(lfind) + Number(lstep)
@ -405,7 +409,7 @@ export default {
btnEdit() { btnEdit() {
let ret = this.optGrant('edit') let ret = this.optGrant('edit')
if (ret) { if (ret) {
this.$message.warning({ showClose: true, message: ret})
this.$message.warning({ showClose: true, message: ret })
return return
} }
this.doctorCheck.RegisterCheckEdit.completeFlag = '0' this.doctorCheck.RegisterCheckEdit.completeFlag = '0'
@ -415,7 +419,7 @@ export default {
btnDel() { btnDel() {
let ret = this.optGrant('del') let ret = this.optGrant('del')
if (ret) { if (ret) {
this.$message.warning({ showClose: true, message: ret})
this.$message.warning({ showClose: true, message: ret })
return return
} }
@ -438,22 +442,22 @@ export default {
refuseItem() { refuseItem() {
let ret = this.optGrant('refuseItem') let ret = this.optGrant('refuseItem')
if (ret) { if (ret) {
this.$message.warning({ showClose: true, message: ret})
this.$message.warning({ showClose: true, message: ret })
return return
} }
// console.log('this.doctorCheck.checkItem',this.doctorCheck.checkItem) // console.log('this.doctorCheck.checkItem',this.doctorCheck.checkItem)
if (!this.doctorCheck.checkItem) { if (!this.doctorCheck.checkItem) {
this.$message.warning({ showClose: true, message: "请选择要操作的明细项目"})
this.$message.warning({ showClose: true, message: "请选择要操作的明细项目" })
return return
} }
if (!this.doctorCheck.checkItem.itemId) { if (!this.doctorCheck.checkItem.itemId) {
this.$message.warning({ showClose: true, message: "请选择要操作的明细项目"})
this.$message.warning({ showClose: true, message: "请选择要操作的明细项目" })
return return
} }
let lfind = arrayExistObj(this.doctorCheck.checkItemList, 'itemId', this.doctorCheck.checkItem.itemId) let lfind = arrayExistObj(this.doctorCheck.checkItemList, 'itemId', this.doctorCheck.checkItem.itemId)
if (lfind == -1) { if (lfind == -1) {
this.$message.warning({ showClose: true, message: "请选择要操作的明细项目"})
this.$message.warning({ showClose: true, message: "请选择要操作的明细项目" })
return return
} }
@ -461,26 +465,52 @@ export default {
}, },
//
refuse() {
if (!this.doctorCheck.RegisterCheckEdit.id) {
this.$message.warning({ showClose: true, message: '请选择要操作的项目' })
return
}
// [
// {
// "registerCheckId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
// "completeFlag": "0"
// }
// ]
postapi(`/api/app/registercheck/updatecompletemany`, [{registerCheckId:this.doctorCheck.RegisterCheckEdit.id,completeFlag:'2'}])
.then((res) => {
if (res.code > -1) {
this.doctorCheck.RegisterCheckEdit.completeFlag = '2'
let lfind = arrayExistObj(this.doctorCheck.RegisterCheckList,'id',this.doctorCheck.RegisterCheckEdit.id)
if(lfind > -1) this.doctorCheck.RegisterCheckList[lfind].completeFlag = '2'
}
})
;
},
// //
delItem() { delItem() {
let ret = this.optGrant('delItem') let ret = this.optGrant('delItem')
if (ret) { if (ret) {
this.$message.warning({ showClose: true, message: ret})
this.$message.warning({ showClose: true, message: ret })
return return
} }
if (!this.doctorCheck.checkItem) { if (!this.doctorCheck.checkItem) {
this.$message.warning({ showClose: true, message: "请选择要删除的明细项目"})
this.$message.warning({ showClose: true, message: "请选择要删除的明细项目" })
return return
} }
if (!this.doctorCheck.checkItem.itemId) { if (!this.doctorCheck.checkItem.itemId) {
this.$message.warning({ showClose: true, message: "请选择要删除的明细项目"})
this.$message.warning({ showClose: true, message: "请选择要删除的明细项目" })
return return
} }
let lfind = arrayExistObj(this.doctorCheck.checkItemList, 'itemId', this.doctorCheck.checkItem.itemId) let lfind = arrayExistObj(this.doctorCheck.checkItemList, 'itemId', this.doctorCheck.checkItem.itemId)
if (lfind == -1) { if (lfind == -1) {
this.$message.warning({ showClose: true, message: "请选择要删除的明细项目"})
this.$message.warning({ showClose: true, message: "请选择要删除的明细项目" })
return return
} }
@ -497,7 +527,7 @@ export default {
} }
}).catch((err) => { }).catch((err) => {
if (err == "cancel") { if (err == "cancel") {
this.$message.info({ showClose: true, message: "已取消"});
this.$message.info({ showClose: true, message: "已取消" });
} else { } else {
this.$message.error({ showClose: true, message: `项目明细删除失败,原因:${err}` }); this.$message.error({ showClose: true, message: `项目明细删除失败,原因:${err}` });
} }
@ -515,7 +545,7 @@ export default {
btnReport() { btnReport() {
if (!this.$peisAPI) { if (!this.$peisAPI) {
this.$message.info({ showClose: true, message: "此功能,需要在壳客户端才可运行!"})
this.$message.info({ showClose: true, message: "此功能,需要在壳客户端才可运行!" })
return return
} }
///3a0c990e-5756-2dc0-19d5-69a617fe4048 ///3a0c990e-5756-2dc0-19d5-69a617fe4048
@ -523,8 +553,8 @@ export default {
let token = window.sessionStorage.getItem('token'); let token = window.sessionStorage.getItem('token');
let user = window.sessionStorage.getItem('user'); let user = window.sessionStorage.getItem('user');
let toOutShell = { let toOutShell = {
isBuildImage:'N',
IsUploadPdf:'N',
isBuildImage: 'N',
IsUploadPdf: 'N',
ReportCode, token, ReportCode, token,
preViewCanPrint: this.doctorCheck.prBase.isAudit, //this.dataTransOpts.tableS.patient_register.isAudit preViewCanPrint: this.doctorCheck.prBase.isAudit, //this.dataTransOpts.tableS.patient_register.isAudit
Parameters: [ Parameters: [
@ -554,7 +584,7 @@ export default {
} }
}) })
.catch(err => { .catch(err => {
this.$message.warning({ showClose: true, message: err});
this.$message.warning({ showClose: true, message: err });
}); });
}, },
@ -562,7 +592,7 @@ export default {
// //
toSumDoctorCheck() { toSumDoctorCheck() {
this.dataTransOpts.tableS.patient_register = Object.assign({}, this.doctorCheck.prBase) this.dataTransOpts.tableS.patient_register = Object.assign({}, this.doctorCheck.prBase)
this.$router.push({ path: "/sumDoctorCheck", query: { patient_register: this.dataTransOpts.tableS.patient_register} });
this.$router.push({ path: "/sumDoctorCheck", query: { patient_register: this.dataTransOpts.tableS.patient_register } });
}, },
}, },
@ -611,8 +641,10 @@ export default {
}, },
}; };
</script> </script>
<style scoped>@import '../../assets/css/global_button.css';
<style scoped>
@import '../../assets/css/global_button.css';
.divBtnClass { .divBtnClass {
margin-top: 5px; margin-top: 5px;
}</style>
}
</style>

2
src/components/doctorCheck/PatientRegisterList.vue

@ -317,7 +317,7 @@ export default {
this.local.completeFlag = deepCopy(this.dict.completeFlag) this.local.completeFlag = deepCopy(this.dict.completeFlag)
this.local.completeFlag.splice(0, 1) // this.local.completeFlag.splice(0, 1) //
this.local.completeFlag.splice(2, 0, { id: '4', displayName: '全部已检(未总检)' }) //
this.local.completeFlag.splice(2, 0, { id: '5', displayName: '全部已检(未总检)' }) //
}, },

4
src/components/patientRegister/PatientRegisterRefuseList.vue

@ -300,9 +300,7 @@ export default {
this.registerCheckList(this.quick.id); this.registerCheckList(this.quick.id);
} }
}) })
.catch(() => {
this.$message.info({ showClose: true, message: "已取消删除" });
});
;
}, },
// //

2
src/components/sumDoctorCheck/ButtonList.vue

@ -154,6 +154,8 @@ export default {
if (patientRegister.completeFlag && patientRegister.completeFlag == '3' && patientRegister.isAudit && patientRegister.isAudit == 'Y') ret = false if (patientRegister.completeFlag && patientRegister.completeFlag == '3' && patientRegister.isAudit && patientRegister.isAudit == 'Y') ret = false
break; break;
case 'report': case 'report':
ret = false
break;
case 'intervene': case 'intervene':
if (patientRegister.completeFlag && patientRegister.completeFlag == '3') ret = false if (patientRegister.completeFlag && patientRegister.completeFlag == '3') ret = false
break; break;

9
src/views/doctorCheck/doctorCheck.vue

@ -267,14 +267,16 @@ export default {
let ret = '' let ret = ''
if (!this.doctorCheck.RegisterCheckEdit.id) return '请选择组合项目' if (!this.doctorCheck.RegisterCheckEdit.id) return '请选择组合项目'
if (this.doctorCheck.RegisterCheckEdit.isLock == 'Y') return '组合项目已锁定,不可执行此操作' if (this.doctorCheck.RegisterCheckEdit.isLock == 'Y') return '组合项目已锁定,不可执行此操作'
if (this.doctorCheck.RegisterCheckEdit.completeFlag == '2') return '组合项目已弃检,不可执行此操作'
// if (this.doctorCheck.RegisterCheckEdit.completeFlag == '2') return ''
if (optType == 'save') { if (optType == 'save') {
// if (!this.doctorCheck.RegisterCheckEdit.checkDoctorId) return "" // if (!this.doctorCheck.RegisterCheckEdit.checkDoctorId) return ""
if (this.doctorCheck.RegisterCheckEdit.completeFlag == '2') return "该项目项目已弃检,不可再执行此操作"
if (this.doctorCheck.RegisterCheckEdit.completeFlag == '1') return "该项目项目已保存,不可再执行此操作,如需操作请点【修改结果】" if (this.doctorCheck.RegisterCheckEdit.completeFlag == '1') return "该项目项目已保存,不可再执行此操作,如需操作请点【修改结果】"
if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return '组合项目已审核,请先取消审核,方可执行此操作!' if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return '组合项目已审核,请先取消审核,方可执行此操作!'
} }
if (optType == 'edit') { if (optType == 'edit') {
if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存,无需执行此操作" if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存,无需执行此操作"
if (this.doctorCheck.RegisterCheckEdit.completeFlag == '2') return "该项目项目已弃检,不可再执行此操作"
if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return '组合项目已审核,请先取消审核,方可执行此操作!' if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return '组合项目已审核,请先取消审核,方可执行此操作!'
} }
if (optType == 'del') { if (optType == 'del') {
@ -320,9 +322,10 @@ export default {
switch (btnFlagName) { switch (btnFlagName) {
case 'btnEdit': // case 'btnEdit': //
case 'btnDel': // case 'btnDel': //
if (RegisterCheckEdit.completeFlag && RegisterCheckEdit.completeFlag == '1') ret = false
if (RegisterCheckEdit.completeFlag && (RegisterCheckEdit.completeFlag == '1' || RegisterCheckEdit.completeFlag == '2')) ret = false
break; break;
case 'refuseItem': //
case 'refuse': //
case 'refuseItem': //
case 'delItem': // case 'delItem': //
case 'delItem': // case 'delItem': //
case 'btnMakeDiagnosis': // case 'btnMakeDiagnosis': //

Loading…
Cancel
Save