diff --git a/public/files/会员卡导入模板.xls b/public/files/会员卡导入模板.xls index e5f65c3..a88c826 100644 Binary files a/public/files/会员卡导入模板.xls and b/public/files/会员卡导入模板.xls differ diff --git a/public/files/单位体检人员名单导入模板.xlsx b/public/files/单位体检人员名单导入模板.xlsx index 10a7370..ed68f32 100644 Binary files a/public/files/单位体检人员名单导入模板.xlsx and b/public/files/单位体检人员名单导入模板.xlsx differ diff --git a/src/views/customerOrg/patientRegisterImport.vue b/src/views/customerOrg/patientRegisterImport.vue index e5f43ee..8f01833 100644 --- a/src/views/customerOrg/patientRegisterImport.vue +++ b/src/views/customerOrg/patientRegisterImport.vue @@ -583,9 +583,10 @@ export default { { dispLabel: '检查类别', val: 'ocCheckTypeName' }, { dispLabel: '接害因素', val: 'poisons' }, { dispLabel: '备注', val: 'remark' }, + { dispLabel: '介绍人', val: 'salesman' }, { dispLabel: '支付方式', val: 'payTypeFlag' }, ], - + masterCols:{}, // 批量导入必填的项目 tableData: [], //导入数据状态显示 @@ -674,6 +675,22 @@ export default { } }); + + // 获取系统参数 -- 人员登记必填列 + postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId: 'patient_register_required_field' }) + .then(res => { + if (res.code > -1) { + try { + this.masterCols = JSON.parse(res.data) + } catch (error) { + console.error(error) + } + } + }) + .finally(() => { + this.masterCols.patientName = "姓名" + }) + }, //清空进度数据数据 @@ -1251,6 +1268,13 @@ export default { }, + // 导入必填项验证 + checkValide(body){ + let msg = '' + // personnelTypeName,medicalTypeName,salesman + return msg + }, + //导入进行时 // startRow : 从第几行开始导入,同名判断交互时,续接导入 // startRowNameType : 续接导入的第1行,执行 同名判断模式, 3.不提示,按新人导入(前端不用管) @@ -1267,6 +1291,13 @@ export default { if (i == startRow) body.nameType = startRowNameType console.log(`this.choosedData[${i}],startRowNameType,body`) + // 判断是否必填: + let msg = checkValide(body) + if(msg){ + this.tableData.push(Object.assign({ importState: '导入失败', importDes: msg }, this.choosedData[i])) + continue + } + try { // 同一人判断 if (this.choosedSameMan.patientNo) { diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue index 26127db..5a79641 100644 --- a/src/views/fee-settings/Asbitem.vue +++ b/src/views/fee-settings/Asbitem.vue @@ -1439,7 +1439,7 @@ export default { diagnosisFunction: "", isContinueProcess: "N", isPictureRotate: "N", - isCheck: "N", + isCheck: "Y", // 检查项目比较多 isActive: "Y", collectItemTypeId: "", barcodeMode: "0", diff --git a/src/views/fee-settings/cardRegister.vue b/src/views/fee-settings/cardRegister.vue index fda5bfb..33096bb 100644 --- a/src/views/fee-settings/cardRegister.vue +++ b/src/views/fee-settings/cardRegister.vue @@ -1098,7 +1098,6 @@ export default { }); }, - //滚动加载数据 //滚动加载数据 scrollFull() { this.dom = this.$refs["info"].bodyWrapper; @@ -1176,8 +1175,6 @@ export default { // 开始导入时,清除选择的 文件 document.getElementById('fileNames').value = ''; } - - }, //导入完后,导入状态显示 @@ -1548,6 +1545,11 @@ export default { // 将Excel的数据转换成接口的数据 body = this.excelDataToApiBody(this.choosedData[i]); body.medicalCenterId = medicalCenterId + if(!body.cardBalance){ + body.cardBalance = 0 + }else{ + body.cardBalance = Number(body.cardBalance)||0 + } console.log(`this.choosedData[${i}],startRowNameType,body`, body); try {