pengjun 2 months ago
parent
commit
f9195cf02c
  1. 21
      src/components/patientRegister/PatientRegisterEdit.vue
  2. 8
      src/views/doctorCheck/doctorCheck.vue

21
src/components/patientRegister/PatientRegisterEdit.vue

@ -77,7 +77,8 @@
<el-col :span="5"> <el-col :span="5">
<!--autocomplete="off"--> <!--autocomplete="off"-->
<el-form-item label="姓名" prop="patientName"> <el-form-item label="姓名" prop="patientName">
<el-input id="patientName" v-model="form.patientName" @change="changePatientName" data-col="patientName" size="small"></el-input>
<el-input id="patientName" v-model="form.patientName" @change="changePatientName"
data-col="patientName" size="small"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
@ -1446,17 +1447,23 @@ export default {
this.peisid = window.sessionStorage.getItem('peisid'); this.peisid = window.sessionStorage.getItem('peisid');
let customerOrgId, customerOrgName, customerOrgParentId let customerOrgId, customerOrgName, customerOrgParentId
if (this.refQueryCondition.customerOrgId) {
if (this?.refQueryCondition?.customerOrgId) {
customerOrgParentId = this.refQueryCondition.CustomerOrgParentId customerOrgParentId = this.refQueryCondition.CustomerOrgParentId
customerOrgId = this.refQueryCondition.customerOrgId customerOrgId = this.refQueryCondition.customerOrgId
customerOrgName = this.refQueryCondition.customerOrgName customerOrgName = this.refQueryCondition.customerOrgName
} else {
if (Array.isArray(this.form.customerOrgId) && this.form.customerOrgId.length > 0) {
customerOrgParentId = this.form.customerOrgId[0]
customerOrgId = this.form.customerOrgId[this.form.customerOrgId.length - 1]
customerOrgName = this.form.customerOrgName
} else { } else {
customerOrgParentId = this.form.customerOrgParentId customerOrgParentId = this.form.customerOrgParentId
customerOrgId = this.form.customerOrgId customerOrgId = this.form.customerOrgId
customerOrgName = this.form.customerOrgName customerOrgName = this.form.customerOrgName
} }
}
this.preCustomerOrgId = this.refQueryCondition.customerOrgId
this.preCustomerOrgId = this?.refQueryCondition?.customerOrgId
if (!patientRegisterId) { // if (!patientRegisterId) { //
this.form = Object.assign({}, this.form, this.formInit) this.form = Object.assign({}, this.form, this.formInit)
this.form.registerCheckAsbitems = [] this.form.registerCheckAsbitems = []
@ -1492,6 +1499,8 @@ export default {
// ID // ID
getMedicalTypeByOrg(customerOrgId) { getMedicalTypeByOrg(customerOrgId) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
console.log('getMedicalTypeByOrg', customerOrgId)
if (customerOrgId) {
postapi('/api/app/Customerorg/GetMedicalTypeIdByCustomerOrgId', { customerOrgId }) postapi('/api/app/Customerorg/GetMedicalTypeIdByCustomerOrgId', { customerOrgId })
.then(res => { .then(res => {
if (res.code > -1) { if (res.code > -1) {
@ -1500,6 +1509,12 @@ export default {
this.form.salesman = res.data.salesPerson this.form.salesman = res.data.salesPerson
} }
}) })
.finally(() => {
resolve()
})
} else {
resolve()
}
}) })
}, },

8
src/views/doctorCheck/doctorCheck.vue

@ -512,7 +512,7 @@ export default {
// }, // },
computed: { computed: {
...mapState(["window", "dialogWin", "doctorCheck"]),
...mapState(["window", "dialogWin", "doctorCheck","dataTransOpts"]),
frameHeight() { frameHeight() {
return this.window.pageHeight - 42 - 10 return this.window.pageHeight - 42 - 10
@ -1174,12 +1174,13 @@ export default {
// debugger // debugger
if (this.medicalStartDate) { if (this.medicalStartDate) {
//this.formData = Object.assign({},this.formInitData,{medicalStartDate:moment(this.medicalStartDate).format('yyyy-MM-DD')}) //this.formData = Object.assign({},this.formInitData,{medicalStartDate:moment(this.medicalStartDate).format('yyyy-MM-DD')})
this.patient_register.id = ''
// this.patient_register.id = ''
this.dataTransOpts.tableS.patient_register.id = ''
this.dialogWin.PatientRegisterEdit = true this.dialogWin.PatientRegisterEdit = true
setTimeout(() => { setTimeout(() => {
this.dataTransOpts.refresh.patient_register.S++ this.dataTransOpts.refresh.patient_register.S++
}, 20); }, 20);
this.patientRegister.photo = ''
// this.patientRegister.photo = ''
} else { } else {
this.nextTodialogVisible = true this.nextTodialogVisible = true
this.dialogVisibleSetStartDate = true this.dialogVisibleSetStartDate = true
@ -1227,6 +1228,7 @@ export default {
return return
} }
this.dataTransOpts.tableS.patient_register.id = this.patient_register.id
// this.patientRegister.patientRegisterRd = Object.assign({},this.doctorCheck.prBase) // this.patientRegister.patientRegisterRd = Object.assign({},this.doctorCheck.prBase)
// this.formData = Object.assign({},this.doctorCheck.prBase) // this.formData = Object.assign({},this.doctorCheck.prBase)

Loading…
Cancel
Save