diff --git a/src/components/report/PatientRegisterListNobtn.vue b/src/components/report/PatientRegisterListNobtn.vue index c091bc2..fdd65ac 100644 --- a/src/components/report/PatientRegisterListNobtn.vue +++ b/src/components/report/PatientRegisterListNobtn.vue @@ -2,7 +2,7 @@
@@ -179,7 +179,7 @@ export default { loadOpts: { totalCount: 0, skipCount: 0, - maxResultCount: 100, + maxResultCount: 1000, }, loadOptsInit: {}, }; @@ -208,15 +208,15 @@ export default { }, //获取单位分组 /api/app/customer-org-group/in-customer-org-id/3a0c0444-d7a0-871f-4074-19faf1655caf - getCustomerOrgGroup(customerOrgld) { - getapi(`/api/app/customer-org-group/in-customer-org-id/${customerOrgld}`) - .then((res) => { - console.log("getCustomerOrgGroup", res.data); - if (res.code == 1) { - this.patientRegister.customerOrgGroup = res.data; - } - }); - }, + // getCustomerOrgGroup(customerOrgld) { + // getapi(`/api/app/customer-org-group/in-customer-org-id/${customerOrgld}`) + // .then((res) => { + // console.log("getCustomerOrgGroup", res.data); + // if (res.code == 1) { + // this.patientRegister.customerOrgGroup = res.data; + // } + // }); + // }, //点击体检次数行 rowClick(row) { @@ -232,7 +232,7 @@ export default { }, async load() { - await this.Query() + await this.queryEvent() }, //滚动加载数据 @@ -245,7 +245,7 @@ export default { if (this.dom.scrollTop + this.dom.clientHeight + 20 > this.dom.scrollHeight && !this.lazyLoading) { // 获取到的不是全部数据 当滚动到底部 console.log('scrollTop', this.dom.scrollTop, 'clientHeight', this.dom.clientHeight, 'scrollHeight', this.dom.scrollHeight); - if ((Number(this.loadOpts.skipCount) + 1) * Number(this.loadOpts.maxResultCount) >= Number(this.loadOpts.totalCount)) { + if (Number(this.loadOpts.skipCount) * Number(this.loadOpts.maxResultCount) >= Number(this.loadOpts.totalCount)) { this.lazyLoading = false } else { this.lazyLoading = true @@ -264,10 +264,10 @@ export default { //查询 async btnQuery() { this.loadOpts.skipCount = 0 - this.Query() + this.queryEvent() }, - async Query() { + async queryEvent() { if (this.fromType == 'report') { this.reportQuery() return @@ -322,6 +322,7 @@ export default { // 报告查询 reportQuery() { + console.log('reportQuery this.loadOpts',this.loadOpts) if (this.loadOpts.skipCount != 0 && this.loadOpts.skipCount * this.loadOpts.maxResultCount >= this.loadOpts.totalCount) { this.$message.info({ showClose: true, message: "数据已全部拉取!" }) return diff --git a/src/views/report/report.vue b/src/views/report/report.vue index 8f9f9fc..2874ed7 100644 --- a/src/views/report/report.vue +++ b/src/views/report/report.vue @@ -150,11 +150,11 @@ export default { }); //分组,所有分组,不限单位,不限次数 - getapi("/api/app/customer-org-group").then((res) => { - if (res.code != -1) { - this.dict.customerOrgGroupAll = res.data.items; - } - }); + // getapi("/api/app/customer-org-group").then((res) => { + // if (res.code != -1) { + // this.dict.customerOrgGroupAll = res.data.items; + // } + // }); //支付方式 getapi("/api/app/pay-mode").then((res) => { @@ -184,12 +184,12 @@ export default { //监听事件 watch: { //触发查询事件 - "patientRegister.query.times"(newVal, oldVal) { - if (newVal != oldVal) { - //alert('触发查询事件') - this.query(); - } - }, + // "patientRegister.query.times"(newVal, oldVal) { + // if (newVal != oldVal) { + // //alert('触发查询事件') + // this.query(); + // } + // }, }, };