diff --git a/src/request/enterprise_management.js b/src/request/enterprise_management.js index 8537a6d..76a7bbd 100644 --- a/src/request/enterprise_management.js +++ b/src/request/enterprise_management.js @@ -30,7 +30,7 @@ export const setUserResetPassword = (params) => post("/corpinfo/resetPwd", params); // 用户管理重置密码 export const getUserScheduling = (params) => post("/shiftworkrules/listAll", params); // 用户管理获取排班 -export const setUserImport = (params) => upload("/user/readExcel2", params); // 用户管理导入 +export const setUserImport = (params) => upload("/user/readExcel4", params); // 用户管理导入 export const setUserLearnersImport = (params) => upload("/user/readExcel3", params); // 用户管理在线学习人员导入 export const getUserInfo = (params) => post("/user/goAddUser", params); // 用户管理添加获取信息 diff --git a/src/views/enterprise_management/user/index.vue b/src/views/enterprise_management/user/index.vue index 5c89dda..61a899b 100644 --- a/src/views/enterprise_management/user/index.vue +++ b/src/views/enterprise_management/user/index.vue @@ -79,9 +79,6 @@ 导入 - - 在线学习人员导入 - @@ -191,15 +188,9 @@ - { fnImportDialogChangeShow(); fnResetPaginationTransfer(); }; -const fnImportLearnersDialogChangeShow = () => { - data.importLearnersDialogVisible = !data.importLearnersDialogVisible; -}; -const fnSubmitLearnersImport = async (formData) => { - const resData = await setUserLearnersImport(formData); - ElMessage.success(resData.msg); - fnImportLearnersDialogChangeShow(); - fnResetPaginationTransfer(); -}; const fnSchedule = (row) => { data.scheduleDialog.visible = true; data.scheduleDialog.info = row; diff --git a/src/views/enterprise_management/user_practitioner/add.vue b/src/views/enterprise_management/user_practitioner/add.vue index 35677f4..7964a23 100644 --- a/src/views/enterprise_management/user_practitioner/add.vue +++ b/src/views/enterprise_management/user_practitioner/add.vue @@ -12,7 +12,7 @@ - + - + - + - + - + - + - + { formData.append(key, data.form[key]); }); + formData.PERSONNEL_TYPE = data.form.PERSONNEL_TYPE.join(",") formData.delete("ID_CARD_VALIDITY"); formData.delete("DRIVING_MODEL_ARR"); formData.delete("DRIVER_LICENSE_VALIDITY"); diff --git a/src/views/enterprise_management/user_practitioner/edit.vue b/src/views/enterprise_management/user_practitioner/edit.vue index f7011da..711f2f5 100644 --- a/src/views/enterprise_management/user_practitioner/edit.vue +++ b/src/views/enterprise_management/user_practitioner/edit.vue @@ -12,7 +12,7 @@ - + - + - + - + - + - + - + { data.oldPostId = form.POST_ID; data.oldDepartId = form.DEPARTMENT_ID; form.userCerFile = addingPrefixToFile(resData.userCerList); - + form.PERSONNEL_TYPE = form.PERSONNEL_TYPE.split(",") resData.certificateList.forEach((item) => { if (item.CERTIFICATE_CATEGORY === "1") { data.fileForm.ID_CARD_FRONT = addingPrefixFile(item.ID_PHOTO_FRONT); @@ -1153,6 +1153,7 @@ const fnSubmit = debounce( Object.keys(data.form).forEach((key) => { formData.append(key, data.form[key]); }); + formData.PERSONNEL_TYPE = data.form.PERSONNEL_TYPE.join(",") formData.delete("ID_CARD_VALIDITY"); formData.delete("DRIVING_MODEL_ARR"); formData.delete("DRIVER_LICENSE_VALIDITY");