This commit is contained in:
quantulr
2023-11-29 17:22:45 +08:00
parent 81d7e56aee
commit 8d246c3f5d
2 changed files with 137 additions and 126 deletions

View File

@ -1,6 +1,6 @@
import { getInfo, login, logout } from "@/api/login"; import { getInfo, login, logout } from "@/api/login";
import { getToken, removeToken, setToken } from "@/utils/auth"; import { getToken, removeToken, setToken } from "@/utils/auth";
// import defAva from "@/assets/images/profile.jpg"; import defAva from "@/assets/images/profile.jpg";
const useUserStore = defineStore("user", { const useUserStore = defineStore("user", {
state: () => ({ state: () => ({
@ -41,10 +41,9 @@ const useUserStore = defineStore("user", {
const user = res.data.user; const user = res.data.user;
const enterprise = res.data.enterprise; const enterprise = res.data.enterprise;
const userId = user.userId; const userId = user.userId;
const avatar = const avatar = !user.avatar
/*user.avatar == "" || user.avatar == null
? defAva ? defAva
:*/ user.avatar; : user.avatar;
if (res.roles && res.roles.length > 0) { if (res.roles && res.roles.length > 0) {
// 验证返回的roles是否是一个非空数组 // 验证返回的roles是否是一个非空数组

View File

@ -1,20 +1,20 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryRef" ref="queryRef"
v-show="showSearch" v-show="showSearch"
:inline="true" :inline="true"
@submit.prevent @submit.prevent
> >
<el-form-item label="专利名称" prop="title"> <el-form-item label="专利名称" prop="title">
<el-input <el-input
v-model="queryParams.title" v-model="queryParams.title"
placeholder="请输入专利名称" placeholder="请输入专利名称"
clearable clearable
size="small" size="small"
style="width: 240px" style="width: 240px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="申请人" prop="apply_name"> <!-- <el-form-item label="申请人" prop="apply_name">
@ -39,92 +39,98 @@
</el-form-item> --> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button <el-button
type="primary" type="primary"
icon="Search" icon="Search"
size="small" size="small"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索
</el-button
> >
<el-button icon="Refresh" size="small" @click="resetQuery" <el-button icon="Refresh" size="small" @click="resetQuery"
>重置</el-button >重置
</el-button
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
plain plain
icon="Plus" icon="Plus"
size="small" size="small"
@click="handleAdd" @click="handleAdd"
>新增</el-button >新增
</el-button
> >
</el-col> </el-col>
<!-- 无接口 暂时注释 --> <!-- 无接口 暂时注释 -->
<el-col :span="1.5"> <el-col :span="1.5">
<router-link to="./claimPatent"> <router-link to="./claimPatent">
<el-button type="primary" plain icon="Plus" size="small" <el-button type="primary" plain icon="Plus" size="small"
>认领</el-button >认领
</el-button
> >
</router-link> </router-link>
</el-col> </el-col>
<right-toolbar <right-toolbar
v-model:showSearch="showSearch" v-model:showSearch="showSearch"
@queryTable="getList" @queryTable="getList"
></right-toolbar> ></right-toolbar>
</el-row> </el-row>
<!-- 表格数据 --> <!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList"> <el-table v-loading="loading" :data="dataList">
<el-table-column label="数据编号" prop="id" /> <el-table-column label="数据编号" prop="id"/>
<el-table-column <el-table-column
label="专利名称" label="专利名称"
prop="title" prop="title"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="申请号" label="申请号"
prop="applyCode" prop="applyCode"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column label="发明人" prop="inventor" /> <el-table-column label="发明人" prop="inventor"/>
<el-table-column label="申请(专利权)人" prop="applyName" /> <el-table-column label="申请(专利权)人" prop="applyName"/>
<el-table-column label="申请日期" align="center" prop="applyAt"> <el-table-column label="申请日期" align="center" prop="applyAt">
<template #default="{ row }"> <template #default="{ row }">
<span>{{ dayjs(row.applyAt).format("YYYY-MM-DD") }}</span> <span>{{ dayjs(row.applyAt).format("YYYY-MM-DD") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
size="small" size="small"
type="text" type="text"
icon="Edit" icon="Edit"
@click="handleUpdate(row)" @click="handleUpdate(row)"
>修改</el-button >修改
</el-button
> >
<el-button <el-button
size="small" size="small"
type="text" type="text"
icon="Delete" icon="Delete"
@click="handleDelete(row.id)" @click="handleDelete(row.id)"
>删除</el-button >删除
</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total > 0" v-show="total > 0"
:total="total" :total="total"
v-model:page="queryParams.pageNum" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" v-model:limit="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改数据配置对话框 --> <!-- 添加或修改数据配置对话框 -->
@ -132,51 +138,51 @@
<el-form ref="patentRef" :model="form" :rules="rules" label-width="100px"> <el-form ref="patentRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="申请人:" prop="applyName"> <el-form-item label="申请人:" prop="applyName">
<el-input <el-input
v-model="form.applyName" v-model="form.applyName"
placeholder="请输入申请(专利权)人(多个请以 , 分割)" placeholder="请输入申请(专利权)人(多个请以 , 分割)"
/> />
</el-form-item> </el-form-item>
<el-form-item label="申请人地址:" prop="applyAddress"> <el-form-item label="申请人地址:" prop="applyAddress">
<el-input <el-input
v-model="form.applyAddress" v-model="form.applyAddress"
placeholder="请输入申请人地址" placeholder="请输入申请人地址"
/> />
</el-form-item> </el-form-item>
<el-form-item label="发明人:" prop="inventor"> <el-form-item label="发明人:" prop="inventor">
<el-input <el-input
v-model="form.inventor" v-model="form.inventor"
placeholder="请输入发明人(多个请以 , 分割)" placeholder="请输入发明人(多个请以 , 分割)"
/> />
</el-form-item> </el-form-item>
<el-form-item label="专利名称:" prop="title"> <el-form-item label="专利名称:" prop="title">
<el-input v-model="form.title" placeholder="请输入专利名称" /> <el-input v-model="form.title" placeholder="请输入专利名称"/>
</el-form-item> </el-form-item>
<el-form-item label="申请号:" prop="applyCode"> <el-form-item label="申请号:" prop="applyCode">
<el-input v-model="form.applyCode" placeholder="请输入申请号" /> <el-input v-model="form.applyCode" placeholder="请输入申请号"/>
</el-form-item> </el-form-item>
<el-form-item label="公开号:" prop="openCode"> <el-form-item label="公开号:" prop="openCode">
<el-input v-model="form.openCode" placeholder="请输入公开号" /> <el-input v-model="form.openCode" placeholder="请输入公开号"/>
</el-form-item> </el-form-item>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="申请日期:" prop="applyAt"> <el-form-item label="申请日期:" prop="applyAt">
<el-date-picker <el-date-picker
style="width: 100%" style="width: 100%"
v-model="form.applyAt" v-model="form.applyAt"
type="date" type="date"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
placeholder="请选择申请日期" placeholder="请选择申请日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="公开日:" prop="openAt"> <el-form-item label="公开日:" prop="openAt">
<el-date-picker <el-date-picker
style="width: 100%" style="width: 100%"
v-model="form.openAt" v-model="form.openAt"
type="date" type="date"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
placeholder="请选择公开日" placeholder="请选择公开日"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -185,16 +191,16 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="专利类型:" prop="kind"> <el-form-item label="专利类型:" prop="kind">
<el-select <el-select
v-model="form.kind" v-model="form.kind"
clearable clearable
placeholder="请选择" placeholder="请选择"
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
v-for="item in patentOptions" v-for="item in patentOptions"
:key="item.key" :key="item.key"
:label="item.value" :label="item.value"
:value="item.key" :value="item.key"
> >
</el-option> </el-option>
</el-select> </el-select>
@ -202,7 +208,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="IPC分类号:" prop="ipcCode"> <el-form-item label="IPC分类号:" prop="ipcCode">
<el-input v-model="form.ipcCode" placeholder="请输入IPC分类号" /> <el-input v-model="form.ipcCode" placeholder="请输入IPC分类号"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -215,18 +221,18 @@
</el-form-item> </el-form-item>
<el-form-item label="摘要:" prop="description"> <el-form-item label="摘要:" prop="description">
<el-input <el-input
v-model="form.description" v-model="form.description"
placeholder="请输入摘要" placeholder="请输入摘要"
type="textarea" type="textarea"
:autosize="{ minRows: 4, maxRows: 8 }" :autosize="{ minRows: 4, maxRows: 8 }"
/> />
</el-form-item> </el-form-item>
<el-form-item label="主权项:" prop="principalClaim"> <el-form-item label="主权项:" prop="principalClaim">
<el-input <el-input
v-model="form.principalClaim" v-model="form.principalClaim"
placeholder="请输入主权项" placeholder="请输入主权项"
type="textarea" type="textarea"
:autosize="{ minRows: 4, maxRows: 8 }" :autosize="{ minRows: 4, maxRows: 8 }"
/> />
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -247,15 +253,16 @@ import {
updateCasPatent, updateCasPatent,
deleteCasPatentByIds, deleteCasPatentByIds,
} from "@/api/admin/expert/patent"; } from "@/api/admin/expert/patent";
import { cloneDeep } from "lodash"; import {cloneDeep} from "lodash";
import { getInfo } from "@/api/admin/expert/account"; import {getInfo} from "@/api/admin/expert/account";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { ElMessage, ElMessageBox } from "element-plus"; import {ElMessage, ElMessageBox} from "element-plus";
import { patentOptions } from "@/utils/parameter"; import {patentOptions} from "@/utils/parameter";
import { useRouter } from "vue-router"; import {useRouter} from "vue-router";
const router = useRouter(); const router = useRouter();
const { proxy } = getCurrentInstance(); const {proxy} = getCurrentInstance();
const dataList = ref([]); const dataList = ref([]);
const open = ref(false); const open = ref(false);
@ -272,19 +279,19 @@ const data = reactive({
inventor: undefined, inventor: undefined,
}, },
rules: { rules: {
applyName: [{ required: true, message: "申请人不能为空", trigger: "blur" }], applyName: [{required: true, message: "申请人不能为空", trigger: "blur"}],
applyAddress: [ applyAddress: [
{ required: true, message: "申请人地址不能为空", trigger: "blur" }, {required: true, message: "申请人地址不能为空", trigger: "blur"},
], ],
openCode: [{ required: true, message: "公开号不能为空", trigger: "blur" }], openCode: [{required: true, message: "公开号不能为空", trigger: "blur"}],
openAt: [{ required: true, message: "公开日不能为空", trigger: "blur" }], openAt: [{required: true, message: "公开日不能为空", trigger: "blur"}],
inventor: [{ required: true, message: "发明人不能为空", trigger: "blur" }], inventor: [{required: true, message: "发明人不能为空", trigger: "blur"}],
title: [{ required: true, message: "专利名称不能为空", trigger: "blur" }], title: [{required: true, message: "专利名称不能为空", trigger: "blur"}],
applyCode: [{ required: true, message: "申请号不能为空", trigger: "blur" }], applyCode: [{required: true, message: "申请号不能为空", trigger: "blur"}],
applyAt: [{ required: true, message: "申请日期不能为空", trigger: "blur" }], applyAt: [{required: true, message: "申请日期不能为空", trigger: "blur"}],
kind: [{ required: true, message: "请选择专利类型", trigger: "change" }], kind: [{required: true, message: "请选择专利类型", trigger: "change"}],
ipcCode: [ ipcCode: [
{ required: true, message: "IPC分类号不能为空", trigger: "blur" }, {required: true, message: "IPC分类号不能为空", trigger: "blur"},
], ],
status: [ status: [
{ {
@ -293,14 +300,14 @@ const data = reactive({
trigger: "change", trigger: "change",
}, },
], ],
description: [{ required: true, message: "摘要不能为空", trigger: "blur" }], description: [{required: true, message: "摘要不能为空", trigger: "blur"}],
principalClaim: [ principalClaim: [
{ required: true, message: "主权项不能为空", trigger: "blur" }, {required: true, message: "主权项不能为空", trigger: "blur"},
], ],
}, },
}); });
const { queryParams, form, rules } = toRefs(data); const {queryParams, form, rules} = toRefs(data);
const queryRef = ref(); const queryRef = ref();
const patentRef = ref(); const patentRef = ref();
@ -309,39 +316,42 @@ const expertId = ref(undefined);
/** 查询数据列表 */ /** 查询数据列表 */
const getList = async () => { const getList = async () => {
loading.value = true; loading.value = true;
const { data } = await getInfo(); const {data} = await getInfo();
form.value.expertId = data.casExpert.id; form.value.expertId = data.casExpert.id;
const id = data.casExpert.id; const id = data.casExpert.id;
expertId.value = data.casExpert.id; expertId.value = data.casExpert.id;
expertPatentList(id, queryParams.value).then((resp) => { expertPatentList(id, queryParams.value).then((resp) => {
dataList.value = resp.rows; dataList.value = resp.rows;
total.value = resp.total; total.value = resp.total;
}).finally(() => {
loading.value = false; loading.value = false;
}); })
}; };
/** 搜索按钮操作 */ /** 搜索按钮操作 */
const handleQuery = () => { const handleQuery = () => {
queryParams.value.pageNum = 1; queryParams.value.pageNum = 1;
getList(); getList();
}; };
/** 重置按钮操作 */ /** 重置按钮操作 */
function resetQuery() { function resetQuery() {
queryRef.value.resetFields(); queryRef.value.resetFields();
handleQuery(); handleQuery();
} }
/** 删除按钮操作 */ /** 删除按钮操作 */
function handleDelete(id) { function handleDelete(id) {
ElMessageBox.confirm('是否确认删除数据编号为"' + id + '"的专利项?') ElMessageBox.confirm('是否确认删除数据编号为"' + id + '"的专利项?')
.then(function () { .then(function () {
return deleteCasPatentByIds(id); return deleteCasPatentByIds(id);
}) })
.then(() => { .then(() => {
getList(); getList();
ElMessage.success("删除成功"); ElMessage.success("删除成功");
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
}); });
} }
/** 重置新增的表单以及其他数据 */ /** 重置新增的表单以及其他数据 */
@ -363,6 +373,7 @@ function reset() {
}; };
proxy.resetForm("patentRef"); proxy.resetForm("patentRef");
} }
/** 添加数据 */ /** 添加数据 */
const handleAdd = () => { const handleAdd = () => {
reset(); reset();
@ -384,17 +395,18 @@ const handleUpdate = (row) => {
const submitForm = async () => { const submitForm = async () => {
await patentRef.value.validate(); await patentRef.value.validate();
if (form.value.id != undefined) { if (form.value.id != undefined) {
await updateCasPatent({ ...form.value, expertId: expertId.value }); await updateCasPatent({...form.value, expertId: expertId.value});
ElMessage.success("修改成功"); ElMessage.success("修改成功");
open.value = false; open.value = false;
getList(); getList();
} else { } else {
await insertCasPatent({ ...form.value, expertId: expertId.value }); await insertCasPatent({...form.value, expertId: expertId.value});
ElMessage.success("新增成功"); ElMessage.success("新增成功");
open.value = false; open.value = false;
getList(); getList();
} }
}; };
/** 取消按钮 */ /** 取消按钮 */
function cancel() { function cancel() {
open.value = false; open.value = false;