Merge remote-tracking branch 'origin/dev_NEW_pro' into dev-new_pro_OA

yyb

2 天以前 5470429a79313630a7ddef601de1d89e7dada754

 src/views/personnelManagement/employeeRecord/index.vue

@@ -386,7 +386,11 @@
  upload.open = false
  upload.isUploading = false
  proxy.$refs["uploadRef"].handleRemove(file)
  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
  if (response.code !== 200) {
    proxy.$modal.msgError(response.msg)
  } else {
    proxy.$modal.msgSuccess(response.msg)
  }
  getList()
}