From bcd60604dc0670570c9b77dda1d2b0af823ba068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=96=8C=E6=9D=B0?= <> Date: Tue, 12 Nov 2024 17:15:10 +0800 Subject: [PATCH] ui --- .../follow/AsbitemCriticalValue.vue | 196 +++++++++++------- src/components/follow/FollowList.vue | 54 ++--- src/components/follow/PhoneFollowUp.vue | 6 +- src/components/follow/SmsSend.vue | 6 +- src/views/customerReport/detailedIitems.vue | 6 +- 5 files changed, 162 insertions(+), 106 deletions(-) diff --git a/src/components/follow/AsbitemCriticalValue.vue b/src/components/follow/AsbitemCriticalValue.vue index f3ce6d5..d2ad059 100644 --- a/src/components/follow/AsbitemCriticalValue.vue +++ b/src/components/follow/AsbitemCriticalValue.vue @@ -22,9 +22,14 @@ - + - + - + - + @@ -54,9 +74,14 @@ - + - + - + - + @@ -102,59 +142,63 @@ export default { dddw, moment, getLists() { - postapi( - "/api/app/PhoneFollowUp/GetAsbitemOrItemCriticalByPatientRegisterId", - { - patientRegisterId: - this.dataTransOpts.tableS.patient_register.patientRegisterId, + if (this.dataTransOpts.tableS.patient_register.patientRegisterId) { + postapi( + "/api/app/PhoneFollowUp/GetAsbitemOrItemCriticalByPatientRegisterId", + { + patientRegisterId: + this.dataTransOpts.tableS.patient_register.patientRegisterId, + } + ).then((res) => { + if (res.code > -1) this.asbitemCriticalValue = res.data; + }); + }else{ + this.asbitemCriticalValue=[] + } + }, + objectSpanMethod({ row, column, rowIndex, columnIndex }) { + if ( + //if条件判断的是合并那一竖列 + columnIndex == 0 || + columnIndex == 1 || + columnIndex == 2 || + columnIndex == 3 || + columnIndex == 4 || + columnIndex == 5 || + columnIndex == 6 || + columnIndex == 7 + ) { + const _row = this.flitterData2(this.asbitemCriticalValue).one[rowIndex]; + const _col = _row > 0 ? 1 : 0; + return { + rowspan: _row, + colspan: _col, + }; + } + }, + flitterData2(arr) { + let spanOneArr = []; + let concatOne = 0; + arr.forEach((item, index) => { + if (index === 0) { + spanOneArr.push(1); + } else { + //name 修改 + if (item.registerCheckId === arr[index - 1].registerCheckId) { + //pid就是判断相同的字段 + //第一列需合并相同内容的判断条件 + spanOneArr[concatOne] += 1; + spanOneArr.push(0); + } else { + spanOneArr.push(1); + concatOne = index; + } } - ).then((res) => { - if (res.code > -1) this.asbitemCriticalValue = res.data; }); - }, - objectSpanMethod({ row, column, rowIndex, columnIndex }) { - if ( - //if条件判断的是合并那一竖列 - columnIndex == 0 || - columnIndex == 1 || - columnIndex == 2 || - columnIndex == 3 || - columnIndex == 4 || - columnIndex == 5 || - columnIndex == 6 || - columnIndex == 7 - ) { - const _row = this.flitterData2(this.asbitemCriticalValue).one[rowIndex]; - const _col = _row > 0 ? 1 : 0; return { - rowspan: _row, - colspan: _col, + one: spanOneArr, }; - } - }, - flitterData2(arr) { - let spanOneArr = []; - let concatOne = 0; - arr.forEach((item, index) => { - if (index === 0) { - spanOneArr.push(1); - } else { - //name 修改 - if (item.registerCheckId === arr[index - 1].registerCheckId) { - //pid就是判断相同的字段 - //第一列需合并相同内容的判断条件 - spanOneArr[concatOne] += 1; - spanOneArr.push(0); - } else { - spanOneArr.push(1); - concatOne = index; - } - } - }); - return { - one: spanOneArr, - }; - }, + }, }, updated() { this.$nextTick(() => { @@ -179,8 +223,8 @@ export default { \ No newline at end of file diff --git a/src/components/follow/FollowList.vue b/src/components/follow/FollowList.vue index 4796f81..9771453 100644 --- a/src/components/follow/FollowList.vue +++ b/src/components/follow/FollowList.vue @@ -81,6 +81,14 @@ + +
@@ -299,6 +307,7 @@ export default { }, }, LocalConfigInit: {}, + columnData:[] }; }, @@ -729,12 +738,13 @@ export default { async Query() { // 查询时，清掉明细数据 （滚动时不清） this.dataTransOpts.tableS.patient_register.followUpId = ""; + this.dataTransOpts.tableS.patient_register.patientRegisterId="" this.tableDataCurrentRow = {}; // 清除选择 this.tableData = []; - // setTimeout(() => { - // this.dataTransOpts.refresh.register_check_asbitem.M++; //触发所选组合项目刷新 - // }, 10); + setTimeout(() => { + this.dataTransOpts.refresh.register_check_asbitem.M++; //触发所选组合项目刷新 + }, 10); this.loadOpts = Object.assign(this.loadOpts, this.loadOptsInit); await this.getPrList(); @@ -841,31 +851,21 @@ export default { body ).then((res) => { if (res.code > -1) { - let curLoad = res.data; - // let oldCount = 0 - // 处理分组/套餐 排序混乱的问题 - // curLoad.forEach((e) => { - // if (e.customerOrgId == this.dict.personOrgId) { - // e.groupPack = e.medicalPackageId; - // } else { - // e.groupPack = e.customerOrgGroupId; - // } - // }); - - if (body.skipCount == 0) { - //查询 - this.tableData = []; + let that = this; + for(let i=0;i { - // this.tableData.push(Object.assign({ index: Number(oldCount) + Number(index), choosed: false }, e)) - // }) - + that.columnData = Array.from(new Set(that.columnData)); + this.tableData=res.data //如果 有选中 记录，则刷新其对应的组合项目 if (this.dataTransOpts.tableS.patient_register.id) { this.dataTransOpts.refresh.register_check_asbitem.M++; diff --git a/src/components/follow/PhoneFollowUp.vue b/src/components/follow/PhoneFollowUp.vue index d33d6bb..adc64f0 100644 --- a/src/components/follow/PhoneFollowUp.vue +++ b/src/components/follow/PhoneFollowUp.vue @@ -329,11 +329,15 @@ export default { }); }, getLists() { - postapi("/api/app/PhoneFollowUp/GetList", { + if(this.dataTransOpts.tableS.patient_register.followUpId){ + postapi("/api/app/PhoneFollowUp/GetList", { followUpId: this.dataTransOpts.tableS.patient_register.followUpId, }).then((res) => { if (res.code > -1) this.phoneFollowUp = res.data; }); + }else{ + this.phoneFollowUp=[] + } }, addoredit() { if (this.title == 1) { diff --git a/src/components/follow/SmsSend.vue b/src/components/follow/SmsSend.vue index a94b13d..7f74a4a 100644 --- a/src/components/follow/SmsSend.vue +++ b/src/components/follow/SmsSend.vue @@ -241,11 +241,15 @@ export default { }); }, getLists() { - postapi("/api/app/SmsSend/GetList", { + if(this.dataTransOpts.tableS.patient_register.followUpId){ + postapi("/api/app/SmsSend/GetList", { followUpId: this.dataTransOpts.tableS.patient_register.followUpId, }).then((res) => { if (res.code > -1) this.phoneFollowUp = res.data; }); + }else{ + this.phoneFollowUp=[] + } }, rowick(row) { this.curRow = { ...row }; diff --git a/src/views/customerReport/detailedIitems.vue b/src/views/customerReport/detailedIitems.vue index 4179208..8499c6b 100644 --- a/src/views/customerReport/detailedIitems.vue +++ b/src/views/customerReport/detailedIitems.vue @@ -434,7 +434,7 @@ page-break-before: avoid;}}`, // 去除页眉页脚 if (this.project.dataAsbitemOCX.length > 0) { this.project.dataAsbitemOCX.forEach((e) => { asbitemIds.push(e.id); - this.columnData.push(e.displayName) + // this.columnData.push(e.displayName) }); } @@ -454,8 +454,10 @@ page-break-before: avoid;}}`, // 去除页眉页脚 for(let i=0;i { this.$refs.dataList.doLayout(); @@ -471,8 +473,10 @@ page-break-before: avoid;}}`, // 去除页眉页脚 for(let i=0;i { this.$refs.dataLists.doLayout();