diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue index 5a1b81a..b054600 100644 --- a/src/components/doctorCheck/ButtonList.vue +++ b/src/components/doctorCheck/ButtonList.vue @@ -1,42 +1,60 @@ \ No newline at end of file diff --git a/src/components/doctorCheck/PatientRegisterBase.vue b/src/components/doctorCheck/PatientRegisterBase.vue index 0ad3569..32e6f4d 100644 --- a/src/components/doctorCheck/PatientRegisterBase.vue +++ b/src/components/doctorCheck/PatientRegisterBase.vue @@ -83,37 +83,7 @@ export default { return { dialogVisible: false, - pickerOptions: { - shortcuts: [ - { - text: "最近一周", - onClick(picker) { - const end = new Date(); - const start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); - picker.$emit("pick", [start, end]); - }, - }, - { - text: "最近一个月", - onClick(picker) { - const end = new Date(); - const start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); - picker.$emit("pick", [start, end]); - }, - }, - { - text: "最近三个月", - onClick(picker) { - const end = new Date(); - const start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24 * 90); - picker.$emit("pick", [start, end]); - }, - }, - ], - }, + }; }, diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue index e9cef7d..a40c004 100644 --- a/src/components/patientRegister/PatientRegisterEdit.vue +++ b/src/components/patientRegister/PatientRegisterEdit.vue @@ -8,9 +8,9 @@ + :show-all-levels="false" :disabled="(form.id || form.registerManType == 'customer') ? true:false" size="small"> @@ -664,6 +664,7 @@ export default { tel: '' }, form: { + registerManType:'customer', //登记人员类型，客服：customer 医生：doctor 支持在医生诊台处理登记人员 id: "", //id patientId: "00000000-0000-0000-0000-000000000000", //档案号ID 选择了档案就传档案号，未选就传00000-0000... patientNo: "", //档案号 @@ -772,7 +773,7 @@ export default { //挂载完成 mounted() { - // this.initFormData() + }, computed: { @@ -878,7 +879,7 @@ export default { this.patientRegister.photo = res.data.photo this.getPatientRegisterAbs(res.data.id) }else if(res.code == 0){ - this.$message.info("未找到相关信息") + this.$message.info("未找到相关信息") } }); }, @@ -1281,6 +1282,9 @@ export default { //触发已选组合项目保存 this.prAsbOpraOpts.formId = res.data.id + let temp = Object.assign({},res.data,{id:''}) + objCopy(temp,this.form) + // 稍作延时，否则 this.prAsbOpraOpts.formId 尚未更新 setTimeout(() =>{ this.prAsbOpraOpts.prAsbSave++ @@ -1288,22 +1292,6 @@ export default { //一般读身份证照片时，会出现这种情况 if (this.patientRegister.photo.indexOf("data:image") > -1) savePeoplePhoto(res.data.id, this.patientRegister.photo); - - objCopy(Object.assign({},res.data,{id:''}), this.form); //新增在未保存明细的时候，暂不要更新form.id - - /**/ - // this.patientRegister.prList.push(res.data); //列表添加记录 - this.patientRegister.patientRegisterId = res.data.id; - objCopy(res.data, this.patientRegister.patientRegisterRd); - - //this.patientRegister.query.times++; 不在触发列表查询（换成局部刷新）放在窗口关闭事件中去 - let curRow = deepCopy(this.patientRegister.patientRegisterRd) - curRow.index = this.patientRegister.prList.length - this.patientRegister.prList.push(curRow) - - - console.log('新增this.form.id',this.form.id) - } } ); @@ -1662,7 +1650,16 @@ export default { console.log('refreshFormId',this.prAsbOpraOpts.formId) this.form.id = this.prAsbOpraOpts.formId this.prAsbOpraOpts.formId = '' //清空 - this.prAsbOpraOpts.prAsbQuery++ + + /**/ + // this.patientRegister.prList.push(res.data); //列表添加记录 + this.patientRegister.patientRegisterId = this.form.id; + objCopy(this.form, this.patientRegister.patientRegisterRd); + + //this.patientRegister.query.times++; 不在触发列表查询（换成局部刷新）放在窗口关闭事件中去 + // let curRow = deepCopy(this.patientRegister.patientRegisterRd) + // curRow.index = this.patientRegister.prList.length + // this.patientRegister.prList.push(curRow) } }, @@ -1674,7 +1671,7 @@ export default { immediate:true, deep:true, handler(newVal, oldVal) { - //console.log('editTimes newVal：',newVal,' oldVal：',oldVal) + console.log('watch:formInitData.id:',newVal,' oldVal：',oldVal) if (newVal != oldVal) { this.initFormData() } @@ -1683,7 +1680,7 @@ export default { //新增或编辑 "editTimes"(newVal, oldVal) { - //console.log('editTimes newVal：',newVal,' oldVal：',oldVal) + console.log('editTimes newVal：',newVal,' oldVal：',oldVal) if (newVal != oldVal) { this.initFormData() } diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue index 6b9aab8..d2d0397 100644 --- a/src/components/patientRegister/PatientRegisterItem.vue +++ b/src/components/patientRegister/PatientRegisterItem.vue @@ -1045,11 +1045,7 @@ export default { handler(newVal,oldVal){ this.oldFormId = oldVal if(newVal != oldVal){ - if(newVal == ''){ - this.getPrAsb(newVal) - }else if(newVal != this.prAsbOpraOpts.formId){ - this.getPrAsb(newVal) - } + this.getPrAsb(newVal) } } }, diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue index 809620f..dd83af2 100644 --- a/src/components/patientRegister/PatientRegisterList.vue +++ b/src/components/patientRegister/PatientRegisterList.vue @@ -854,24 +854,38 @@ export default { this.patientRegister.prList.forEach(e =>{ e.choosed = false }) - let currentRow = {} - let lfind = arrayExistObj(this.patientRegister.prList,'id',this.patientRegister.patientRegisterRd.id) - if(lfind > -1){ - this.patientRegister.prList[lfind].choosed = true - currentRow = this.patientRegister.prList[lfind] - }else if(this.patientRegister.patientRegisterRd.id){ - currentRow = deepCopy(this.patientRegister.patientRegisterRd) - lfind = this.patientRegister.prList.length - currentRow.choosed = true - currentRow.index = lfind - this.patientRegister.prList.push(currentRow) - } + let body = Object.assign({patientRegisterNo:this.patientRegister.patientRegisterRd.patientRegisterNo},this.loadOpts) + postapi("/api/app/patientregister/getlistinfilter", body).then(res =>{ + console.log('closeDialogPR',res.data.items) + if(res.code != -1 && res.data.items.length > 0){ + let currentRow = Object.assign({},res.data.items[0]) + let lfind = arrayExistObj(this.patientRegister.prList,'id',currentRow.id) + if(lfind > -1){ + currentRow = this.patientRegister.prList[lfind] + objCopy(Object.assign({},res.data.items[0]),currentRow) + this.patientRegister.prList[lfind].choosed = true + }else{ + lfind = this.patientRegister.prList.length + currentRow.choosed = true + currentRow.index = lfind + this.patientRegister.prList.push(currentRow) + } - if(lfind > -1){ - setTimeout(() => { - this.$refs['info'].setCurrentRow(currentRow) - }, 100) - } + if(lfind > -1){ + setTimeout(() => { + this.$refs['info'].setCurrentRow(currentRow) + this.setForm(currentRow) + // this.patientRegister.query.customerOrgParentId = this.patientRegister.prList[lfind].customerOrgParentId; + this.patientRegister.customerOrgGroupChange = 0; //控制体检列表记录切换时，0 无需触发更换分组操作 + this.patientRegister.medicalPackageChange = 0; //控制体检列表记录切换时，0 无需触发更换套餐操作 + // this.getCustomerOrgGroup(this.patientRegister.prList[lfind].customerOrgParentId); + this.dict.asbItem = [...this.dict.asbItemAll]; + this.getPatientRegisterAbs(currentRow.id); + + }, 100) + } + } + }) }, diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue index 955fd5e..137430e 100644 --- a/src/views/doctorCheck/doctorCheck.vue +++ b/src/views/doctorCheck/doctorCheck.vue @@ -1,12 +1,39 @@