diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue index 0435733..d0efb6d 100644 --- a/src/components/patientRegister/PatientRegisterEdit.vue +++ b/src/components/patientRegister/PatientRegisterEdit.vue @@ -35,7 +35,7 @@ -
+
diff --git a/src/components/patientRegister/PatientRegisterRecoverList.vue b/src/components/patientRegister/PatientRegisterRecoverList.vue index 1508347..a8b0008 100644 --- a/src/components/patientRegister/PatientRegisterRecoverList.vue +++ b/src/components/patientRegister/PatientRegisterRecoverList.vue @@ -107,11 +107,11 @@
扫码回收
-
+
diff --git a/src/components/patientRegister/patientRegisterRecoverListQuery.vue b/src/components/patientRegister/patientRegisterRecoverListQuery.vue index 099b9c7..3510a64 100644 --- a/src/components/patientRegister/patientRegisterRecoverListQuery.vue +++ b/src/components/patientRegister/patientRegisterRecoverListQuery.vue @@ -132,6 +132,11 @@
查询
+
+ + 导出excel + +
{ + if(e.completeFlag) e.completeFlag = this.dddw(this.dict.completeFlag, "id", e.completeFlag, "displayName") + if (e.sexId) e.sexId = dddw(this.dict.sex, "id", e.sexId, "displayName") + if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId === this.dict.personOrgId) { + e.groupPack = e.medicalPackageName // dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName") + } else if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId !== this.dict.personOrgId) { + e.groupPack = e.customerOrgGroupName // dddw(this.dict.customerOrgGroupAll, "id", e.customerOrgGroupId, "displayName") + } + if (e.idNo) e.idNo = e.idNo + '&' + if (e.birthDate) e.birthDate = moment(e.birthDate).format("yyyy-MM-DD") + }) + this.tableName = '体检表回收' + moment(new Date()).format('yyyyMMDDHHmmss') + '.xls' + return tableDatas; + }, }, //监听事件 diff --git a/src/components/report/deptProgress.vue b/src/components/report/deptProgress.vue index 0358287..8c867ca 100644 --- a/src/components/report/deptProgress.vue +++ b/src/components/report/deptProgress.vue @@ -161,7 +161,7 @@ export default { //挂载完成 mounted() { let ldate = new Date(); - this.query.startDate = ldate; + this.query.startDate = this.moment(ldate).format("YYYY-MM-DD"); this.query.endDate = ldate; @@ -177,7 +177,6 @@ export default { methods: { ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]), dddw, moment, - dictInit() { //体检类别 // getapi("/api/app/medical-type/in-filter").then((res) => {