diff --git a/src/components/patientRegister/PatientLis.vue b/src/components/patientRegister/PatientLis.vue index 2939531..47fa806 100644 --- a/src/components/patientRegister/PatientLis.vue +++ b/src/components/patientRegister/PatientLis.vue @@ -111,7 +111,10 @@ - + + + + @@ -135,11 +138,13 @@ import { import PatientLisRequest from "./PatientLisRequest.vue"; +import PatientPacsRequest from "./PatientPacsRequest.vue"; import PatientRegisterAsbItem from "../../components/patientRegister/patientRegisterAsbItem.vue"; export default { components: { PatientLisRequest, + PatientPacsRequest, PatientRegisterAsbItem, }, data() { @@ -285,8 +290,9 @@ export default { //点击体检次数行 rowClick(row) { this.dataTransOpts.tableS.patient_register = deepCopy(row) - this.dataTransOpts.refresh.lis_request.M++ //触发条码 + this.dataTransOpts.refresh.lis_request.M++ //触发检验条码刷新 this.dataTransOpts.refresh.register_check_asbitem.M++ //触发所选组合项目刷新 + this.dataTransOpts.refresh.register_check.M++ //触发检查条码刷新 }, //查询 @@ -316,7 +322,7 @@ export default { console.log('getPrList', this.loadOpts) let body = { - isFilterPreRegistration:'Y', + isFilterPreRegistration: 'Y', skipCount: this.loadOpts.skipCount, maxResultCount: this.loadOpts.maxResultCount }; @@ -395,11 +401,14 @@ export default { }) //如果 有选中 记录,则刷新其对应的组合项目 - if(this.tableData.length == 1){ + if (this.tableData.length == 1) { this.dataTransOpts.tableS.patient_register = deepCopy(this.tableData[0]) - this.dataTransOpts.refresh.register_check_asbitem.M++ - this.dataTransOpts.refresh.lis_request.M++ + } else { + this.dataTransOpts.tableS.patient_register = { id: '' } } + this.dataTransOpts.refresh.register_check_asbitem.M++ + this.dataTransOpts.refresh.register_check.M++ + this.dataTransOpts.refresh.lis_request.M++ // if (this.dataTransOpts.tableS.patient_register.id) { // this.dataTransOpts.refresh.register_check_asbitem.M++ // } diff --git a/src/components/patientRegister/PatientLisRequest.vue b/src/components/patientRegister/PatientLisRequest.vue index 74af91d..3a7312b 100644 --- a/src/components/patientRegister/PatientLisRequest.vue +++ b/src/components/patientRegister/PatientLisRequest.vue @@ -64,7 +64,7 @@ import moment from "moment"; import { mapState } from "vuex"; import { arrayExistObj, dddw, getPagePriv, checkPagePriv, deepCopy, } from "../../utlis/proFunc"; import { getapi, postapi, putapi, deletapi } from "../../api/api"; -import LisRequest from "./LisRequest.vue"; + export default { components: {}, diff --git a/src/components/patientRegister/PatientPacsRequest.vue b/src/components/patientRegister/PatientPacsRequest.vue new file mode 100644 index 0000000..a5dcbea --- /dev/null +++ b/src/components/patientRegister/PatientPacsRequest.vue @@ -0,0 +1,251 @@ + + + diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue index 78b860e..9a3499c 100644 --- a/src/components/patientRegister/PatientRegisterList.vue +++ b/src/components/patientRegister/PatientRegisterList.vue @@ -1243,7 +1243,7 @@ export default { { Name: "printer", Value: user }, { Name: "hisLog", Value: "pic/hisLog.jpg" }, ], - BusinessCode: prId + BusinessCode: row.id }; if (isPreview) {