diff --git a/src/assets/css/global_input.css b/src/assets/css/global_input.css index 3723e61..ff7d5cf 100644 --- a/src/assets/css/global_input.css +++ b/src/assets/css/global_input.css @@ -33,12 +33,10 @@ /* el-date-picker 框前日期图标 */ - .el-icon-date:before { content: ""; /* 原始 默认 el-icon-date */ } - .el-icon-time:before { content: ""; /* 原始 默认 el-icon-time */ diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue index 3049013..1aca18c 100644 --- a/src/components/patientRegister/PatientRegisterEdit.vue +++ b/src/components/patientRegister/PatientRegisterEdit.vue @@ -526,7 +526,7 @@ export default { patientId: "00000000-0000-0000-0000-000000000000", //档案号ID 选择了档案就传档案号,未选就传00000-0000... patientNo: "", //档案号 customerOrgId: ["00000000-0000-0000-0000-000000000001"], //单位编号 默认个人 - customerOrgRegisterId:"00000000-0000-0000-0000-000000000001", //默认单位体检次数 + customerOrgRegisterId: "00000000-0000-0000-0000-000000000001", //默认单位体检次数 customerOrgGroupId: null, //分组 medicalPackageId: null, //套餐 patientName: "", //姓名 @@ -832,10 +832,10 @@ export default { this.form.customerOrgGroupId = null this.form.medicalPackageId = null if (customerOrgParentId == this.dict.personOrgId) { - + this.patientRegister.customerOrgGroup = [] } else { - this.form.customerOrgRegisterId = null + this.form.customerOrgRegisterId = null } if (this.form.customerOrgParentId == this.dict.personOrgId) { @@ -1227,8 +1227,7 @@ export default { // console.log('body',body) // Invalid date - delete body.registerManType; - delete body.id; + delete body.registerManType; delete body.patientRegisterNo; delete body.medicalTimes; // delete body.completeFlag; @@ -1283,37 +1282,39 @@ export default { this.$message.warning("身份证号填写不合法!"); return false } - - + let body = this.madePrBody() + body.registerCheckAsbitems = this.dataTransOpts.tableM.register_check_asbitem if (this.form.id) { // 更新时,先保存明细,再更新主表 - this.prAsbOpraOpts.prAsbSave++ //触发组合项目保存 + // this.prAsbOpraOpts.prAsbSave++ //触发组合项目保存 + body.patientRegisterId = body.id; } else { - let body = this.madePrBody() - body.registerCheckAsbitems = this.dataTransOpts.tableM.register_check_asbitem - //id为空则新增 - // console.log(`/api/patientregister/createreturninfo`, body); - postapi(`/api/PatientRegister/CreatePatientRegister`, body) - .then(res => { - if (res.code == 1) { - - this.dataTransOpts.tableS.patient_register = deepCopy(res.data) - //触发已选组合项目保存 - this.prAsbOpraOpts.formId = res.data.id - setTimeout(() => { - this.dataTransOpts.refresh.register_check_asbitem.D++ - }, 10); - - // 用于刷新登记的列表 - // this.refreshRegister(Object.assign({}, res.data)) - - //一般读身份证照片时,会出现这种情况 - if (this.patientRegister.photo && this.patientRegister.photo.indexOf("data:image") > -1) savePeoplePhoto(res.data.id, this.patientRegister.photo); - } - } - ); + delete body.id; } + // console.log(`/api/patientregister/createreturninfo`, body); + postapi(`/api/PatientRegister/CreatePatientRegister`, body) + .then(res => { + if (res.code == 1) { + + this.dataTransOpts.tableS.patient_register = deepCopy(res.data) + delete this.dataTransOpts.tableS.patient_register.registerCheckAsbitems + + this.dataTransOpts.tableM.register_check_asbitem = deepCopy(res.data.registerCheckAsbitems) + // //触发已选组合项目保存 + // this.prAsbOpraOpts.formId = res.data.id + // setTimeout(() => { + // this.dataTransOpts.refresh.register_check_asbitem.D++ + // }, 10); + + // 用于刷新登记的列表 + // this.refreshRegister(Object.assign({}, res.data)) + + //一般读身份证照片时,会出现这种情况 + if (this.patientRegister.photo && this.patientRegister.photo.indexOf("data:image") > -1) savePeoplePhoto(res.data.id, this.patientRegister.photo); + } + } + ); }); },