diff --git a/src/views/customerOrg/patientRegisterImport.vue b/src/views/customerOrg/patientRegisterImport.vue index f101150..56dbeaa 100644 --- a/src/views/customerOrg/patientRegisterImport.vue +++ b/src/views/customerOrg/patientRegisterImport.vue @@ -17,8 +17,8 @@ size="small">下载导入模版
- 下载职业病导入模版 + 下载职业病导入模版
导入 @@ -36,8 +36,8 @@ - +
- +

从Excle导入
-
从Excle导入（职业病） +
从Excle导入（职业病）

从以往体检资料中导入
@@ -181,8 +181,8 @@
体检单位： - @@ -242,19 +242,24 @@ -
- - + + + - - - + + + + +
@@ -274,8 +279,8 @@ 体检单位： + :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }" + :show-all-levels="true" size="small">
单位体检次数： @@ -289,7 +294,8 @@
登记日期： - + 至 @@ -459,8 +465,8 @@ 新单位或部门
- @@ -583,10 +589,10 @@ export default { { dispLabel: '检查类别', val: 'ocCheckTypeName' }, { dispLabel: '接害因素', val: 'poisons' }, { dispLabel: '备注', val: 'remark' }, - { dispLabel: '介绍人', val: 'salesman' }, + { dispLabel: '介绍人', val: 'salesman' }, { dispLabel: '支付方式', val: 'payTypeFlag' }, ], - masterCols:{}, // 批量导入必填的项目 + masterCols: {}, // 批量导入必填的项目 tableData: [], //导入数据状态显示 @@ -681,7 +687,7 @@ export default { .then(res => { if (res.code > -1) { try { - this.masterCols = JSON.parse(res.data) + this.masterCols = JSON.parse(res.data) } catch (error) { console.error(error) } @@ -697,7 +703,7 @@ export default { clearProcess() { let elo = document.getElementById('fileNames') - if(elo) elo.value = ''; // 清空选择的文件 + if (elo) elo.value = ''; // 清空选择的文件 this.workBook = null //EXCEL 工作薄 this.sheetNames = [] //EXCEL 工作薄中的表单 {sheetName:} @@ -719,7 +725,7 @@ export default { getapi("/api/app/customerorg/getbycodeall?IsHidePerson=1").then((res) => { // console.log("res.data", res.data); if (res.code != -1) { - this.customerOrgTree = res.data; + this.customerOrgTree = res.data; let lfind = arrayExistObj(this.customerOrgTree, 'id', this.dict.personOrgId) if (lfind > -1) this.customerOrgTree.splice(lfind, 1) tcdate(this.customerOrgTree) @@ -727,7 +733,7 @@ export default { }); }, - + //选择单位 changeCustomerOrg(v) { this.chooseCustomerOrg(v) @@ -977,9 +983,9 @@ export default { } data.forEach((item) => { - console.log('item,column.property',item,column.property) + console.log('item,column.property', item, column.property) if (item[column.property]) { - fail++ + fail++ } else { success++ } @@ -1269,7 +1275,7 @@ export default { }, // 导入必填项验证 - checkValide(body){ + checkValide(body) { let msg = '' // patientName，personnelTypeName，medicalTypeName，salesman let keys = Object.keys(this.masterCols) @@ -1277,22 +1283,22 @@ export default { const key = keys[i]; switch (key) { case 'patientName': - case 'name': - if(!body.patientName) msg = this.masterCols[key] + ' 未填值' + case 'name': + if (!body.patientName) msg = this.masterCols[key] + ' 未填值' break; case 'medicalTypeId': //体检类别 - if(!body.medicalTypeName) msg = this.masterCols[key] + ' 未填值' + if (!body.medicalTypeName) msg = this.masterCols[key] + ' 未填值' break; case 'personnelTypeId': //人员类别 - if(!body.personnelTypeName) msg = this.masterCols[key] + ' 未填值' + if (!body.personnelTypeName) msg = this.masterCols[key] + ' 未填值' break; case 'salesman': //介绍人 - if(!body.salesman) msg = this.masterCols[key] + ' 未填值' + if (!body.salesman) msg = this.masterCols[key] + ' 未填值' break; default: break; } - if(msg) break; + if (msg) break; } return msg }, @@ -1315,9 +1321,9 @@ export default { // 判断是否必填: let msg = this.checkValide(body) - if(msg){ + if (msg) { this.tableData.push(Object.assign({ importState: '导入失败', importDes: msg }, this.choosedData[i])) - }else{ + } else { try { // 同一人判断 if (this.choosedSameMan.patientNo) { @@ -1364,10 +1370,11 @@ export default { async isSamePatient(startRowNameType, body) { console.log('isSamePatient', startRowNameType, body) let result = { - isContinue: true, + isContinue: true, // 默认继续 err: '' } let res + // 有身份证则按身份证找是否有档案号 if (body.idNo) { try { res = await postapi('/api/app/patient/GetByIdNo', { idNo: body.idNo }) @@ -1382,31 +1389,31 @@ export default { result.err = `身份证号查重错误，原因：${error}` return result } - } - - // 没有身份证号或身份证号未找到同名人员时，按姓名查重 - let url, localBody = { - customerOrgId: body.customerOrgId, - name: body.patientName - } - switch (startRowNameType) { - case '1': - case '2': - if (startRowNameType == '1') url = '/api/app/patientregister/GetSameNamePatient' - if (startRowNameType == '2') url = '/api/app/patientregister/GetCustomerOrgSameNamePatient' - res = await postapi(url, localBody) - if (res.code >= 0) { - if (res.data.length > 0) { - result.isContinue = false - this.sameMans = res.data - this.dialogSameMan = true + } else { + // 没有身份证号或身份证号未找到同名人员时，按姓名查重 + let url, localBody = { + customerOrgId: body.customerOrgId, + name: body.patientName + } + switch (startRowNameType) { + case '1': + case '2': + if (startRowNameType == '1') url = '/api/app/patientregister/GetSameNamePatient' + if (startRowNameType == '2') url = '/api/app/patientregister/GetCustomerOrgSameNamePatient' + res = await postapi(url, localBody) + if (res.code >= 0) { + if (res.data.length > 0) { + result.isContinue = false + this.sameMans = res.data + this.dialogSameMan = true + } + } else { + result.err = `${startRowNameType == '2' ? '同单位内' : ''}同名查重错误，原因：${res.message}` } - } else { - result.err = `${startRowNameType == '2' ? '同单位内' : ''}同名查重错误，原因：${res.message}` - } - break; - default: - break; + break; + default: + break; + } } return result @@ -1469,7 +1476,7 @@ export default { } } }) - if(this.seq > 30){ + if (this.seq > 30) { body.isOccupationalDisease = 'Y' body.isDefaultMedicalType = 'Y' } @@ -1681,8 +1688,8 @@ export default { try { // 旧接口：/api/app/patientregister/createpatientregisterhistory let res = await postapi('/api/app/patientregister/CreatePatientRegisterFromHistory', body) - if (res.code >= 0) { - this.tableData.push(Object.assign({ importState: '导入成功' }, this.prList[i])) + if (res.code >= 0) { + this.tableData.push(Object.assign({ importState: '导入成功' }, this.prList[i])) } else { this.tableData.push(Object.assign({ importState: '导入失败', importDes: res.message }, this.prList[i])) } @@ -1794,6 +1801,6 @@ input[type="number"]::-webkit-outer-spin-button { } ::v-deep .el-table__header th { - font-family: "Microsoft YaHei"; + font-family: "Microsoft YaHei"; }