From b5c1eeb94cc7c596ff24d8d0dae83c221262869e Mon Sep 17 00:00:00 2001 From: lvweijie <741689394@qq.com> Date: Fri, 9 Sep 2022 14:40:05 +0800 Subject: [PATCH] 11 --- src/api/Businessneeds/index.js | 7 + src/api/expert/expert.js | 7 + src/api/patent/index.js | 15 + src/api/thesis/index.js | 34 + src/views/Enterpriseproducts/index.vue | 63 ++ src/views/achievement/index.vue | 64 ++ .../Businessneeds/Approvaldetails.vue | 76 ++ src/views/components/ExpertForm/index.vue | 24 +- src/views/dataList/expert/add.vue | 2 +- src/views/dataList/expert/claim.vue | 115 +++ src/views/dataList/expert/index.vue | 96 +- src/views/dataList/thesis/index.vue | 205 ++++ src/views/demand/index.vue | 78 ++ .../expert/dataList/{add.vue => approval.vue} | 9 +- src/views/expert/dataList/index.vue | 14 +- src/views/index.vue | 911 +----------------- 16 files changed, 753 insertions(+), 967 deletions(-) create mode 100644 src/api/Businessneeds/index.js create mode 100644 src/api/patent/index.js create mode 100644 src/api/thesis/index.js create mode 100644 src/views/Enterpriseproducts/index.vue create mode 100644 src/views/achievement/index.vue create mode 100644 src/views/components/Businessneeds/Approvaldetails.vue create mode 100644 src/views/dataList/expert/claim.vue create mode 100644 src/views/dataList/thesis/index.vue create mode 100644 src/views/demand/index.vue rename src/views/expert/dataList/{add.vue => approval.vue} (90%) diff --git a/src/api/Businessneeds/index.js b/src/api/Businessneeds/index.js new file mode 100644 index 0000000..ffa001a --- /dev/null +++ b/src/api/Businessneeds/index.js @@ -0,0 +1,7 @@ +import request from '@/utils/request' +// 获取企业需求列表 +export const businessList=(params)=>request({ + url:"/business/dataReview/technologyDemandList", + method:'get', + params +}) \ No newline at end of file diff --git a/src/api/expert/expert.js b/src/api/expert/expert.js index 65b114f..7d2bad4 100644 --- a/src/api/expert/expert.js +++ b/src/api/expert/expert.js @@ -19,4 +19,11 @@ export function expertList(params) { export const companyDetail=(id)=>request({ url:`/business/casExpert/${id}`, method:'get', + }) + + // 修改专家详情 + export const companyEdit =(data)=>request({ + url:'/business/casExpert', + method:'put', + data }) \ No newline at end of file diff --git a/src/api/patent/index.js b/src/api/patent/index.js new file mode 100644 index 0000000..52204a3 --- /dev/null +++ b/src/api/patent/index.js @@ -0,0 +1,15 @@ +import request from '@/utils/request' +// 获取专利列表 +export function expertList(id) { + return request({ + url:`/business/casExpert/patent/${id}`, + method:"get" + }); + } + + // 解除专利 + export const delList=(params)=>request({ + url:'/business/casExpert/kill', + method:'get', + params + }) diff --git a/src/api/thesis/index.js b/src/api/thesis/index.js new file mode 100644 index 0000000..2f26548 --- /dev/null +++ b/src/api/thesis/index.js @@ -0,0 +1,34 @@ +import request from '@/utils/request' +// 获取论文列表 +export function expertList(params) { + return request({ + url:"/business/casPaper/list", + method:"get", + params + }); + } +// 删除逻辑 +export const delItem=(ids)=>request({ + url:`/business/casPaper/${ids}`, + method:'DELETE' +}) + +// 新增接口 +export const addItem=(data)=>request({ + url:'/business/casPaper', + method:'post', + data +}) + +// 获取详情 +export const editItem=(id)=>request({ + url:`/business/casPaper/${id}`, + method:'GET' +}) + +// 修改论文 +export const rebtnItem=(data)=>request({ + url:'/business/casPaper', + method:'PUT', + data +}) \ No newline at end of file diff --git a/src/views/Enterpriseproducts/index.vue b/src/views/Enterpriseproducts/index.vue new file mode 100644 index 0000000..641e361 --- /dev/null +++ b/src/views/Enterpriseproducts/index.vue @@ -0,0 +1,63 @@ + + + + \ No newline at end of file diff --git a/src/views/achievement/index.vue b/src/views/achievement/index.vue new file mode 100644 index 0000000..7db22e9 --- /dev/null +++ b/src/views/achievement/index.vue @@ -0,0 +1,64 @@ + + + + \ No newline at end of file diff --git a/src/views/components/Businessneeds/Approvaldetails.vue b/src/views/components/Businessneeds/Approvaldetails.vue new file mode 100644 index 0000000..4c066df --- /dev/null +++ b/src/views/components/Businessneeds/Approvaldetails.vue @@ -0,0 +1,76 @@ + + + + \ No newline at end of file diff --git a/src/views/components/ExpertForm/index.vue b/src/views/components/ExpertForm/index.vue index 9a1b10d..758ffb4 100644 --- a/src/views/components/ExpertForm/index.vue +++ b/src/views/components/ExpertForm/index.vue @@ -90,7 +90,7 @@ - + + + + + @@ -219,7 +227,7 @@ ref="keywordsFormRef" /> - + /> --> +
+ + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + + + + +
+ + + + \ No newline at end of file diff --git a/src/views/dataList/expert/index.vue b/src/views/dataList/expert/index.vue index 11dc38d..72bd17f 100644 --- a/src/views/dataList/expert/index.vue +++ b/src/views/dataList/expert/index.vue @@ -60,6 +60,7 @@ plain icon="download" size="default" + @click="handleExport" >导出 @@ -75,11 +76,11 @@ - - + + @@ -166,9 +168,13 @@ import SiteOptions from "@/views/components/SiteOptions"; import { tenantSelect } from "@/api/subPlatform/tenant"; import {expertList} from '@/api/expert/expert' -import { getToken } from "@/utils/auth"; import { useRouter } from "vue-router"; +import { getToken } from "@/utils/auth"; +import { tansParams, blobValidate } from "@/utils/ruoyi"; import FieldOptions from "@/views/components/FieldOptions"; +import { ElLoading, ElMessageBox } from "element-plus"; +import dayjs from "dayjs"; +import request from "@/utils/request"; const router=useRouter() const siteList = ref([]); const dataList = ref([]); @@ -195,6 +201,50 @@ const upload = reactive({ // 上传的地址 url: import.meta.env.VITE_APP_BASE_API + "/business/enterprise/importData", }); + +const { queryParams } = toRefs(data); +// 获取站点列表 +const getSiteList = async () => { + const resp = await tenantSelect(); + siteList.value = resp.rows; +}; +/** 查询专家列表 */ +const getList = async () => { + const resp = await expertList(queryParams.value); + dataList.value = resp.rows; + total.value = resp.total; +}; +// 新增页面跳转 +const handleAdd = () => { + router.push({ + path: "/dataList/expert/add", + }); +}; +// 修改页面 获取详情 +const handleDetail = (id) => { + router.push({ + path: "/dataList/expert/add", + query: { id }, + }); +}; +// 认领专利 +const handleClaim=(id)=>{ + router.push({ + path: "/dataList/expert/claim", + query:{id} + }); +} +/** 搜索按钮操作 */ +const handleQuery = () => { + queryParams.value.pageNum = 1; + getList(); +}; +/** 重置按钮操作 */ +const resetQuery = () => { + queryParams.value.name='' + queryParams.value.tenantId='' + handleQuery() +}; const uploadRef = ref(null); /** 导入按钮操作 */ function handleImport() { @@ -286,42 +336,6 @@ const handleExport = () => { ); }); }; -const { queryParams } = toRefs(data); -// 获取站点列表 -const getSiteList = async () => { - const resp = await tenantSelect(); - siteList.value = resp.rows; -}; -/** 查询专家列表 */ -const getList = async () => { - const resp = await expertList(queryParams.value); - dataList.value = resp.rows; - total.value = resp.total; -}; -// 新增页面跳转 -const handleAdd = () => { - router.push({ - path: "/dataList/expert/add", - }); -}; -// 修改页面 获取详情 -const handleDetail = (id) => { - router.push({ - path: "/dataList/expert/add", - query: { id }, - }); -}; -/** 搜索按钮操作 */ -const handleQuery = () => { - queryParams.value.pageNum = 1; - getList(); -}; -/** 重置按钮操作 */ -const resetQuery = () => { - queryParams.value.name='' - queryParams.value.tenantId='' - handleQuery() -}; getSiteList() getList() \ No newline at end of file diff --git a/src/views/dataList/thesis/index.vue b/src/views/dataList/thesis/index.vue new file mode 100644 index 0000000..34da458 --- /dev/null +++ b/src/views/dataList/thesis/index.vue @@ -0,0 +1,205 @@ + + \ No newline at end of file diff --git a/src/views/demand/index.vue b/src/views/demand/index.vue new file mode 100644 index 0000000..a0b8427 --- /dev/null +++ b/src/views/demand/index.vue @@ -0,0 +1,78 @@ + + + + \ No newline at end of file diff --git a/src/views/expert/dataList/add.vue b/src/views/expert/dataList/approval.vue similarity index 90% rename from src/views/expert/dataList/add.vue rename to src/views/expert/dataList/approval.vue index 3d8b42f..6a11dc4 100644 --- a/src/views/expert/dataList/add.vue +++ b/src/views/expert/dataList/approval.vue @@ -9,8 +9,8 @@ ref="expertFormRef" /> - 取消 - 提交 + 拒绝 + 通过 @@ -21,7 +21,7 @@ import { companyAdd, companyDetail, companyEdit, -} from "@/api/dataList/enterprise"; +} from "@/api/expert/expert"; import { reactive, toRefs } from "vue"; import { useRoute, useRouter } from "vue-router"; import { ElMessage } from "element-plus"; @@ -55,10 +55,11 @@ const cancel = () => { router.back(); tab.closeOpenPage(); }; -const submitForm = async () => { +const submitForm = async (state) => { const valid = await expertFormRef.value.validateForm(); if (valid) { if (form.value.id != undefined) { + form.value.examineStatus=state await companyEdit(form.value); cancel(); ElMessage.success("修改成功"); diff --git a/src/views/expert/dataList/index.vue b/src/views/expert/dataList/index.vue index 5133c34..c48ed95 100644 --- a/src/views/expert/dataList/index.vue +++ b/src/views/expert/dataList/index.vue @@ -37,17 +37,17 @@ - + - - - - + + + +