diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue index 0d4b7ee..f27e94c 100644 --- a/src/components/doctorCheck/PatientRegisterList.vue +++ b/src/components/doctorCheck/PatientRegisterList.vue @@ -165,7 +165,7 @@ - + diff --git a/src/components/report/CusOrgOCX.vue b/src/components/report/CusOrgOCX.vue index a8fd58e..ce55cf9 100644 --- a/src/components/report/CusOrgOCX.vue +++ b/src/components/report/CusOrgOCX.vue @@ -86,13 +86,13 @@ import { arrayExistObj } from "../../utlis/proFunc"; import { getTreePids, getTreeAllChildIdsById } from "../../utlis/tree"; export default { components: {}, - props:["noCustomerOrg","initDateType"], + props:["useCustomerOrg","initDateType"], data() { return { preNodeId: '', //上一次点击树节点 curNodeId: '', //本次点击树节点 - dateType: 'creationTime', - useCusOrg: true, //是否使用单位 + dateType: 'medicalStartDate', + useCusOrg: false, //是否使用单位 //体检单位,体检次数,日期类型,起止日期,分组 dataCusOrgOCX: [{ id: '', //随机的ID,用于删除 @@ -100,7 +100,7 @@ export default { customerOrgName: '', //企业名称,显示用 customerOrgRegister: {}, //已选的体检次数 customerOrgRegisterList: [], //当前单位的体检次数信息 - dateType: 'creationTime', // 登记日期:creationTime;体检日期:medicalStartDate;总检日期:summaryDate + dateType: 'medicalStartDate', // 登记日期:creationTime;体检日期:medicalStartDate;总检日期:summaryDate startDate: '', endDate: '', customerOrgGroupIds: [], //已选分组 @@ -115,13 +115,13 @@ export default { //创建组件后 created() { this.dataCusOrgOCX = []; - if(this.noCustomerOrg){ - this.useCusOrg = false - this.changeUseOrg(this.useCusOrg) - } + if(this.useCustomerOrg){ + this.useCusOrg = true + } if(this.initDateType){ this.dateType = this.initDateType } + this.changeUseOrg(this.useCusOrg) }, //挂载组件完成 @@ -315,7 +315,7 @@ export default { customerOrgName: '', customerOrgRegister: {}, //已选的体检次数 customerOrgRegisterList: [], //当前单位的体检次数信息 - dateType: 'creationTime', // 登记日期:creationTime;体检日期:medicalStartDate;总检日期:summaryDate + dateType: 'medicalStartDate', // 登记日期:creationTime;体检日期:medicalStartDate;总检日期:summaryDate startDate: ldate, endDate: ldate, customerOrgGroupIds: [], //已选的体检分组 diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue index d29d4d1..e68050f 100644 --- a/src/components/sumDoctorCheck/ButtonList.vue +++ b/src/components/sumDoctorCheck/ButtonList.vue @@ -36,16 +36,20 @@
干预措施
- + + +
+ + + +
+ @@ -87,7 +91,7 @@ export default { }, computed: { - ...mapState(["dict", "patientRegister", "doctorCheck", "sumDoctorCheck"]), + ...mapState(["window","dict", "patientRegister", "doctorCheck", "sumDoctorCheck"]), }, methods: { diff --git a/src/components/sumDoctorCheck/SumSug.vue b/src/components/sumDoctorCheck/SumSug.vue index 10f3881..cff8d03 100644 --- a/src/components/sumDoctorCheck/SumSug.vue +++ b/src/components/sumDoctorCheck/SumSug.vue @@ -3,21 +3,26 @@
+ @@ -27,7 +32,7 @@
- + - + @@ -321,5 +326,22 @@ export default { \ No newline at end of file