diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue index 52ac8e4..1f46f51 100644 --- a/src/components/doctorCheck/ButtonList.vue +++ b/src/components/doctorCheck/ButtonList.vue @@ -4,44 +4,44 @@ 人员列表
- 保存结果 + 保存结果
- 修改结果 + 修改结果
- 删除结果 + 删除结果
删除项目
- 历次结果 + 历次结果
- 体检报告 + 体检报告
- 生成小结 + 生成小结
- 总检 + 总检
- 审核 + 审核
- 取消审核 + 取消审核
- 排队 + 排队
- 新增小结 + 新增小结
- - + + @@ -53,12 +53,12 @@ import { arrayExistObj } from "../../utlis/proFunc"; import PatientRegisterList from "./PatientRegisterList.vue"; export default { - components: { - PatientRegisterList, + components: { + PatientRegisterList, }, data() { return { - + }; }, @@ -66,7 +66,7 @@ export default { //挂载完成 mounted() { - + }, computed: { @@ -76,54 +76,54 @@ export default { methods: { ...mapActions(["getCustomerOrgGroup"]), - prList(){ - console.log('this.doctorCheck.doctorCheckDialogVisible',this.doctorCheck.doctorCheckDialogVisible) - this.doctorCheck.doctorCheckDialogVisible = true - console.log('this.doctorCheck.doctorCheckDialogVisible2',this.doctorCheck.doctorCheckDialogVisible) + prList() { + console.log('this.doctorCheck.doctorCheckDialogVisible', this.doctorCheck.doctorCheckDialogVisible) + this.doctorCheck.doctorCheckDialogVisible = true + console.log('this.doctorCheck.doctorCheckDialogVisible2', this.doctorCheck.doctorCheckDialogVisible) }, //操作判断 - optGrant(optType){ - let ret = '' + optGrant(optType) { + let ret = '' if (!this.doctorCheck.RegisterCheckEdit.id) return '请选择组合项目' if (this.doctorCheck.RegisterCheckEdit.isLock == 'Y') return '组合项目已锁定，不可执行此操作' if (this.doctorCheck.RegisterCheckEdit.completeFlag == '2') return '组合项目已弃检，不可执行此操作' - if(optType == 'save'){ + if (optType == 'save') { if (!this.doctorCheck.RegisterCheckEdit.checkDoctorId) return "请选择检查医生" if (this.doctorCheck.RegisterCheckEdit.completeFlag == '1') 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.isAudit == 'Y') return '组合项目已审核，请先取消审核，方可执行此操作！' } - if(optType == 'del'){ + if (optType == 'del') { if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存，无需执行此操作" if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return '组合项目已审核，请先取消审核，方可执行此操作！' } - if(optType == 'audit'){ + if (optType == 'audit') { if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存，无需执行此操作" if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return "该检查项目已审核，无需再执行此操作" } - if(optType == 'unAudit'){ + if (optType == 'unAudit') { if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存，无需执行此操作" if (this.doctorCheck.RegisterCheckEdit.isAudit == 'N') return "该检查项目尚未审核，无需执行此操作" } - if(optType == 'delItem'){ + if (optType == 'delItem') { if (this.doctorCheck.RegisterCheckEdit.completeFlag == '1') return "该项目项目已保存，不可再执行此操作，如需操作请点【修改结果】" if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return "该检查项目已审核，请先取消审核" } - + return ret }, //保存数据 save() { let ret = this.optGrant('save') - if(ret){ + if (ret) { alert(ret) return - } + } //更新明细 this.updateCheckItemList(); @@ -139,51 +139,49 @@ export default { }, //修改结果 - edit(){ + edit() { let ret = this.optGrant('edit') - if(ret){ + if (ret) { alert(ret) return - } + } this.doctorCheck.RegisterCheckEdit.completeFlag = '0' }, //删除结果 - del(){ + del() { let ret = this.optGrant('del') - if(ret){ + if (ret) { alert(ret) return - } - console.log(`/api/app/registercheck/updatecomplete?RegisterCheckId=${this.doctorCheck.RegisterCheckEdit.id}&CompleteFlag=0`) - postapi(`/api/app/registercheck/updatecomplete?RegisterCheckId=${this.doctorCheck.RegisterCheckEdit.id}&CompleteFlag=0`) + } + + postapi('/api/app/registercheck/updatecompletemany', [{ registerCheckId: this.doctorCheck.RegisterCheckEdit.id, completeFlag: '0' }]) .then((res) => { console.log("del", res.data); if (res.code != -1) { this.doctorCheck.RegisterCheckEdit.completeFlag = '0'; + this.$message.success("操作成功！"); } - }) - .catch((err) => { - this.$message({ type: "error", message: `组合项目删除失败，原因：${err}` }); }); }, //删除明细项目 - delItem(){ + delItem() { let ret = this.optGrant('delItem') - if(ret){ + if (ret) { alert(ret) return } - let lfind = arrayExistObj(this.doctorCheck.CheckItemList,'itemId',this.doctorCheck.checkItem.itemId) - if(lfind == -1) return - + let lfind = arrayExistObj(this.doctorCheck.CheckItemList, 'itemId', this.doctorCheck.checkItem.itemId) + if (lfind == -1) return + console.log(`/api/app/registercheckitem/deleteregistercheckitem?RegisterCheckId=${this.doctorCheck.checkItem.registerCheckId}&ItemId=${this.doctorCheck.checkItem.itemId}`) postapi(`/api/app/registercheckitem/deleteregistercheckitem?RegisterCheckId=${this.doctorCheck.checkItem.registerCheckId}&ItemId=${this.doctorCheck.checkItem.itemId}`) .then((res) => { console.log("delItem", res.data); if (res.code != -1) { - this.doctorCheck.CheckItemList.splice(lfind,1); + this.doctorCheck.CheckItemList.splice(lfind, 1); this.doctorCheck.checkItem.itemId = '' } }) @@ -193,20 +191,20 @@ export default { }, //审核 - audit(){ + audit() { let ret = this.optGrant('audit') - if(ret){ + if (ret) { alert(ret) return } - let body ={ + let body = { registerCheckId: this.doctorCheck.RegisterCheckEdit.id, //auditorUserId: "3fa85f64-5717-4562-b3fc-2c963f66afa6", //auditTime: "string" 不传时，取当前时间 } - console.log(`/api/app/registercheck/updateauditordoctor`,body) - postapi(`/api/app/registercheck/updateauditordoctor`,body) + console.log(`/api/app/registercheck/updateauditordoctor`, body) + postapi(`/api/app/registercheck/updateauditordoctor`, body) .then((res) => { console.log("audit", res.data); if (res.code != -1) { @@ -220,13 +218,13 @@ export default { }, //取消审核 - unAudit(){ + unAudit() { let ret = this.optGrant('unAudit') - if(ret){ + if (ret) { alert(ret) return - } - + } + console.log(`/api/app/registercheck/updateisaudit?RegisterCheckId=${this.doctorCheck.RegisterCheckEdit.id}&IsAudit=N`) postapi(`/api/app/registercheck/updateisaudit?RegisterCheckId=${this.doctorCheck.RegisterCheckEdit.id}&IsAudit=N`) .then((res) => { @@ -242,7 +240,7 @@ export default { }, //总检 - toSumDoctorCheck(){ + toSumDoctorCheck() { this.$router.push({ path: "/sumDoctorCheck" }); }, @@ -341,7 +339,7 @@ export default { }, - addSummary(){ + addSummary() { if (!this.doctorCheck.RegisterCheckEdit.id) { alert("请选择检查项目") return @@ -353,7 +351,7 @@ export default { }) this.doctorCheck.checkSuggestionList.push({ registerCheckId: this.doctorCheck.RegisterCheckEdit.id, - suggestion: '', + suggestion: '', }) }, }, @@ -380,7 +378,8 @@ export default { margin-top: 5px; text-align: center; } -.btnClass{ - width:110px; + +.btnClass { + width: 110px; } \ No newline at end of file diff --git a/src/components/patientRegister/PatientRegisterRecoverList.vue b/src/components/patientRegister/PatientRegisterRecoverList.vue index e7d3147..a1c719e 100644 --- a/src/components/patientRegister/PatientRegisterRecoverList.vue +++ b/src/components/patientRegister/PatientRegisterRecoverList.vue @@ -266,7 +266,9 @@ export default { console.log('/api/app/patientregister/getlistinfilter', body) postapi('/api/app/patientregister/getlistinfilter', body) .then((res) => { - this.dataList = res.data; + if(res.code != - 1){ + this.dataList = res.data.items; + } }); }, }, diff --git a/src/components/patientRegister/PatientRegisterRefuseList.vue b/src/components/patientRegister/PatientRegisterRefuseList.vue index b91591c..bb7d8cc 100644 --- a/src/components/patientRegister/PatientRegisterRefuseList.vue +++ b/src/components/patientRegister/PatientRegisterRefuseList.vue @@ -390,7 +390,9 @@ export default { console.log('/api/app/patientregister/getlistinfilter', body) postapi('/api/app/patientregister/getlistinfilter', body) .then((res) => { - this.dataList = res.data; + if(res.code != - 1){ + this.dataList = res.data.items; + } }); }, }, diff --git a/src/components/patientRegister/PatientRegisterSignList.vue b/src/components/patientRegister/PatientRegisterSignList.vue index 116479c..f03fc3f 100644 --- a/src/components/patientRegister/PatientRegisterSignList.vue +++ b/src/components/patientRegister/PatientRegisterSignList.vue @@ -271,7 +271,9 @@ export default { console.log('/api/app/patientregister/getlistinfilter', body) postapi('/api/app/patientregister/getlistinfilter', body) .then((res) => { - this.dataList = res.data; + if(res.code != - 1){ + this.dataList = res.data.items; + } }); }, }, diff --git a/src/components/sumDoctorCheck/SumAsbItemStatus.vue b/src/components/sumDoctorCheck/SumAsbItemStatus.vue index 7180d77..79c9e7a 100644 --- a/src/components/sumDoctorCheck/SumAsbItemStatus.vue +++ b/src/components/sumDoctorCheck/SumAsbItemStatus.vue @@ -3,25 +3,25 @@
未检组合项目：
- {{item}} + {{item}}
弃检组合项目：
- {{item}} + {{item}}
组合项目已检但无值的明细项目：
- {{item}} + {{item}}
组合项目已检但弃检的明细项目：
- {{item}} + {{item}}
@@ -33,29 +33,51 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api"; export default { components: {}, + props:['patientRegisterId'], data() { return { - unCheckAsb:['未检项目1','未检项目2','未检项目3','未检项目4','未检项目5','未检项目6','未检项目7','未检项目8'], - refuseAsb:['弃检1','弃检2'], - noResultItem:['无果1','无果2'], - refuseItem:['弃检明细1','弃检明细2'], + data:{ + unCheckedAsbitem:['未检项目1','未检项目2','未检项目3','未检项目4','未检项目5','未检项目6','未检项目7','未检项目8'], + checkedAsbitem:['弃检1','弃检2'], + checkedNullValueItem:['无果1','无果2'], + checkedGiveUpItem:['弃检明细1','弃检明细2'], + } }; }, created() {}, //挂载完成 - mounted() {}, + mounted() { + if(this.patientRegisterId){ + this.getSumAsbItemStatus(this.patientRegisterId); + } + }, computed: { ...mapState(["dict", "doctorCheck","sumDoctorCheck"]), }, - methods: { + methods: { + getSumAsbItemStatus(PatientRegisterId){ + getapi(`/api/app/patientregister/getpatientregisteritemstatus?PatientRegisterId=${PatientRegisterId}`).then(res =>{ + if(res.code != -1){ + this.data = res.data; + } + }); + } + }, - lmoment(date, forMat) { - return moment(new Date(date)).format(forMat); + //监听事件 + watch: { + //检查项目切换 + "patientRegisterId"(newVal, oldVal) { + console.log("watch patientRegisterId newVal：", newVal, " oldVal：", oldVal); + if (newVal != oldVal && newVal != '') { + this.getSumAsbItemStatus(newVal); + } }, }, + };