diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue
index a42bd6c..e0b4d22 100644
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@@ -44,34 +44,46 @@
size="small"
>P
-
+
+
+
+
@@ -47,9 +61,9 @@
-
+
@@ -57,9 +71,9 @@
-
+
@@ -67,6 +81,14 @@
+
+
@@ -285,6 +307,7 @@ export default {
},
},
LocalConfigInit: {},
+ columnData:[]
};
},
@@ -715,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();
@@ -827,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();