williamet/cas_cloud_admin_i18n
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
williamet
2024-09-07 22:48:51 +08:00
parent 174d22ecf7
commit 199cc238b3
9 changed files with 48 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/dataApproval/count.js
View File

@ -6,7 +6,7 @@ export const getUnApprovalCount = (name) =>
method: "get",
params: {
name,
type: "1",
type: "0",
},
});

21
src/layout/components/Sidebar/SidebarItem.vue
View File

@ -12,6 +12,7 @@
`/approval/data-list/laboratory`,
].includes(basePath)
"
:value="getCount(basePath)"
class="count-badge"
>
<!-- FIXME:无限递归bug-->
@ -41,6 +42,12 @@
"
/>
<template #title
><span
:title="hasTitle(onlyOneChild.meta.title)"
class="menu-title"
>{{ onlyOneChild.meta.title }}</span
></template>
<!-- <template #title
><span
:title="hasTitle(onlyOneChild.meta.title)"
class="menu-title"
@ -56,7 +63,7 @@
: onlyOneChild.meta.title
}}</span
></template
>
>-->
</el-menu-item>
</app-link>
</template>
@ -114,17 +121,17 @@ const onlyOneChild = ref({});
const userStore = useUserStore();
const getCount = (basePath) => {
if (basePath == "/approval/list") {
if (basePath === "/approval/list") {
return userStore.unApprovedBusiness;
} else if (props.basePath == "/approval/dataList/approval") {
} else if (props.basePath === "/approval/dataList/approval") {
return userStore.unApprovedExpert;
} else if (props.basePath == "/auditing/achievement") {
} else if (props.basePath === "/auditing/achievement") {
return userStore.unApprovedAchivement;
} else if (props.basePath == "/auditing/demand") {
} else if (props.basePath === "/auditing/demand") {
return userStore.unApprovedTechnology;
} else if (props.basePath == "/auditing/Enterpriseproducts") {
} else if (props.basePath === "/auditing/Enterpriseproducts") {
return userStore.unApprovedProduct;
} else if (props.basePath == "/auditing/serviceDemand") {
} else if (props.basePath === "/auditing/serviceDemand") {
return userStore.unApprovedService;
} else if (props.basePath === "/approval/data-list/laboratory") {
return userStore.unApprovedLab;

12
src/store/modules/user.js
View File

@ -114,7 +114,7 @@ const useUserStore = defineStore("user", {
pageSize: 1,
pageNum: 10,
});
this.unApprovedExpert = resp.total;
this.unApprovedExpert = resp.rows.length;
},
async getUnApprovedAchivement() {
const resp = await getUnApprovalCount("achievement");
@ -125,12 +125,18 @@ const useUserStore = defineStore("user", {
this.unApprovedTechnology = resp.data ?? 0;
},
async getUnApprovedService() {
// const resp = await getUnApprovalCount("service");
const resp = await getUnApprovalCount("service");
this.unApprovedService = resp.data ?? 0;
},
async getUnApprovedProduct() {
const resp = await getUnApprovalCount("product");
this.unApprovedProduct = resp.data ?? 0;
// const resp = await getUnApprovalCount("product");
const resp = await enterpriseProductApprovalList({
status: 0,
pageSize: 1,
pageNum: 10,
})
this.unApprovedProduct = resp.total ?? 0;
},
async getServiceDemandTotal() {

2
src/views/components/ExpertForm/index.vue
View File

@ -233,7 +233,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="formType == 1">
<el-col :span="24">
<el-form-item label="所属单位" prop="workplace">
<el-input v-model="modelValue.workplace" />

4
src/views/dataAuditList/Enterpriseproducts/approval.vue
View File

@ -228,8 +228,8 @@
</el-form>
</div>
<div :style="{ marginLeft: labelWidth + 'px' }">
<el-button @click="submitForm('2')">审核拒绝</el-button>
<el-button type="primary" @click="submitForm('1')">通过审核</el-button>
<!-- <el-button @click="submitForm('2')">审核拒绝</el-button>-->
<el-button type="primary" @click="submitForm('1')">审阅</el-button>
</div>
</div>
</template>

7
src/views/dataAuditList/Enterpriseproducts/index.vue
View File

@ -11,7 +11,7 @@
@change="handleQuery"
>
<!-- <el-radio-button :label="1">已发布</el-radio-button> -->
<el-radio-button :label="0">待审核</el-radio-button>
<!-- <el-radio-button :label="0">待审核</el-radio-button>-->
<el-radio-button :label="1">已通过</el-radio-button>
<el-radio-button :label="2">已驳回</el-radio-button>
</el-radio-group>
@ -101,9 +101,8 @@
type="primary"
round
size="small"
:disabled="queryParams.status != 0"
@click="handleApproval(row.id)"
>审批
>审阅
</el-button>
<el-button
type="danger"
@ -150,7 +149,7 @@ const data = reactive({
queryParams: {
pageNum: 1,
pageSize: 10,
status: 0,
status: 1,
},
});
const { queryParams } = toRefs(data);

9
src/views/dataAuditList/achievement/approval.vue
View File

@ -160,8 +160,9 @@
</el-form>
</div>
<div :style="{ marginLeft: labelWidth + 'px' }">
<el-button @click="submitForm('2')">审核拒绝</el-button>
<el-button type="primary" @click="submitForm('1')">通过审核</el-button>
<!-- <el-button @click="submitForm('2')">审核拒绝</el-button>-->
<!-- <el-button type="primary" @click="submitForm('1')">通过审核</el-button>-->
<el-button type="primary" @click="submitBack()">返回</el-button>
</div>
</div>
</template>
@ -224,6 +225,10 @@ const submitForm = async (status) => {
router.back();
};
const submitBack = () => {
router.back();
};
getAchievementInfo();
</script>

14
src/views/dataAuditList/achievement/index.vue
View File

@ -12,7 +12,7 @@
@change="handleQuery"
>
<!-- <el-radio-button :label="1">已发布</el-radio-button> -->
<el-radio-button :label="0">待审核</el-radio-button>
<!-- <el-radio-button :label="0">待审核</el-radio-button>-->
<el-radio-button :label="1">已通过</el-radio-button>
<el-radio-button :label="2">已驳回</el-radio-button>
</el-radio-group>
@ -92,11 +92,11 @@
}}
</template>
</el-table-column>
<!-- <el-table-column
label="所属研究机构"
<el-table-column
label="所属单位"
align="center"
prop=""
></el-table-column> -->
prop="workplace"
></el-table-column>
<!-- <el-table-column label="站点" align="center">
<template #default="{ row }">
{{
@ -112,7 +112,7 @@
<el-table-column align="center" label="操作">
<template #default="{ row }">
<el-button round size="small" type="primary" @click="approval(row.id)"
>审批
>审阅
</el-button>
<el-button
round
@ -154,7 +154,7 @@ const data = reactive({
queryParams: {
pageNum: 1,
pageSize: 10,
status: 0,
status: 1,
},
});

6
src/views/website/activity/active/signUp.vue
View File

@ -49,12 +49,12 @@
</el-row> -->
<el-table v-loading="loading" :data="dataList">
<el-table-column
<!-- <el-table-column
label="活动id"
prop="activityId"
align="center"
width="80"
/>
/>-->
<el-table-column
label="活动报名id"
prop="id"
@ -62,6 +62,8 @@
width="100"
/>
<el-table-column label="姓名" prop="name" align="center" />
<el-table-column label="职位" prop="post" align="center" />
<el-table-column label="职称" prop="jobTitle" align="center" />
<!-- <el-table-column label="分类" prop="name" align="center" /> -->
<!-- <el-table-column label="所属领域" prop="name" align="center" /> -->
<el-table-column label="手机号" prop="phone" align="center" />