diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue index c8ee519..b269b3d 100644 --- a/src/components/doctorCheck/PatientRegisterList.vue +++ b/src/components/doctorCheck/PatientRegisterList.vue @@ -273,6 +273,14 @@ export default { }] this.patientRegister.query.cusOrgOCX = `(体检${today}~${today})` + + //分组，所有分组，不限单位，不限次数 + getapi("/api/app/customerorggroup/getlistinfilter").then((res) => { + if (res.code > -1) { + this.dict.customerOrgGroupAll = res.data; + } + }); + // 获取组合项目 postapi('/api/app/asbitem/GetBasicList', { isFilterActive: 'Y' }).then(res => { if (res.code != -1) { diff --git a/src/components/patientRegister/PatientLis.vue b/src/components/patientRegister/PatientLis.vue index b13f51b..6cd5a06 100644 --- a/src/components/patientRegister/PatientLis.vue +++ b/src/components/patientRegister/PatientLis.vue @@ -105,12 +105,15 @@ - + - + + + + @@ -132,10 +135,12 @@ import { import PatientLisRequest from "./PatientLisRequest.vue"; +import PatientRegisterAsbItem from "../../components/patientRegister/patientRegisterAsbItem.vue"; export default { components: { PatientLisRequest, + PatientRegisterAsbItem, }, data() { return { @@ -281,6 +286,7 @@ export default { rowClick(row) { this.dataTransOpts.tableS.patient_register = deepCopy(row) this.dataTransOpts.refresh.lis_request.M++ //触发条码 + this.dataTransOpts.refresh.register_check_asbitem.M++ //触发所选组合项目刷新 }, //查询 @@ -310,6 +316,7 @@ export default { console.log('getPrList', this.loadOpts) let body = { + isFilterPreRegistration:'Y', skipCount: this.loadOpts.skipCount, maxResultCount: this.loadOpts.maxResultCount }; diff --git a/src/components/patientRegister/PatientLisRequest.vue b/src/components/patientRegister/PatientLisRequest.vue index 22600a5..a0d128f 100644 --- a/src/components/patientRegister/PatientLisRequest.vue +++ b/src/components/patientRegister/PatientLisRequest.vue @@ -144,7 +144,7 @@ export default { } if (isPreview) { - lisPrint(this.chooseRows[0].lisRequestId,"0003",isPreview) + this.lisPrint(this.chooseRows[0].lisRequestId,"0003",isPreview) return } @@ -152,7 +152,7 @@ export default { for (let i = 0; i < this.chooseRows.length; i++) { let e = this.chooseRows[i]; try { - let err = await lisPrint(e.lisRequestId,"0003",isPreview) + let err = await this.lisPrint(e.lisRequestId,"0003",isPreview) if(!err){ let lfind = arrayExistObj(this.dataTransOpts.tableM.lis_request,"lisRequestId",e.lisRequestId) if(lfind > -1) this.dataTransOpts.tableM.lis_request[lfind].isPrint = "Y" diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue index cc9da20..aa88b52 100644 --- a/src/components/patientRegister/PatientRegisterList.vue +++ b/src/components/patientRegister/PatientRegisterList.vue @@ -107,9 +107,9 @@ - + - + diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue index cf77c19..e95fa70 100644 --- a/src/components/patientRegister/patientRegisterQuery.vue +++ b/src/components/patientRegister/patientRegisterQuery.vue @@ -111,6 +111,7 @@ export default { //挂载完成 mounted() { this.init(this.patientRegister.query.customerOrgId) + this.enterToQuery() }, computed: { @@ -195,6 +196,36 @@ export default { }) }, + //回车替代查询 + enterToQuery() { + // console.log('enterToTab'); + this.$nextTick(() => { + let inputs = document.querySelectorAll(["input"]); //用数组可以读取多个标签的元素 //.inline-input + + // 为每个输入框添加键盘事件监听器 + inputs.forEach((input,i) => { + // console.log('input',input); + input.addEventListener('keydown', (event) => { + if (event.keyCode === 13){ + // 阻止回车键的默认行为（换行） + event.preventDefault(); + + // 如果按下的是回车查询 + console.log(input.getAttribute('placeholder'),input.value) + let placeholder = input.getAttribute('placeholder') + switch (placeholder) { + case '条码号': + case '档案号': + case '姓名': + case '预约手机号': + if(input.value) this.patientRegister.query.times++; + break; + } + } + }); + }); + }); + }, }, watch: { diff --git a/src/components/report/PatientRegisterListNobtn.vue b/src/components/report/PatientRegisterListNobtn.vue index 259a052..2bff490 100644 --- a/src/components/report/PatientRegisterListNobtn.vue +++ b/src/components/report/PatientRegisterListNobtn.vue @@ -171,15 +171,13 @@ export default { rClickRow: null, //右击的行 rClickColumn: null, //右击的列（预留） - - - + dom: null, //用于滚动加载数据 lazyLoading: false, //是否懒加载中 loadOpts: { totalCount: 0, skipCount: 0, - maxResultCount: 1000, + maxResultCount: 100, }, loadOptsInit: {}, }; diff --git a/src/views/customerOrg/patientLis.vue b/src/views/customerOrg/patientLis.vue index 7f87df2..7927a8f 100644 --- a/src/views/customerOrg/patientLis.vue +++ b/src/views/customerOrg/patientLis.vue @@ -42,7 +42,14 @@ export default { }, //组件创建完成，一般页面初始布局放在这里 - created() { }, + created() { + // console.log("this.$route.query", this.$route.query) + if (this.$route.query.patient_register) { + this.dataTransOpts.tableS.patient_register = this.$route.query.patient_register + } else { + this.dataTransOpts.tableS.patient_register = { id: '', patientRegisterNo: '' } + } + }, //页面挂载完成，一般页面渲染数据放在这里 mounted() { @@ -50,7 +57,7 @@ export default { }, computed: { - ...mapState(["window", "dict", "patientRegister", "customerOrg"]), + ...mapState(["window","dataTransOpts", "dict", "patientRegister", "customerOrg"]), }, methods: { diff --git a/src/views/customerOrg/patientRegister.vue b/src/views/customerOrg/patientRegister.vue index 6f0e3d6..e08a75e 100644 --- a/src/views/customerOrg/patientRegister.vue +++ b/src/views/customerOrg/patientRegister.vue @@ -47,7 +47,14 @@ export default { }, //组件创建完成，一般页面初始布局放在这里 - created() {}, + created() { + // console.log("this.$route.query", this.$route.query) + if (this.$route.query.patient_register) { + this.dataTransOpts.tableS.patient_register = this.$route.query.patient_register + } else { + this.dataTransOpts.tableS.patient_register = { id: '', patientRegisterNo: '' } + } + }, //页面挂载完成，一般页面渲染数据放在这里 mounted() { @@ -55,7 +62,7 @@ export default { }, computed: { - ...mapState(["window", "dict", "patientRegister", "customerOrg"]), + ...mapState(["window","dataTransOpts", "dict", "patientRegister", "customerOrg"]), }, methods: { diff --git a/src/views/customerOrg/patientRegisterRecover.vue b/src/views/customerOrg/patientRegisterRecover.vue index 4d57ef1..6d3b3b3 100644 --- a/src/views/customerOrg/patientRegisterRecover.vue +++ b/src/views/customerOrg/patientRegisterRecover.vue @@ -56,7 +56,12 @@ export default { }, created() { - + // console.log("this.$route.query", this.$route.query) + if (this.$route.query.patient_register) { + this.dataTransOpts.tableS.patient_register = this.$route.query.patient_register + } else { + this.dataTransOpts.tableS.patient_register = { id: '', patientRegisterNo: '' } + } }, //挂载完成 @@ -65,7 +70,7 @@ export default { }, computed: { - ...mapState(["window", "dict", "patientRegister", "customerOrg"]), + ...mapState(["window", "dataTransOpts","dict", "patientRegister", "customerOrg"]), }, methods: { diff --git a/src/views/customerOrg/patientRegisterRefuse.vue b/src/views/customerOrg/patientRegisterRefuse.vue index 2abb347..7fcd785 100644 --- a/src/views/customerOrg/patientRegisterRefuse.vue +++ b/src/views/customerOrg/patientRegisterRefuse.vue @@ -39,7 +39,14 @@ export default { }; }, - created() {}, + created() { + // console.log("this.$route.query", this.$route.query) + if (this.$route.query.patient_register) { + this.dataTransOpts.tableS.patient_register = this.$route.query.patient_register + } else { + this.dataTransOpts.tableS.patient_register = { id: '', patientRegisterNo: '' } + } + }, //挂载完成 mounted() { @@ -47,7 +54,7 @@ export default { }, computed: { - ...mapState(["dict", "patientRegister", "customerOrg"]), + ...mapState(["window","dataTransOpts","dict", "patientRegister", "customerOrg"]), }, methods: { diff --git a/src/views/customerOrg/patientRegisterSign.vue b/src/views/customerOrg/patientRegisterSign.vue index 96d5dcc..c354f09 100644 --- a/src/views/customerOrg/patientRegisterSign.vue +++ b/src/views/customerOrg/patientRegisterSign.vue @@ -53,7 +53,12 @@ export default { }, created() { - this.resize(); + // console.log("this.$route.query", this.$route.query) + if (this.$route.query.patient_register) { + this.dataTransOpts.tableS.patient_register = this.$route.query.patient_register + } else { + this.dataTransOpts.tableS.patient_register = { id: '', patientRegisterNo: '' } + } }, //挂载完成 @@ -62,7 +67,7 @@ export default { }, computed: { - ...mapState(["window", "dict", "patientRegister", "customerOrg"]), + ...mapState(["window","dataTransOpts", "dict", "patientRegister", "customerOrg"]), }, methods: {