diff --git a/src/api/dataList/enterprise.js b/src/api/dataList/enterprise.js
index afd9ae8..7297d76 100644
--- a/src/api/dataList/enterprise.js
+++ b/src/api/dataList/enterprise.js
@@ -2,93 +2,110 @@ import request from "@/utils/request";
// 公司企业列表
export function companyList(params) {
- return request({
- url: "/business/enterprise/list",
- method: "get",
- params,
- });
+ return request({
+ url: "/business/enterprise/list",
+ method: "get",
+ params,
+ });
}
+
// 公司企业信息添加
export function companyAdd(data) {
- return request({
- url: "/business/enterprise",
- method: "post",
- data,
- });
+ return request({
+ url: "/business/enterprise",
+ method: "post",
+ data,
+ });
}
+
// 公司企业信息删除
export function companyDelete(ids) {
- return request({
- url: `/business/enterprise/${ids}`,
- method: "delete",
- });
+ return request({
+ url: `/business/enterprise/${ids}`,
+ method: "delete",
+ });
}
+
// 公司企业详细信息
export function companyDetail(id) {
- return request({
- url: `/business/enterprise/${id}`,
- method: "get",
- });
+ return request({
+ url: `/business/enterprise/${id}`,
+ method: "get",
+ });
}
+
// 公司企业信息修改
export function companyEdit(data) {
- return request({
- url: "/business/enterprise",
- method: "put",
- data,
- });
+ return request({
+ url: "/business/enterprise",
+ method: "put",
+ data,
+ });
}
export const companyExport = () => {
- return request({
- url: "/business/enterprise/export",
- method: "get",
- });
+ return request({
+ url: "/business/enterprise/export",
+ method: "get",
+ });
};
// 公司企业分配账号
export function allocateAccount(data) {
- return request({
- url: "/business/enterprise/allocateAccount",
- method: "post",
- data,
- });
+ return request({
+ url: "/business/enterprise/allocateAccount",
+ method: "post",
+ data,
+ });
}
+
// 公司企业获取账号
export function getAccount(id) {
- return request({
- url: `/business/enterprise/getAccount/${id}`,
- method: "get",
- });
+ return request({
+ url: `/business/enterprise/getAccount/${id}`,
+ method: "get",
+ });
}
// 公司企业重置密码
export function restPassword(id, password) {
- return request({
- url: `/business/enterprise/restPassword/${id}/${password}`,
- method: "put",
- });
+ return request({
+ url: `/business/enterprise/restPassword/${id}/${password}`,
+ method: "put",
+ });
}
+
// 公司企业获取会员详情
export function getCasVip(id) {
- return request({
- url: `/business/casVip/${id}`,
- method: "get",
- });
+ return request({
+ url: `/business/casVip/${id}`,
+ method: "get",
+ });
}
+
// 公司企业开通会员详情
export function openCasVip(data) {
- return request({
- url: `/business/casVip`,
- method: "post",
- data,
- });
+ return request({
+ url: `/business/casVip`,
+ method: "post",
+ data,
+ });
}
+
// 公司企业修改会员
export function updateCasVip(data) {
- return request({
- url: `/business/casVip`,
- method: "put",
- data,
- });
+ return request({
+ url: `/business/casVip`,
+ method: "put",
+ data,
+ });
}
+
+
+export const downloadEnterpriseTemplate = () => {
+ return request({
+ url: "/business/enterprise/importTemplate",
+ method: "get",
+ responseType: "blob",
+ });
+}
\ No newline at end of file
diff --git a/src/api/dataList/expert.js b/src/api/dataList/expert.js
index 0f734ac..cb2332f 100644
--- a/src/api/dataList/expert.js
+++ b/src/api/dataList/expert.js
@@ -44,33 +44,42 @@ import request from "@/utils/request";
// 专家分配账号
export function allocateAccount(data) {
- return request({
- url: "/business/casExpert/allocateAccount",
- method: "post",
- data,
- });
+ return request({
+ url: "/business/casExpert/allocateAccount",
+ method: "post",
+ data,
+ });
}
// 专家获取账号
export function getAccount(id) {
- return request({
- url: `/business/casExpert/getAccount/${id}`,
- method: "get",
- });
+ return request({
+ url: `/business/casExpert/getAccount/${id}`,
+ method: "get",
+ });
}
// 专家重置密码
export function restPassword(id, password) {
- return request({
- url: `/business/casExpert/restPassword/${id}/${password}`,
- method: "put",
- });
+ return request({
+ url: `/business/casExpert/restPassword/${id}/${password}`,
+ method: "put",
+ });
}
// 专家删除
export function expertDelete(ids) {
- return request({
- url: `/business/casExpert/${ids}`,
- method: "delete",
- });
+ return request({
+ url: `/business/casExpert/${ids}`,
+ method: "delete",
+ });
}
+
+
+export const downloadExpertTemplate = () => {
+ return request({
+ url: '/business/casExpert/importTemplate',
+ method: 'get',
+ responseType: 'blob'
+ })
+}
\ No newline at end of file
diff --git a/src/api/dataList/laboratory.js b/src/api/dataList/laboratory.js
index 9626d33..6e0bdde 100644
--- a/src/api/dataList/laboratory.js
+++ b/src/api/dataList/laboratory.js
@@ -2,80 +2,89 @@ import request from "@/utils/request";
// 实验室列表
export function casLaboratoryList(params) {
- return request({
- url: "/business/casLaboratory/list",
- method: "GET",
- params,
- });
+ return request({
+ url: "/business/casLaboratory/list",
+ method: "GET",
+ params,
+ });
}
// 新增
export function casLaboratoryAdd(data) {
- return request({
- url: "/business/casLaboratory",
- method: "POST",
- data,
- });
+ return request({
+ url: "/business/casLaboratory",
+ method: "POST",
+ data,
+ });
}
// 修改
export function casLaboratoryUpdate(data) {
- return request({
- url: "/business/casLaboratory",
- method: "PUT",
- data,
- });
+ return request({
+ url: "/business/casLaboratory",
+ method: "PUT",
+ data,
+ });
}
// id详情
export function casLaboratoryDetail(id) {
- return request({
- url: `/business/casLaboratory/${id}`,
- method: "GET",
- });
+ return request({
+ url: `/business/casLaboratory/${id}`,
+ method: "GET",
+ });
}
// 删除
export function casLaboratoryDelete(ids) {
- return request({
- url: `/business/casLaboratory`,
- method: "DELETE",
- data: {
- ids,
- },
- });
+ return request({
+ url: `/business/casLaboratory`,
+ method: "DELETE",
+ data: {
+ ids,
+ },
+ });
}
// 导入
export function casLaboratoryImportData(data) {
- return request({
- url: `/business/casLaboratory/importData`,
- method: "POST",
- data,
- });
+ return request({
+ url: `/business/casLaboratory/importData`,
+ method: "POST",
+ data,
+ });
}
// 实验室获取账号
export function getAccount(id) {
- return request({
- url: `/business/casLaboratory/getAccount/${id}`,
- method: "GET",
- });
+ return request({
+ url: `/business/casLaboratory/getAccount/${id}`,
+ method: "GET",
+ });
}
// 实验室分配账号
export function allocateAccount(data) {
- return request({
- url: "/business/casLaboratory/allocateAccount",
- method: "post",
- data,
- });
+ return request({
+ url: "/business/casLaboratory/allocateAccount",
+ method: "post",
+ data,
+ });
}
// 实验室重置密码
export function restPassword(id, password) {
- return request({
- url: `/business/casLaboratory/restPassword/${id}/${password}`,
- method: "put",
- });
+ return request({
+ url: `/business/casLaboratory/restPassword/${id}/${password}`,
+ method: "put",
+ });
}
+
+
+export const downloadLabTemplate = () => {
+ return request({
+ url: "/business/casLaboratory/importData",
+ method: "get",
+ responseType: "blob",
+ })
+}
\ No newline at end of file
diff --git a/src/api/dataList/research.js b/src/api/dataList/research.js
index 9e2e8c5..181cdc9 100644
--- a/src/api/dataList/research.js
+++ b/src/api/dataList/research.js
@@ -2,84 +2,92 @@ import request from "@/utils/request";
// 科研机构列表
export function researchList(params) {
- return request({
- url: "/business/casResearch/list",
- method: "GET",
- params,
- });
+ return request({
+ url: "/business/casResearch/list",
+ method: "GET",
+ params,
+ });
}
// 科研机构获取账号
export function getAccount(id) {
- return request({
- url: `/business/casResearch/getAccount/${id}`,
- method: "get",
- });
+ return request({
+ url: `/business/casResearch/getAccount/${id}`,
+ method: "get",
+ });
}
// 科研机构筛选信息
export function researchSelect(data) {
- return request({
- url: "/admin/v1/manage/research/select",
- method: "post",
- data,
- });
+ return request({
+ url: "/admin/v1/manage/research/select",
+ method: "post",
+ data,
+ });
}
// 科研机构信息添加
export function researchAdd(data) {
- return request({
- url: "/business/casResearch",
- method: "post",
- data,
- });
+ return request({
+ url: "/business/casResearch",
+ method: "post",
+ data,
+ });
}
// 科研机构信息修改
export function researchEdit(data) {
- return request({
- url: "/business/casResearch",
- method: "PUT",
- data,
- });
+ return request({
+ url: "/business/casResearch",
+ method: "PUT",
+ data,
+ });
}
// 机构重置密码
export function resetPassword(id, password) {
- return request({
- url: `/business/casResearch/restPassword/${id}/${password}`,
- method: "put",
- });
+ return request({
+ url: `/business/casResearch/restPassword/${id}/${password}`,
+ method: "put",
+ });
}
// 科研机构详细信息
export function researchDetail(id) {
- return request({
- url: `/business/casResearch/${id}`,
- method: "GET",
- });
+ return request({
+ url: `/business/casResearch/${id}`,
+ method: "GET",
+ });
}
// 科研机构详细信息
export function researchDelete(ids) {
- return request({
- url: `/business/casResearch/${ids}`,
- method: "DELETE",
- });
+ return request({
+ url: `/business/casResearch/${ids}`,
+ method: "DELETE",
+ });
}
// 分配账号
export function allocateAccount(data) {
- return request({
- url: "/business/casResearch/allocateAccount",
- method: "post",
- data,
- });
+ return request({
+ url: "/business/casResearch/allocateAccount",
+ method: "post",
+ data,
+ });
}
export function casResearchDelete(ids) {
- return request({
- url: `/business/casResearch/${ids}`,
- method: "DELETE",
- });
+ return request({
+ url: `/business/casResearch/${ids}`,
+ method: "DELETE",
+ });
}
+
+export const casResearchImportData = () => {
+ return request({
+ url: `/business/casResearch/importTemplate`,
+ method: "GET",
+ responseType: 'blob'
+ })
+}
\ No newline at end of file
diff --git a/src/utils/parameter.js b/src/utils/parameter.js
index 6db9be7..db9d51f 100644
--- a/src/utils/parameter.js
+++ b/src/utils/parameter.js
@@ -125,6 +125,6 @@ export const countryOptions = [
},
{
key: "kg",
- zh: "吉尔吉斯斯坦",
+ value: "吉尔吉斯斯坦",
}
];
\ No newline at end of file
diff --git a/src/views/components/ExpertForm/index.vue b/src/views/components/ExpertForm/index.vue
index a5f55ee..e93185b 100644
--- a/src/views/components/ExpertForm/index.vue
+++ b/src/views/components/ExpertForm/index.vue
@@ -338,14 +338,13 @@
-
+ :autosize="{ minRows: 6, maxRows: 8 }"
+ />
-
+
@@ -100,7 +100,7 @@
{{ siteList.find((el) => el.id === row.tenantId)?.name ?? "无" }}
-->
-
+
@@ -116,73 +116,73 @@
修改
+ icon="edit"
+ size="small"
+ type="text"
+ @click="handleDetail(row.id)"
+ >修改
删除
+ icon="delete"
+ size="small"
+ type="text"
+ @click="handleDelete(row.id)"
+ >删除
分配账号
+ icon="edit"
+ size="small"
+ type="text"
+ @click="openAssignAccount(row.id)"
+ >分配账号
重置密码
+ icon="edit"
+ size="small"
+ type="text"
+ @click="openResetPassword(row.id)"
+ >重置密码
开通会员
+ icon="edit"
+ size="small"
+ type="text"
+ @click="handleOpenVip(row.id)"
+ >开通会员
-
+
将文件拖到此处,或点击上传
@@ -193,6 +193,22 @@
/>是否更新已经存在的用户数据
-->
仅允许导入xls、xlsx格式文件。
+ 下载导入模版
+
+ 企业导入说明:
+
+ -
+ 关键词/生产方向 多个用|隔开 (人工智能|量子计算)
+
+ -
+
+ 所属领域 (>拼接上下级 多个用|隔开)
+
+ 例如 : 航空航天>航天技术>运载火箭技术|生物与新医药>中药、天然药物>创新药物研发技术
+
+
+
+
仅允许导入xls、xlsx格式文件。
+ 下载导入模版
+
+ 专家导入说明:
+
+ -
+ 从业时间格式 1976-01-01
+
+
+ -
+ 关键词/研究方向 多个用|隔开 (人工智能|量子计算)
+
+ -
+ 所属领域 (>拼接上下级 多个用|隔开)
+ 例如 : 航空航天>航天技术>运载火箭技术|生物与新医药>中药、天然药物>创新药物研发技术
+
+
-
-
-
-
+
+
+
+
@@ -91,49 +91,49 @@
-
-
-
+
+
+
修改
+ icon="edit"
+ size="small"
+ type="text"
+ @click="handleDetail(row.id)"
+ >修改
删除
+ icon="edit"
+ size="small"
+ type="text"
+ @click="handleDelete(row.id)"
+ >删除
分配账号
+ icon="edit"
+ size="small"
+ type="text"
+ @click="openAssignAccount(row.id)"
+ >分配账号
重置密码
+ icon="edit"
+ size="small"
+ type="text"
+ @click="openResetPassword(row.id)"
+ >重置密码
-
+
将文件拖到此处,或点击上传
@@ -195,6 +195,19 @@
/>是否更新已经存在的用户数据
-->
仅允许导入xls、xlsx格式文件。
+
+ 实验室导入说明:
+ 下载导入模版
+
+ -
+ 关键词/研究方向 多个用英文逗号(,)隔开 (人工智能,量子计算)
+
+ -
+ 所属领域 (>拼接上下级 多个用|隔开)
+ 航空航天>航天技术>运载火箭技术|生物与新医药>中药、天然药物>创新药物研发技术
+
+
+
@@ -69,35 +69,35 @@
批量删除
+ :disabled="!ids.length"
+ icon="delete"
+ type="danger"
+ @click="handleDelete()"
+ >批量删除
-
-
-
-
+
+
+
+
-
+
{{ row.createTime }}
@@ -106,66 +106,66 @@
修改
+ icon="edit"
+ size="small"
+ type="text"
+ @click="handleDetail(row.id)"
+ >修改
删除
+ icon="delete"
+ size="small"
+ type="text"
+ @click="handleDelete(row.id)"
+ >删除
分配账号
+ icon="edit"
+ size="small"
+ type="text"
+ @click="openAssignAccount(row.id)"
+ >分配账号
重置密码
+ icon="edit"
+ size="small"
+ type="text"
+ @click="openResetPassword(row.id)"
+ >重置密码
-
+
将文件拖到此处,或点击上传
@@ -176,13 +176,25 @@
/>是否更新已经存在的用户数据
-->
仅允许导入xls、xlsx格式文件。
-
+ 下载模板
+
+
+ 科研机构导入说明:
+
+ -
+ 研究方向 多个用|隔开 (人工智能|量子计算)
+
+ -
+ 所属领域 (>拼接上下级 多个用|隔开)
+ 航空航天>航天技术>运载火箭技术|生物与新医药>中药、天然药物>创新药物研发技术
+
+
@@ -195,34 +207,34 @@
@@ -230,28 +242,28 @@
@@ -263,18 +275,18 @@