diff --git a/public/files/职业病体检人员名单导入模板.xlsx b/public/files/职业病体检人员名单导入模板.xlsx new file mode 100644 index 0000000..a168852 Binary files /dev/null and b/public/files/职业病体检人员名单导入模板.xlsx differ diff --git a/public/sysConfig.json b/public/sysConfig.json index d005ca8..be4b089 100644 --- a/public/sysConfig.json +++ b/public/sysConfig.json @@ -1,4 +1,4 @@ { "apiurl": "http://140.143.162.39:9529", - "softName":"创业体检管理系统" + "softName":"神豚体检管理系统" } \ No newline at end of file diff --git a/src/components/occDisease/PoisonAsbitem.vue b/src/components/occDisease/PoisonAsbitem.vue index c1524ad..4fcf18d 100644 --- a/src/components/occDisease/PoisonAsbitem.vue +++ b/src/components/occDisease/PoisonAsbitem.vue @@ -56,7 +56,7 @@ - + diff --git a/src/views/customerOrg/patientRegisterImport.vue b/src/views/customerOrg/patientRegisterImport.vue index 1c68701..0159f6f 100644 --- a/src/views/customerOrg/patientRegisterImport.vue +++ b/src/views/customerOrg/patientRegisterImport.vue @@ -16,6 +16,10 @@ 下载导入模版 +
+ 下载职业病导入模版 +
导入
@@ -26,7 +30,7 @@
- @@ -76,6 +80,8 @@

从Excle导入
+
从Excle导入(职业病) +

从以往体检资料中导入
@@ -544,7 +550,7 @@ export default { }, oldSeq: -2, //旧的步骤(辅助区分上一步,下一步) seq: 0, //当前显示窗口 - mode: '10', //模式 10 开始 文件导入,20开始 从数据库中导入 + mode: '10', //模式 10 开始 文件导入,20开始 从数据库中导入 ,30 开始职业病 excelCols: [{ dispLabel: '', val: '', dataLabel: '' }], //excel数据列名 {dispLabel:'',val:'',dataLabel:''} importCols: [], //实际导入的列(即有设置与 dataCols 匹配的列) excelData: [], //excel表格数据 @@ -572,6 +578,9 @@ export default { { dispLabel: '职称', val: 'jobTitle' }, { dispLabel: '人员类别', val: 'personnelTypeName' }, { dispLabel: '体检类别', val: 'medicalTypeName' }, + { dispLabel: '工种', val: 'jobType' }, + { dispLabel: '检查类别', val: 'ocCheckTypeName' }, + { dispLabel: '接害因素', val: 'poisons' }, { dispLabel: '支付方式', val: 'payTypeFlag' }, ], /* @@ -791,7 +800,7 @@ export default { let keys = Object.keys(this.dialogGroup) let count = 0 //选中待导入的人员数 - if (seq == 9) { + if (seq == 9 || seq == 29) { this.workBook = null this.sheetNameChoosed = '' seq = 0 @@ -824,6 +833,7 @@ export default { break; case 10: + case 30: //显示 EXCEL 导入 keys.forEach(e => { if (e == 'fileReadme') { @@ -834,6 +844,7 @@ export default { }) break; case 11: + case 31: //显示 文件选择 窗口 keys.forEach(e => { if (e == 'fileChoose') { @@ -844,6 +855,7 @@ export default { }) break; case 12: + case 32: // 从后面退回时,无需读数据 if (this.oldSeq < seq) { if (!this.readData()) { @@ -862,6 +874,7 @@ export default { }) break; case 13: + case 33: count = 0 this.excelData.forEach(e => { if (e.choosed) count++ @@ -1427,12 +1440,16 @@ export default { // case 'birthDate': // if(ExcelData[e.dispLabel]) body[e.val] = moment(new Date(ExcelData[e.dispLabel])).format('yyyy-MM-DD') // break; + case 'poisons': + if (ExcelData[e.dispLabel]) body[e.val] = ExcelData[e.dispLabel].replaceAll(",", ",").split(",") + break; default: body[e.val] = ExcelData[e.dispLabel] break; } } }) + if(this.seq > 30) body.isOccupationalDisease = 'Y' return body }, @@ -1751,4 +1768,7 @@ input[type="number"]::-webkit-outer-spin-button { -webkit-appearance: button !important; margin: 0 -12px 0 0 !important; } +::v-deep .menu_item{ + line-height: 24px; +}