Commit 06bc2516 authored by chenjiahao's avatar chenjiahao

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/router/routes/index.ts
#	src/views/AAAFont/nationalPolicy/index.vue
parents b2d233a2 b145b4b6
...@@ -102,9 +102,9 @@ export const PCFontRoute: AppRouteRecordRaw = { ...@@ -102,9 +102,9 @@ export const PCFontRoute: AppRouteRecordRaw = {
}, },
}, },
{ {
path: '/aaaFont/nationalPolicy/detail', path: '/aaaFont/nationalPolicy/details',
name: 'nationalPolicyDetail', name: 'nationalPolicyDetail1',
component: () => import('@/views/AAAFont/nationalPolicy/detail.vue'), component: () => import('@/views/AAAFont/nationalPolicy/details/index.vue'),
meta: { meta: {
title: '', title: '',
}, },
......
This diff is collapsed.
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<span>2024-12-17</span> <span>2024-12-17</span>
</div> </div>
</div> </div>
<div class="right-li"> <div class="right-li" @click="handleClick">
<div class="li-left"> <div class="li-left">
<el-tag type="danger" style="font-size: 14px">国家政策</el-tag> <el-tag type="danger" style="font-size: 14px">国家政策</el-tag>
</div> </div>
...@@ -109,8 +109,11 @@ ...@@ -109,8 +109,11 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { router } from '@/router';
import { ref } from 'vue'; import { ref } from 'vue';
import { useRouter, onBeforeRouteLeave } from 'vue-router';
const fileType = ref(''); // 文件下载后缀 const fileType = ref(''); // 文件下载后缀
const choseFile = ref({}); // 选择文件对象 const choseFile = ref({}); // 选择文件对象
const downloadType = ref(''); // 1是本地文件下载,2是oss文件下载 const downloadType = ref(''); // 1是本地文件下载,2是oss文件下载
...@@ -130,6 +133,7 @@ ...@@ -130,6 +133,7 @@
fileUploadName: '项目推荐汇总表.xlsx', fileUploadName: '项目推荐汇总表.xlsx',
fileAddress: '/profile/attachments/project-recommendation-summary.xlsx', fileAddress: '/profile/attachments/project-recommendation-summary.xlsx',
}); });
document.querySelectorAll('.right-li').forEach((element) => { document.querySelectorAll('.right-li').forEach((element) => {
element.addEventListener('click', () => { element.addEventListener('click', () => {
console.log('click'); console.log('click');
......
<template>
<!-- <div v-if="getShow">-->
<Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef">
<FormItem name="account" class="enter-x">
<Input
class="fix-auto-fill"
size="large"
v-model:value="formData.account"
placeholder="请输入用户名"
:placeholder="t('sys.login.userName')"
/>
</FormItem>
<FormItem name="mobile" class="enter-x">
<Input
size="large"
v-model:value="formData.mobile"
:placeholder="t('sys.login.mobile')"
class="fix-auto-fill"
/>
</FormItem>
<FormItem name="sms" class="enter-x">
<CountdownInput
size="large"
class="fix-auto-fill"
v-model:value="formData.sms"
:placeholder="t('sys.login.smsCode')"
/>
</FormItem>
<FormItem name="password" class="enter-x">
<InputPassword
size="large"
v-model:value="formData.password"
placeholder="请输入密码"
:placeholder="t('sys.login.password')"
/>
</FormItem>
<FormItem name="confirmPassword" class="enter-x">
<InputPassword
size="large"
visibilityToggle
v-model:value="formData.confirmPassword"
placeholder="请输入重复密码"
:placeholder="t('sys.login.confirmPassword')"
/>
</FormItem>
<FormItem class="enter-x" name="policy">
<!-- No logic, you need to deal with it yourself -->
<Checkbox v-model:checked="formData.policy" size="small">
{{ t('sys.login.policy') }}
</Checkbox>
</FormItem>
<Button
type="primary"
class="enter-x"
size="large"
block
@click="handleRegister"
:loading="loading"
>
{{ t('sys.login.registerButton') }}
</Button>
<!-- <Button size="large" block class="mt-4 enter-x" @click="handleBackLogin">-->
<!-- {{ t('sys.login.backSignIn') }}-->
<!-- </Button>-->
</Form>
<!-- </div>-->
</template>
<script lang="ts" setup>
import { reactive, ref, unref, computed } from 'vue';
import { Form, Input, Button, Checkbox } from 'ant-design-vue';
import { StrengthMeter } from '@/components/StrengthMeter';
import { CountdownInput } from '@/components/CountDown';
import { useI18n } from '@/hooks/web/useI18n';
import { useLoginState, useFormRules, useFormValid, LoginStateEnum } from '../Login/useLogin';
const FormItem = Form.Item;
const InputPassword = Input.Password;
const { t } = useI18n();
const { handleBackLogin, getLoginState } = useLoginState();
const formRef = ref();
const loading = ref(false);
const formData = reactive({
account: '',
password: '',
confirmPassword: '',
mobile: '',
sms: '',
policy: false,
});
const { getFormRules } = useFormRules(formData);
const { validForm } = useFormValid(formRef);
const getShow = computed(() => unref(getLoginState) === LoginStateEnum.REGISTER);
async function handleRegister() {
const data = await validForm();
if (!data) return;
console.log(data);
}
</script>
<template> <template>
<div id="login"> <div id="register">
<el-container> <el-container>
<el-header class="header"> <el-header class="header">
<div @click="handleTitle" class="official-title"> 数据要素交易服务平台 </div> <div @click="handleTitle" class="official-title"> 数据要素交易服务平台 </div>
<div class="分割线"></div> <div class="分割线"></div>
<div class="title-right">注册</div> <div class="title-right">注册</div>
</el-header> </el-header>
<div class="login-box"> <div class="register-box">
<div class="login-win"> <div class="register-win">
<div class="login-title"> <div class="win-box">
<span class="login-title-text">用户登录</span> <div class="register-title">
<span class="register-title-text">欢迎注册</span>
</div>
<RegisterForm/>
</div> </div>
<LoginForm/>
</div> </div>
</div> </div>
</el-container> </el-container>
...@@ -20,11 +22,11 @@ ...@@ -20,11 +22,11 @@
<script> <script>
import Icon from '@/components/Icon/Icon.vue'; import Icon from '@/components/Icon/Icon.vue';
import LoginForm from '.././Login/LoginForm.vue'; import RegisterForm from "./RegisterForm.vue";
export default { export default {
name: 'register', name: 'register',
components: { LoginForm, Icon }, components: {RegisterForm, Icon },
data() { data() {
return {}; return {};
}, },
...@@ -42,7 +44,7 @@ export default { ...@@ -42,7 +44,7 @@ export default {
body { body {
margin: 0; margin: 0;
} }
#login { #register {
min-width: 1366px; min-width: 1366px;
width: auto; width: auto;
position: relative; position: relative;
...@@ -92,34 +94,40 @@ body { ...@@ -92,34 +94,40 @@ body {
background-color: #dce7fb; background-color: #dce7fb;
} }
.login-box { .register-box {
width: 100%; width: 100%;
aspect-ratio: 1920 / 863; /* 或者其他的宽高比 */ aspect-ratio: 1920 / 863; /* 或者其他的宽高比 */
position: relative; position: relative;
.login-win { .register-win {
width: 427px; width: 75%;
height: 479px; height: 75%;
background: #fdfdfd; background: #fdfdfd;
outline: 10px solid rgba(255, 255, 255, 0.25);
border-radius: 8px; border-radius: 8px;
position: absolute; position: absolute;
left: 60%; left: 50%;
top: 50%; top: 50%;
transform: translateY(-50%); transform: translate(-50%, -50%);
.login-title {
margin: 50px 0 30px 16px;
.win-box{
width: 30%;
margin: 0 auto;
.login-title-text{ .register-title {
width: 128px; margin: 50px 0 30px 16px;
height: 48px;
color: #3f3f3f;
font-size: 32px; .register-title-text{
font-weight: 700; width: 128px;
height: 48px;
color: #3f3f3f;
font-size: 32px;
font-weight: 700;
}
} }
} }
} }
} }
</style> </style>
...@@ -6,7 +6,22 @@ ...@@ -6,7 +6,22 @@
:title="getTitle" :title="getTitle"
@ok="handleSubmit" @ok="handleSubmit"
> >
<BasicForm @register="registerForm" /> <BasicForm @register="registerForm">
<template #import="{}">
<BasicUpload
:maxSize="20"
:maxNumber="1"
@change="handleChange"
@click="handleUpload"
:api="userImport"
:accept="['.xlsx, .xls']"
>
<template #uploadBtnName>
<span>导入文件</span>
</template>
</BasicUpload>
</template>
</BasicForm>
</BasicModal> </BasicModal>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
...@@ -15,10 +30,11 @@ ...@@ -15,10 +30,11 @@
import { BasicForm, useForm } from '@/components/Form'; import { BasicForm, useForm } from '@/components/Form';
import { accountFormSchema } from './institution.data'; import { accountFormSchema } from './institution.data';
import { getDeptList } from '@/api/system/dept/dept'; import { getDeptList } from '@/api/system/dept/dept';
import { addUserApi, UserDetailApi, UserUpdataApi } from '@/api/system/user/user'; import { addUserApi, UserDetailApi, UserUpdataApi, userImport } from '@/api/system/user/user';
import { encryptTwo } from '../../../../src/utils/jsencrypt.js'; import { encryptTwo } from '../../../../src/utils/jsencrypt.js';
import { useMessage } from '@/hooks/web/useMessage'; import { useMessage } from '@/hooks/web/useMessage';
import { TreeData } from '@/views/dataSharingAndExchange/catalogingManagement/institutionData'; import { TreeData } from '@/views/dataSharingAndExchange/catalogingManagement/institutionData';
import { BasicUpload } from '@/components/Upload';
defineOptions({ name: 'AccountModal' }); defineOptions({ name: 'AccountModal' });
...@@ -65,8 +81,14 @@ ...@@ -65,8 +81,14 @@
]); ]);
}); });
const getTitle = computed(() => (!unref(isUpdate) ? '新增账号' : '编辑账号')); const getTitle = computed(() => (!unref(isUpdate) ? '新增轮播图' : '编辑轮播图'));
function handleChange(list: string[]) {
console.log('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', list);
createMessage.success(`文件上传成功`);
}
function handleUpload() {
isGetMeta.value = 'true';
}
function handleTree(data, id, parentId, children, rootId) { function handleTree(data, id, parentId, children, rootId) {
id = id || 'id'; id = id || 'id';
parentId = parentId || 'parentId'; parentId = parentId || 'parentId';
......
...@@ -195,51 +195,11 @@ export const accountFormSchema: any[] = [ ...@@ -195,51 +195,11 @@ export const accountFormSchema: any[] = [
}, },
], ],
}, },
// { {
// field: 'visibleRange', field: 'import',
// label: '可见范围', label: '上传轮播图',
// component: 'Select', slot: 'import',
// componentProps: { },
// options: [
// { label: '所有人', value: '所有人' },
// { label: '用户1', value: '用户1' },
// { label: '用户2', value: '用户2' },
// ],
// },
// colProps: { lg: 24, md: 24 },
// rules: [
// {
// required: true,
// message: '请输入登录名',
// },
// ],
// },
// {
// field: 'resourceNum',
// label: '可见资源数',
// component: 'InputNumber',
// colProps: { lg: 24, md: 24 },
// rules: [
// {
// required: true,
// message: '请输入',
// },
// ],
// },
// {
// field: 'institutionId',
// label: '所属编目',
// component: 'TreeSelect',
// colProps: { lg: 24, md: 24 },
// componentProps: {
// fieldNames: {
// label: 'institutionName',
// value: 'businessId',
// },
// getPopupContainer: () => document.body,
// },
// required: true,
// },
]; ];
export const EditFormSchema: any[] = [ export const EditFormSchema: any[] = [
{ {
......
...@@ -7,7 +7,7 @@ export const enrollData: any[] = [ ...@@ -7,7 +7,7 @@ export const enrollData: any[] = [
dataBase: '腾讯云数据中心', dataBase: '腾讯云数据中心',
enrollDate: '2023-01-15', enrollDate: '2023-01-15',
enrollStatus: '已备案', enrollStatus: '已备案',
isObjection: '', isObjection: '',
enrollBook: ['src/assets/images/登记证书.jpg'], enrollBook: ['src/assets/images/登记证书.jpg'],
}, },
{ {
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
</template> </template>
<template v-if="column.key === 'action'"> <template v-if="column.key === 'action'">
<TableAction <TableAction
v-if="record.isObjection === '是'"
:actions="[ :actions="[
{ {
label: '详情', label: '详情',
...@@ -32,6 +33,19 @@ ...@@ -32,6 +33,19 @@
}, },
]" ]"
/> />
<TableAction
v-else
:actions="[
{
label: '详情',
onClick: handleDetail.bind(null, record),
},
{
label: '审核',
onClick: handleAudit.bind(null, record),
},
]"
/>
</template> </template>
</template> </template>
</BasicTable> </BasicTable>
......
...@@ -15,15 +15,15 @@ ...@@ -15,15 +15,15 @@
<div class="flex" style="margin-bottom: 20px"> <div class="flex" style="margin-bottom: 20px">
<div style="margin-top: 4px">异议内容:</div> <div style="margin-top: 4px">异议内容:</div>
<div <div
><span style="font-size: 18px; font-weight: bolder">浙江金华贸易有限公司</span ><span style="font-size: 18px; font-weight: bolder">xxx科技有限公司</span
><span>认为</span ><span>认为</span
><span style="font-size: 18px; font-weight: bolder">宏源技术科技有限公司</span ><span style="font-size: 18px; font-weight: bolder">xxx科技有限公司</span
><span>有抄袭行为</span></div ><span>有抄袭行为</span></div
> >
</div> </div>
<div class="flex"> <div class="flex">
<Descriptions class="w-1/2" :column="1"> <Descriptions class="w-1/2" :column="1">
<Descriptions.Item label="申请人">浙江金华贸易有限公司</Descriptions.Item> <Descriptions.Item label="申请人">xxx科技有限公司</Descriptions.Item>
<Descriptions.Item label="数据名称">租赁行业评价模型分析数据</Descriptions.Item> <Descriptions.Item label="数据名称">租赁行业评价模型分析数据</Descriptions.Item>
<Descriptions.Item label="数据来源">公开收集</Descriptions.Item> <Descriptions.Item label="数据来源">公开收集</Descriptions.Item>
<Descriptions.Item label="数据名称">人工智能预测模型</Descriptions.Item> <Descriptions.Item label="数据名称">人工智能预测模型</Descriptions.Item>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<Descriptions.Item label="发布时间">2023.10.12</Descriptions.Item> <Descriptions.Item label="发布时间">2023.10.12</Descriptions.Item>
</Descriptions> </Descriptions>
<Descriptions style="margin-left: 20px" class="w-1/2" :column="1"> <Descriptions style="margin-left: 20px" class="w-1/2" :column="1">
<Descriptions.Item label="申请人">宏源技术科技有限公司</Descriptions.Item> <Descriptions.Item label="申请人">xxx科技有限公司</Descriptions.Item>
<Descriptions.Item label="数据名称">租赁行业评价模型分析数据</Descriptions.Item> <Descriptions.Item label="数据名称">租赁行业评价模型分析数据</Descriptions.Item>
<Descriptions.Item label="数据来源">公开收集</Descriptions.Item> <Descriptions.Item label="数据来源">公开收集</Descriptions.Item>
<Descriptions.Item label="数据名称">大数据人工智能预测模型</Descriptions.Item> <Descriptions.Item label="数据名称">大数据人工智能预测模型</Descriptions.Item>
......
...@@ -4,21 +4,18 @@ ...@@ -4,21 +4,18 @@
dense dense
contentBackground contentBackground
contentFullHeight contentFullHeight
fixed-height
headerSticky headerSticky
@back="handleBack" @back="handleBack"
> >
<Row :gutter="[16, 30]"> <Row :gutter="[16, 30]">
<Col :span="12" v-for="info in myMessageDetailColumns" :key="info"> <Col :span="24" v-for="info in myMessageDetailColumns" :key="info">
<div class="col-item"> <div class="col-item">
<div class="item-label">{{ info.title }}</div>
<div class="item-des">{{ data[info.dataIndex] ? data[info.dataIndex] : '-' }}</div> <div class="item-des">{{ data[info.dataIndex] ? data[info.dataIndex] : '-' }}</div>
</div> </div>
</Col> </Col>
</Row> </Row>
<div style="margin: 40px 60px" class="flex"> <div class="flex">
<div v-if="title === '通知公告'" style="margin-left: 100px"> <div v-if="title === '通知公告'" style="padding: 0 20%">
<p class="des-p"> <p class="des-p">
为加强数据知识产权领域的服务质量,提升相关机构的市场竞争力,推动数据知识产权保护和创新应用,依据《数据知识产权专业服务机构管理办法》及相关政策要求,市场监督管理局于2023年开展了对数据知识产权专业服务机构的年度服务绩效评价工作。 为加强数据知识产权领域的服务质量,提升相关机构的市场竞争力,推动数据知识产权保护和创新应用,依据《数据知识产权专业服务机构管理办法》及相关政策要求,市场监督管理局于2023年开展了对数据知识产权专业服务机构的年度服务绩效评价工作。
本次评价工作通过对全国范围内的数据知识产权服务机构进行全面评审,结合其在知识产权申请、管理、保护、转化等方面的实际表现,重点考察了各机构的技术能力、服务质量、创新成果以及社会影响力等多维度指标。<br />经过严格审定,现将2023年度服务绩效评价结果通报如下: 本次评价工作通过对全国范围内的数据知识产权服务机构进行全面评审,结合其在知识产权申请、管理、保护、转化等方面的实际表现,重点考察了各机构的技术能力、服务质量、创新成果以及社会影响力等多维度指标。<br />经过严格审定,现将2023年度服务绩效评价结果通报如下:
...@@ -54,8 +51,15 @@ ...@@ -54,8 +51,15 @@
</p> </p>
<p class="des-p"> 特此通报。</p> <p class="des-p"> 特此通报。</p>
</div> </div>
<div v-else style="margin-left: 100px"> <div v-else class="flex-1">
<Upload style="width: 45%" v-model:file-list="fileList" /> <div class="flex" style="justify-content: center;margin-top: 30px">
<div style="line-height: 34px"
><span style="color: #389be1">天津宏宇科技有限公司</span><span style="color: #389be1"
>2024.03.10</span
>购买了你的商品</div
>
<a-button type="link"><span>&lt;&lt;去查看&gt;&gt;</span></a-button>
</div>
</div> </div>
</div> </div>
</PageWrapper> </PageWrapper>
...@@ -113,20 +117,24 @@ ...@@ -113,20 +117,24 @@
<style scoped> <style scoped>
.col-item { .col-item {
display: flex; display: flex;
justify-content: center;
gap: 10px; gap: 10px;
margin: 20px 60px; margin: 20px 60px;
.item-label { .item-label {
width: 130px; width: 120px;
} }
.item-img { .item-img {
width: 150px; width: 150px;
height: 100px; height: 100px;
} }
.item-des {
font-size: 17px;
font-weight: bolder;
}
} }
.des-p { .des-p {
margin-left: 100px; text-align: left;
width: 70%;
font-size: 16px; font-size: 16px;
text-indent: 2em; text-indent: 2em;
line-height: 40px; line-height: 40px;
......
export const myMessageData: any[] = [ export const myMessageData: any[] = [
{ {
messageTitle: '浙江省市场监督管理局关于数据知识产权专业服务机构2023年度服务绩效评价结果的通报', messageTitle: '市场监督管理局关于数据知识产权专业服务机构2023年度服务绩效评价结果的通报',
messageType: '通知公告', messageType: '通知公告',
publishTime: '2024-04-22', publishTime: '2024-04-22',
}, },
{ {
messageTitle: '浙江省市场监督管理局关于数据知识产权专业服务机构2023年度服务绩效评价结果的通报', messageTitle: '市场监督管理局关于数据知识产权专业服务机构2023年度服务绩效评价结果的通报',
messageType: '通知公告', messageType: '通知公告',
publishTime: '2024-04-22', publishTime: '2024-04-22',
}, },
{ {
messageTitle: '浙江省市场监督管理局关于数据知识产权专业服务机构2023年度服务绩效评价结果的通报', messageTitle: '市场监督管理局关于数据知识产权专业服务机构2023年度服务绩效评价结果的通报',
messageType: '通知公告', messageType: '通知公告',
publishTime: '2024-04-22', publishTime: '2024-04-22',
}, },
{ {
messageTitle: '浙江省市场监督管理局关于数据知识产权专业服务机构2023年度服务绩效评价结果的通报', messageTitle: '市场监督管理局关于数据知识产权专业服务机构2023年度服务绩效评价结果的通报',
messageType: '通知公告', messageType: '通知公告',
publishTime: '2024-04-22', publishTime: '2024-04-22',
}, },
{ {
messageTitle: '浙江省市场监督管理局关于数据知识产权专业服务机构2023年度服务绩效评价结果的通报', messageTitle: '市场监督管理局关于数据知识产权专业服务机构2023年度服务绩效评价结果的通报',
messageType: '通知公告', messageType: '通知公告',
publishTime: '2024-04-22', publishTime: '2024-04-22',
}, },
{ {
messageTitle: '浙江省市场监督管理局关于数据知识产权专业服务机构2023年度服务绩效评价结果的通报', messageTitle: '订单消息',
messageType: '待办', messageType: '待办',
publishTime: '2024-04-22', publishTime: '2024-04-22',
}, },
{ {
messageTitle: '浙江省市场监督管理局关于数据知识产权专业服务机构2023年度服务绩效评价结果的通报', messageTitle: '订单消息',
messageType: '待办', messageType: '待办',
publishTime: '2024-04-22', publishTime: '2024-04-22',
}, },
{ {
messageTitle: '浙江省市场监督管理局关于数据知识产权专业服务机构2023年度服务绩效评价结果的通报', messageTitle: '订单消息',
messageType: '待办', messageType: '待办',
publishTime: '2024-04-22', publishTime: '2024-04-22',
}, },
......
<template> <template>
<PageWrapper
:title="!isAudit ? '异议详情' : '异议审核'"
dense
contentBackground
contentFullHeight
fixed-height
headerSticky
@back="handleBack"
>
<Row :gutter="[16, 30]">
<Col :span="12" v-for="info in objectionColumns" :key="info">
<div class="col-item">
<div class="item-label">{{ info.title }}</div>
<div class="item-des">{{ data[info.dataIndex] ? data[info.dataIndex] : '-' }}</div>
</div>
</Col>
<Col :span="12">
<div class="col-item">
<div class="item-label">异议内容:</div>
<div class="item-des"> xxx科技有限公司认为xxx科技有限公司有抄袭行为</div>
</div>
</Col>
</Row>
<div style="display: flex">
<div v-if="isAudit" style="margin: 40px 60px" class="flex">
<div style="line-height: 35px">证明材料:</div>
<div style="margin-left: 100px">
<Upload style="width: 45%" v-model:file-list="fileList" />
</div>
</div>
<div v-if="isAudit" style="margin: 40px 0 0 440px" class="flex">
<div style="line-height: 35px">审核意见:</div>
<div style="margin-left: 100px">
<Textarea v-model:value="idea" style="width: 300px" placeholder="请输入审核意见" />
</div>
</div>
</div>
<div
v-if="isAudit"
style="justify-content: right; display: flex; gap: 10px; margin-right: 20px"
>
<a-button @click="handleCancel">驳回</a-button>
<a-button type="primary" @click="handleEdit">审核</a-button>
</div>
</PageWrapper>
</template> </template>
<script> <script lang="ts" setup>
export default { import PageWrapper from '@/components/Page/src/PageWrapper.vue';
name: "detail" import { useRoute, useRouter } from 'vue-router';
} import { useDescription } from '@/components/Description';
import { Col, Descriptions, Row, Input, Upload, Textarea } from 'ant-design-vue';
import { FileProtectOutlined, UploadOutlined } from '@ant-design/icons-vue';
import {
infoList,
model,
} from '@/views/mallResourceDevelopment/API/apiByApply/apiDetail/detailData';
import { ref, onMounted, reactive } from 'vue';
import moment from 'moment/moment';
import { TableImg } from '@/components/Table';
import { useMessage } from '@/hooks/web/useMessage';
import { objectionColumns } from '@/views/personalCenter/myObjection/objection.data';
import { formSchema1 } from '@/views/servicePlatform/enterpriseCertification/enterpriseColumns.data';
const { createMessage } = useMessage();
const route = useRoute();
const data = ref(route.query);
const router = useRouter();
const isAudit = ref(route.query.isAudit);
const idea = ref('');
const fileList = reactive([
{
uid: 1,
name: '证明材料附件1.word',
status: 'done',
},
{
uid: 2,
name: '证明材料附件2.pdf',
status: 'done',
},
]);
function handleBack() {
router.go(-1);
}
onMounted(() => {
console.log('date', data.value);
});
function handleCancel() {
router.go(-1);
createMessage.success('驳回成功!');
}
function handleEdit() {
router.go(-1);
createMessage.success('审核成功!');
}
</script> </script>
<style scoped> <style scoped>
.col-item {
display: flex;
gap: 10px;
margin: 20px 60px;
.item-label {
width: 150px;
}
.item-img {
width: 150px;
height: 100px;
}
}
</style> </style>
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
</template> </template>
<template v-if="column.key === 'action'"> <template v-if="column.key === 'action'">
<TableAction <TableAction
v-if="record.objectionType === '我收到的'"
:actions="[ :actions="[
{ {
label: '详情', label: '详情',
...@@ -32,6 +33,15 @@ ...@@ -32,6 +33,15 @@
}, },
]" ]"
/> />
<TableAction
v-else
:actions="[
{
label: '详情',
onClick: handleDetail.bind(null, record),
},
]"
/>
</template> </template>
</template> </template>
</BasicTable> </BasicTable>
...@@ -55,7 +65,8 @@ ...@@ -55,7 +65,8 @@
searchFormSchema, searchFormSchema,
} from '@/views/dataWarehousePlanning/physicalModel/model.data'; } from '@/views/dataWarehousePlanning/physicalModel/model.data';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import {objectionColumns} from "@/views/personalCenter/myObjection/objection.data"; import { objectionColumns } from '@/views/personalCenter/myObjection/objection.data';
import { objectionData } from '@/views/personalCenter/myObjection/objectionData';
// 初始化 // 初始化
const { createMessage, createConfirm } = useMessage(); const { createMessage, createConfirm } = useMessage();
...@@ -90,12 +101,12 @@ ...@@ -90,12 +101,12 @@
pageNu: '1', pageNu: '1',
pageSize: '10', pageSize: '10',
pages: '1', pages: '1',
total: enterprisesData.length, total: objectionData.length,
code: '', code: '',
message: '', message: '',
data: enterprisesData, data: objectionData,
}; };
return { ...response, data: enterprisesData }; return { ...response, data: objectionData };
}, },
rowKey: 'businessId', rowKey: 'businessId',
columns: objectionColumns, columns: objectionColumns,
...@@ -116,21 +127,21 @@ ...@@ -116,21 +127,21 @@
}, },
} as BasicTableProps); } as BasicTableProps);
function handleEdit() {
createConfirm({ function handleDetail(record) {
iconType: 'warning', push({
title: '审核', path: '/personalCenter/myObjection/detail',
content: '确认审核选中数据吗?', query: {
onOk() { ...record,
createMessage.success('审核成功!');
}, },
}); });
} }
function handleDetail(record) { function handleEdit(record) {
push({ push({
path: '/servicePlatform/enterpriseCertification/detail', path: '/personalCenter/myObjection/detail',
query: { query: {
...record, ...record,
isAudit: true,
}, },
}); });
} }
......
export const objectionData: any[] = [ export const objectionData: any[] = [
{ {
title: '大数据弹性分析数据', title: '大数据弹性分析数据',
applicant: '宏远科技有限公司', applicant: '天津宏飞园宜科技有限公司',
dataSource: '自行生产', dataSource: '自行生产',
applyScene: '大数据分析',
applyTime: '2024-11-30', applyTime: '2024-11-30',
updateTime: '2024-12-17', updateTime: '2024-12-17',
objectionType: '我收到的', objectionType: '我收到的',
}, },
{
title: '大数据弹性分析数据',
applicant: '天津宏飞园宜科技有限公司',
dataSource: '自行生产',
applyScene: '大数据分析',
applyTime: '2024-11-30',
updateTime: '2024-12-17',
objectionType: '我收到的',
},
{
title: '大数据弹性分析数据',
applicant: '天津宏飞园宜科技有限公司',
dataSource: '自行生产',
applyScene: '大数据分析',
applyTime: '2024-11-30',
updateTime: '2024-12-17',
objectionType: '我收到的',
},
{
title: '大数据弹性分析数据',
applicant: '天津宏飞园宜科技有限公司',
dataSource: '自行生产',
applyScene: '大数据分析',
applyTime: '2024-11-30',
updateTime: '2024-12-17',
objectionType: '我提交的',
},
{
title: '大数据弹性分析数据',
applicant: '天津宏飞园宜科技有限公司',
dataSource: '自行生产',
applyScene: '大数据分析',
applyTime: '2024-11-30',
updateTime: '2024-12-17',
objectionType: '我提交的',
},
{
title: '大数据弹性分析数据',
applicant: '天津宏飞园宜科技有限公司',
dataSource: '自行生产',
applyScene: '大数据分析',
applyTime: '2024-11-30',
updateTime: '2024-12-17',
objectionType: '我提交的',
},
{
title: '大数据弹性分析数据',
applicant: '天津宏飞园宜科技有限公司',
dataSource: '自行生产',
applyScene: '大数据分析',
applyTime: '2024-11-30',
updateTime: '2024-12-17',
objectionType: '我提交的',
},
]; ];
export const enterprisesData: any[] = [ export const enterprisesData: any[] = [
{ {
companyName: '宏远科技有限公司', companyName: 'xxx科技有限公司',
code: '123123', code: '123123',
leader: '张三', leader: '张三',
leaderNum: '12312312', leaderNum: '12312312',
...@@ -10,11 +10,11 @@ export const enterprisesData: any[] = [ ...@@ -10,11 +10,11 @@ export const enterprisesData: any[] = [
website: '2020-03-05', website: '2020-03-05',
registerNum: '1000', registerNum: '1000',
businessRange: '科学研究和技术服务业', businessRange: '科学研究和技术服务业',
registerAddress: '天津市西青区中北镇中北科技产业', registerAddress: '天津市西青区中北镇中北科技产业',
detailAddress: '天津市西青区中北镇中北科技产业园', detailAddress: '天津市西青区中北镇中北科技产业园',
}, },
{ {
companyName: '天科科技有限公司', companyName: 'xxx科技有限公司',
code: '87654321', code: '87654321',
leader: '李四', leader: '李四',
leaderNum: '98765432', leaderNum: '98765432',
...@@ -28,7 +28,7 @@ export const enterprisesData: any[] = [ ...@@ -28,7 +28,7 @@ export const enterprisesData: any[] = [
detailAddress: '北京市朝阳区建国路88号大厦', detailAddress: '北京市朝阳区建国路88号大厦',
}, },
{ {
companyName: '环球科技有限公司', companyName: 'xxx科技有限公司',
code: '23456789', code: '23456789',
leader: '王五', leader: '王五',
leaderNum: '23456789', leaderNum: '23456789',
...@@ -42,7 +42,7 @@ export const enterprisesData: any[] = [ ...@@ -42,7 +42,7 @@ export const enterprisesData: any[] = [
detailAddress: '上海市浦东新区世纪大道456号', detailAddress: '上海市浦东新区世纪大道456号',
}, },
{ {
companyName: '智创创新公司', companyName: 'xxx科技有限公司',
code: '34567890', code: '34567890',
leader: '赵六', leader: '赵六',
leaderNum: '34567890', leaderNum: '34567890',
...@@ -56,7 +56,7 @@ export const enterprisesData: any[] = [ ...@@ -56,7 +56,7 @@ export const enterprisesData: any[] = [
detailAddress: '深圳市南山区科技园路22号', detailAddress: '深圳市南山区科技园路22号',
}, },
{ {
companyName: '青腾企业集团', companyName: 'xxx科技有限公司',
code: '45678901', code: '45678901',
leader: '钱七', leader: '钱七',
leaderNum: '45678901', leaderNum: '45678901',
...@@ -70,7 +70,7 @@ export const enterprisesData: any[] = [ ...@@ -70,7 +70,7 @@ export const enterprisesData: any[] = [
detailAddress: '广州市天河区体育东路99号', detailAddress: '广州市天河区体育东路99号',
}, },
{ {
companyName: '恒星网络科技', companyName: 'xxx科技有限公司',
code: '56789012', code: '56789012',
leader: '孙八', leader: '孙八',
leaderNum: '56789012', leaderNum: '56789012',
...@@ -84,7 +84,7 @@ export const enterprisesData: any[] = [ ...@@ -84,7 +84,7 @@ export const enterprisesData: any[] = [
detailAddress: '重庆市渝中区解放碑路1号', detailAddress: '重庆市渝中区解放碑路1号',
}, },
{ {
companyName: '云际数据有限公司', companyName: 'xxx科技有限公司',
code: '67890123', code: '67890123',
leader: '周九', leader: '周九',
leaderNum: '67890123', leaderNum: '67890123',
...@@ -98,7 +98,7 @@ export const enterprisesData: any[] = [ ...@@ -98,7 +98,7 @@ export const enterprisesData: any[] = [
detailAddress: '杭州市西湖区文二路123号', detailAddress: '杭州市西湖区文二路123号',
}, },
{ {
companyName: '星火科技有限公司', companyName: 'xxx科技有限公司',
code: '78901234', code: '78901234',
leader: '吴十', leader: '吴十',
leaderNum: '78901234', leaderNum: '78901234',
...@@ -112,7 +112,7 @@ export const enterprisesData: any[] = [ ...@@ -112,7 +112,7 @@ export const enterprisesData: any[] = [
detailAddress: '武汉市江汉区青年路456号', detailAddress: '武汉市江汉区青年路456号',
}, },
{ {
companyName: '睿达智能公司', companyName: 'xxx科技有限公司',
code: '89012345', code: '89012345',
leader: '郑十一', leader: '郑十一',
leaderNum: '89012345', leaderNum: '89012345',
...@@ -126,7 +126,7 @@ export const enterprisesData: any[] = [ ...@@ -126,7 +126,7 @@ export const enterprisesData: any[] = [
detailAddress: '南京市鼓楼区中央路66号', detailAddress: '南京市鼓楼区中央路66号',
}, },
{ {
companyName: '天睿电子科技', companyName: 'xxx科技有限公司',
code: '90123456', code: '90123456',
leader: '冯十二', leader: '冯十二',
leaderNum: '90123456', leaderNum: '90123456',
...@@ -140,7 +140,7 @@ export const enterprisesData: any[] = [ ...@@ -140,7 +140,7 @@ export const enterprisesData: any[] = [
detailAddress: '苏州市高新区科技大道88号', detailAddress: '苏州市高新区科技大道88号',
}, },
{ {
companyName: '领航教育科技', companyName: 'xxx科技有限公司',
code: '12345678', code: '12345678',
leader: '刘十三', leader: '刘十三',
leaderNum: '12345678', leaderNum: '12345678',
...@@ -156,7 +156,7 @@ export const enterprisesData: any[] = [ ...@@ -156,7 +156,7 @@ export const enterprisesData: any[] = [
]; ];
export const mockData: Recordable = { export const mockData: Recordable = {
companyName: 'xxx', companyName: 'xxx科技有限公司',
code: '123123', code: '123123',
leader: '张三', leader: '张三',
leaderNum: '12312312', leaderNum: '12312312',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment