diff --git a/src/components/doctorCheck/PatientRegisterBase2.vue b/src/components/doctorCheck/PatientRegisterBase2.vue index c93ae2c..d021fe1 100644 --- a/src/components/doctorCheck/PatientRegisterBase2.vue +++ b/src/components/doctorCheck/PatientRegisterBase2.vue @@ -287,12 +287,16 @@ export default { .then((res) => { if (res.code > -1) { this.prBase = res.data - if (this.prBase.completeFlag != '3') this.prBase.summaryDoctorId = this.userId - if (this.prBase.completeFlag == '3' && this.prBase.isAudit == 'N') { - this.prBase.auditDoctorId = this.userId - } + + // ---------- 如果是总检与审核医生不可选时,则总检与审核默认当前用户,此功能放至保存时触发 + // if (this.prBase.completeFlag != '3') this.prBase.summaryDoctorId = this.userId + // if (this.prBase.completeFlag == '3' && this.prBase.isAudit == 'N') { + // this.prBase.auditDoctorId = this.userId + // } + // ---------- // console.log('res.data',res.data) // console.log('this.prBase',this.prBase) + } this.afterFind(this.prBase) }); diff --git a/src/views/customerReport/unitSettlement.vue b/src/views/customerReport/unitSettlement.vue index 962ffee..0328863 100644 --- a/src/views/customerReport/unitSettlement.vue +++ b/src/views/customerReport/unitSettlement.vue @@ -8,8 +8,7 @@
-
+ ">
体检单位: - - + +
组合项目: - - + +
报表格式: - + @@ -70,13 +44,7 @@
报表格式: - + @@ -84,116 +52,50 @@
- + 显示人员名单
- + 包含个人支付和免费赠送
- 查询 + 查询
- 导出excel + + 导出excel
- 打印 + 打印
-
-
+
+
- + @@ -201,123 +103,60 @@
-
+
- +