diff --git a/src/api/admin/laboratory/achievement.js b/src/api/admin/laboratory/achievement.js
index 03445d3..3f3580b 100644
--- a/src/api/admin/laboratory/achievement.js
+++ b/src/api/admin/laboratory/achievement.js
@@ -1,17 +1,28 @@
import request from "@/utils/request";
-// 实验室专利成果
+// 专家成果
export const achievementList = (params) => {
- return request({
- url: `/app/laboratory/achievementList`,
- method: "GET",
- params,
- });
+ return request({
+ url: `/app/laboratory/achievementList`,
+ method: "GET",
+ params,
+ });
};
+// 实验室成果
+export const laboratoryAchievementList = (params) => {
+ return request({
+ url: `/app/laboratory/laboratoryAchievementList`,
+ method: "GET",
+ params,
+ });
+}
+
export const deleteAchievements = (ids) => {
- return request({
- url: `/app/laboratory/deleteAchievements/${ids}`,
- method: "DELETE",
- });
+ return request({
+ url: `/app/laboratory/deleteAchievements/${ids}`,
+ method: "DELETE",
+ });
};
+
+
diff --git a/src/api/admin/laboratory/expert.js b/src/api/admin/laboratory/expert.js
index 3f8e5c8..ef32a18 100644
--- a/src/api/admin/laboratory/expert.js
+++ b/src/api/admin/laboratory/expert.js
@@ -40,7 +40,7 @@ export const deleteLabPatentByIds = (ids) => {
/**
- * 实验室专利列表
+ * 实验室未绑定专家列表
* @param params
* @return {*}
*/
diff --git a/src/api/admin/research/achievement.js b/src/api/admin/research/achievement.js
index 10d08e5..9ecedee 100644
--- a/src/api/admin/research/achievement.js
+++ b/src/api/admin/research/achievement.js
@@ -2,16 +2,25 @@ import request from "@/utils/request";
// 实验室专利成果
export const achievementList = (params) => {
- return request({
- url: `/app/research/achievementList`,
- method: "GET",
- params,
- });
+ return request({
+ url: `/app/research/achievementList`,
+ method: "GET",
+ params,
+ });
};
+// 科研成果
+export const researchAchievementList = (params) => {
+ return request({
+ url: `/app/research/researchAchievementList`,
+ method: "GET",
+ params,
+ });
+}
+
export const deleteAchievements = (ids) => {
- return request({
- url: `/app/research/deleteAchievements/${ids}`,
- method: "DELETE",
- });
+ return request({
+ url: `/app/research/deleteAchievements/${ids}`,
+ method: "DELETE",
+ });
};
diff --git a/src/assets/achievement_import_description.txt b/src/assets/achievement_import_description.txt
new file mode 100644
index 0000000..b59608e
--- /dev/null
+++ b/src/assets/achievement_import_description.txt
@@ -0,0 +1,22 @@
+1. ʡͺ̨Ӧ(: ,дɰʡ, ϷвдɺϷ)
+
+2.
+ a. ͨ >
+ ҽҩ>ҩȻҩ>ҩз
+ b. ͨ /
+ ҽҩ>ҩȻҩ>ҩз/>֪ʶȨɹת
+
+3. Ӧÿͻ
+ ͨ , (ӢĶ)
+
+4. ؼ
+ ͨ , (ӢĶ)
+
+5. ɹ:
+ з СԽ ͨС Խ ͨ ɹģ
+
+6. ɹ:
+ Ƚ Ƚ
+
+7. ģʽ:
+ ת ˾ гƹ
\ No newline at end of file
diff --git a/src/assets/achievement_import_template.xlsx b/src/assets/achievement_import_template.xlsx
new file mode 100644
index 0000000..d151d89
Binary files /dev/null and b/src/assets/achievement_import_template.xlsx differ
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 50f0623..398ae8c 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -1,24 +1,24 @@
diff --git a/src/views/components/AgentForm/index.vue b/src/views/components/AgentForm/index.vue
index 41150ff..ffc9f03 100644
--- a/src/views/components/AgentForm/index.vue
+++ b/src/views/components/AgentForm/index.vue
@@ -1,13 +1,13 @@
基本信息
-
+
@@ -15,10 +15,10 @@
-
+
-
-
+
+
@@ -34,7 +34,7 @@
-
+
@@ -43,23 +43,23 @@
-
+
@@ -69,9 +69,9 @@
身份证人像面
@@ -79,9 +79,9 @@
身份证国徽面
@@ -89,9 +89,9 @@
手持身份证人像面
@@ -107,8 +107,8 @@
@@ -120,7 +120,7 @@