pengjun 4 weeks ago
parent
commit
999abb9285
  1. BIN
      public/pic/hisLog.jpg
  2. BIN
      public/pic/peisQrCode.jpg
  3. BIN
      public/pic/peisQrCodeMini.jpg
  4. 63
      src/components/patientRegister/PatientRegisterEdit.vue
  5. 14
      src/components/report/BtnReport.vue
  6. 1
      src/components/report/PatientRegisterListNobtn.vue

BIN
public/pic/hisLog.jpg

Before

Width: 837  |  Height: 992  |  Size: 194 KiB

After

Width: 240  |  Height: 240  |  Size: 12 KiB

BIN
public/pic/peisQrCode.jpg

Before

Width: 258  |  Height: 294  |  Size: 31 KiB

After

Width: 800  |  Height: 800  |  Size: 65 KiB

BIN
public/pic/peisQrCodeMini.jpg

After

Width: 258  |  Height: 294  |  Size: 30 KiB

63
src/components/patientRegister/PatientRegisterEdit.vue

@ -1402,14 +1402,14 @@ export default {
},
// ID
getMedicalTypeByOrg(customerOrgId){
getMedicalTypeByOrg(customerOrgId) {
return new Promise((resolve, reject) => {
postapi('/api/app/Customerorg/GetMedicalTypeIdByCustomerOrgId',{customerOrgId})
.then(res => {
if(res.code > -1){
this.form.medicalTypeId = res.data.medicalTypeId
}
})
postapi('/api/app/Customerorg/GetMedicalTypeIdByCustomerOrgId', { customerOrgId })
.then(res => {
if (res.code > -1) {
this.form.medicalTypeId = res.data.medicalTypeId
}
})
})
},
@ -1494,7 +1494,7 @@ export default {
//
if (customerOrgParentId == this.dict.personOrgId) {
this.patientRegister.customerOrgGroup = []
}
}
if (this.form.customerOrgParentId == this.dict.personOrgId) {
this.changeMedicalPackageId()
@ -1932,14 +1932,14 @@ export default {
//
btnSubmit(formName, msgTip) {
console.log('btnSubmit,formName,form', formName, JSON.stringify(this.form))
//console.log('btnSubmit,formName,form', formName, JSON.stringify(this.form))
this.$refs[formName].validate((valid, fields) => {
// console.log('fields', fields)
if (!valid) {
this.$message.warning({ showClose: true, message: fields[Object.keys(fields)[0]][0].message });
return false
}
console.log('btnSubmit1', formName)
//console.log('btnSubmit1', formName)
if (this.form.customerOrgId != this.dict.personOrgId) {
if (!this.form.customerOrgRegisterId) {
this.$message.warning({ showClose: true, message: "请填写单位体检次数!" });
@ -1974,9 +1974,14 @@ export default {
} else {
delete body.id;
}
console.log('btnSubmit3', formName)
//console.log('btnSubmit3', formName)
// // console.log(`/api/patientregister/createreturninfo`, body);
postapi(`/api/PatientRegister/CreatePatientRegister`, body)
//
this.checkAsbItemHC()
.then(() => {
return postapi(`/api/PatientRegister/CreatePatientRegister`, body)
})
.then(async (res) => {
if (res.code > -1) {
// res.data isPatientOccupationalDisease form
@ -2035,10 +2040,36 @@ export default {
}
}
);
});
},
//
checkAsbItemHC() {
return new Promise((resolve, reject) => {
let asbitemIds = []
//console.log('this.dataTransOpts.tableM.register_check_asbitem',this.dataTransOpts.tableM.register_check_asbitem)
this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
asbitemIds.push(e.asbitemId)
});
if (asbitemIds.length == 0) {
resolve()
} else {
postapi('/api/app/AsbitemMutualExclusion/GetAsbitemIsMutualExclusion', { asbitemIds })
.then(res => {
if (res.code > -1) {
if(res?.data?.message) this.$message.warning({ showClose: true, message: res.data.message })
}
})
.finally(() => {
resolve()
})
}
})
},
//
async occUpdate() {
//
@ -3312,9 +3343,9 @@ export default {
//
rowDblclick(row) {
this.packageRowClick(row)
.then(res => {
this.copyMedicalPackage()
})
.then(res => {
this.copyMedicalPackage()
})
},
//()

14
src/components/report/BtnReport.vue

@ -252,13 +252,15 @@ export default {
Parameters: [
{ Name: 'printer', Value: user },
{ Name: 'LTS', Value: 'Y' }, //YN N
{ Name: "firstPage", Value: "pic/peisReportFirstPage.jpg" },
{ Name: "pageHeader", Value: "pic/peisReportPageHeader.jpg" },
{ Name: "pageFooter", Value: "pic/peisReportPageFooter.jpg" },
{ Name: "orgSign", Value: "pic/orgSign.png" },
{ Name: 'picExtOne', Value: 'pic/hisLog.jpg' },
{ Name: "firstPage", Value: "pic/peisReportFirstPage.jpg" }, //
{ Name: "pageHeader", Value: "pic/peisReportPageHeader.jpg" }, //
{ Name: "pageFooter", Value: "pic/peisReportPageFooter.jpg" }, //
{ Name: "orgSign", Value: "pic/orgSign.png" }, //
{ Name: 'picExtOne', Value: 'pic/hisLog.jpg' }, //
{ Name: 'picExtTwo', Value: 'pic/orgSignCom.png' }, //
{ Name: 'resultSign', Value: 'pic/resultSign.png' },
{ Name: 'resultSign', Value: 'pic/resultSign.png' }, //
{ Name: 'picExtThree', Value: 'pic/peisQrCode.jpg' }, //
{ Name: 'picExtFour', Value: 'pic/peisQrCodeMini.jpg' }, //
],
IsHealthReport: 'Y'
};

1
src/components/report/PatientRegisterListNobtn.vue

@ -23,6 +23,7 @@
<i class="el-icon-printer" v-if="scope.row.isReportPrint == 'Y'" style="font-size: 24px;color: green;"></i>
</template>
</el-table-column>
<el-table-column prop="reportPrintName" label="打印人" width="60" align="center" sortable />
<el-table-column prop="isUploadAppoint" label="预约备单" align="center" sortable>
<template slot-scope="scope">
<div style="font-family: 'Microsoft YaHei';">{{ scope.row.isUploadAppoint == "Y" ? "√" : "" }}</div>

Loading…
Cancel
Save