diff --git a/src/api/dataApproval/enterpriseServiceDemand.js b/src/api/dataApproval/enterpriseServiceDemand.js index 1050558..521de4b 100644 --- a/src/api/dataApproval/enterpriseServiceDemand.js +++ b/src/api/dataApproval/enterpriseServiceDemand.js @@ -2,23 +2,29 @@ import request from "@/utils/request"; // 企业服务需求列表 export const listCasDemand = (params) => - request({ - url: "/business/dataReview/listCasDemand/list", - method: "GET", - params, - }); + request({ + url: "/business/dataReview/listCasDemand/list", + method: "GET", + params, + }); // 企业服务需求详情 export const getCasDemandInfo = (id) => - request({ - url: `/business/dataReview/getCasDemandInfo/${id}`, - method: "GET", - }); + request({ + url: `/business/dataReview/getCasDemandInfo/${id}`, + method: "GET", + }); // 修改企业服务需求 export const updateCasDemand = (data) => - request({ - url: `/business/dataReview/updateCasDemand`, - method: "PUT", - data, - }); + request({ + url: `/business/dataReview/updateCasDemand`, + method: "PUT", + data, + }); +// 修改企业服务需求 +export const deleteCasDemand = (ids) => + request({ + url: `/business/dataReview/listCasDemand/${ids}`, + method: "DELETE", + }); diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue index 1ee2bd3..33a092d 100644 --- a/src/layout/components/Sidebar/SidebarItem.vue +++ b/src/layout/components/Sidebar/SidebarItem.vue @@ -7,9 +7,6 @@ :value="getCount(basePath)" class="count-badge" > -
@@ -95,11 +99,12 @@ const onlyOneChild = ref({}); const userStore = useUserStore(); const getCount = (basePath) => { - console.log(basePath); if (basePath == "/approval/list") { return userStore.unApprovedBusiness; } else if (props.basePath == "/approval/dataList/approval") { return userStore.unApprovedExpert; + } else if (props.basePath == "/auditing/serviceDemand") { + return userStore.serviceDemandTotal; } else { return 0; } diff --git a/src/store/modules/user.js b/src/store/modules/user.js index a862fb0..96d91cf 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -4,6 +4,7 @@ import defAva from "@/assets/images/profile.jpg"; import md5 from "js-md5"; import { companyList } from "@/api/dataList/enterprise"; import { expertList } from "@/api/expert/expert"; +import { listCasDemand } from "../../api/dataApproval/enterpriseServiceDemand"; const useUserStore = defineStore("user", { state: () => ({ @@ -14,6 +15,7 @@ const useUserStore = defineStore("user", { permissions: [], unApprovedBusiness: 10, unApprovedExpert: 20, + serviceDemandTotal: 0, }), actions: { // 登录 @@ -75,9 +77,11 @@ const useUserStore = defineStore("user", { pageSize: 1, pageNum: 10, }), + listCasDemand(), ]); this.unApprovedBusiness = resps[0].total; this.unApprovedExpert = resps[1].total; + this.serviceDemandTotal = resps[2].total; }, unApprovedBusinessPlus() { this.unApprovedBusiness++; diff --git a/src/views/approval/dataList/add.vue b/src/views/approval/dataList/add.vue index 7ffaf82..7829408 100644 --- a/src/views/approval/dataList/add.vue +++ b/src/views/approval/dataList/add.vue @@ -14,7 +14,6 @@
审核拒绝 通过审核 - 通过审核
@@ -32,9 +31,9 @@ import { useRoute, useRouter } from "vue-router"; import { ElMessage } from "element-plus"; import useUserStore from "@/store/modules/user"; -const testCount = () => { - useUserStore().unApprovedBusinessPlus(); -}; +// const testCount = () => { +// useUserStore().unApprovedBusinessPlus(); +// }; const router = useRouter(); const route = useRoute(); diff --git a/src/views/components/ExpertForm/index.vue b/src/views/components/ExpertForm/index.vue index b2c04b6..32e18ea 100644 --- a/src/views/components/ExpertForm/index.vue +++ b/src/views/components/ExpertForm/index.vue @@ -48,6 +48,42 @@ --> + + + + + + + + + + + + + + + + + + + + + + + @@ -241,7 +277,7 @@ ref="researchsFormRef" /> --> - + /> --> - + @@ -441,13 +477,11 @@ const validateForm = async () => { ); } else if (formType.value == 2) { //企业 - const directionsFormValid = await directionsFormRef.value.validateForm(); //生产方向验证 + // const directionsFormValid = await directionsFormRef.value.validateForm(); //生产方向验证 return ( - formValid && - cityFormValid && - fieldFormValid && + formValid && cityFormValid && fieldFormValid // keywordsFormValid && - directionsFormValid + // directionsFormValid ); } else { throw "未知的formType"; diff --git a/src/views/dataAuditList/demand/index.vue b/src/views/dataAuditList/demand/index.vue index 0c8ed87..5f870d0 100644 --- a/src/views/dataAuditList/demand/index.vue +++ b/src/views/dataAuditList/demand/index.vue @@ -82,7 +82,12 @@ > diff --git a/src/views/dataAuditList/serviceDemand/index.vue b/src/views/dataAuditList/serviceDemand/index.vue index 4762d3e..7e75422 100644 --- a/src/views/dataAuditList/serviceDemand/index.vue +++ b/src/views/dataAuditList/serviceDemand/index.vue @@ -36,14 +36,23 @@ + + 批量审核 + - + + + + + --> @@ -103,16 +124,22 @@ diff --git a/src/views/website/activity/active/index.vue b/src/views/website/activity/active/index.vue index b8f48bc..49d8b6c 100644 --- a/src/views/website/activity/active/index.vue +++ b/src/views/website/activity/active/index.vue @@ -221,7 +221,7 @@ > - +