技术管理

This commit is contained in:
熊丽君
2022-03-08 11:25:16 +08:00
parent b3ee6326ac
commit 2c38b5e8df
14 changed files with 580 additions and 464 deletions

View File

@ -0,0 +1,59 @@
import request from '@/utils/request';
// 专家 - 需求
export function demand(data) {
return request({
url: '/enterprise/v1/technology/demand',
method:'post',
data
});
}
// 专家 - 需求 -- 添加
export function demandAdd(data) {
return request({
url: '/enterprise/v1/technology/demand/add',
method:'post',
data
});
}
// 专家 - 需求 -- 修改
export function demandEdit(data) {
return request({
url: '/enterprise/v1/technology/demand/edit',
method:'post',
data
});
}
// 专家 - 需求 -- 详情
export function demandDetail(data) {
return request({
url: '/enterprise/v1/technology/demand/detail',
method:'post',
data
});
}
// 专家 - 需求 -- 删除
export function demandDelete(data) {
return request({
url: '/enterprise/v1/technology/demand/delete',
method:'post',
data
});
}
// ------------------------------------------------------
// 专家 - 合作
export function expertCooperate(data) {
return request({
url: '',
method:'post',
data
});
}
// 专家 - 合作详情
export function cooperateDetail(data) {
return request({
url: '',
method:'post',
data
});
}

View File

@ -0,0 +1,158 @@
import request from '@/utils/request';
// 专家 - 成果
export function expertAchievement(data) {
return request({
url: '/enterprise/v1/technology/achievement',
method:'post',
data
});
}
// 专家 - 成果 -- 添加
export function achievementAdd(data) {
return request({
url: '/enterprise/v1/technology/achievement/add',
method:'post',
data
});
}
// 专家 - 成果 -- 修改
export function achievementEdit(data) {
return request({
url: '/enterprise/v1/technology/achievement/edit',
method:'post',
data
});
}
// 专家 - 成果 -- 下架
export function achievementShelf(data) {
return request({
url: '/enterprise/v1/technology/achievement/shelf',
method:'post',
data
});
}
// 专家 - 成果 -- 删除
export function achievementDelete(data) {
return request({
url: '/enterprise/v1/technology/achievement/delete',
method:'post',
data
});
}
// -----------------------------------------------------------
// 专家 - 专利
export function expertPatent(data) {
return request({
url: '/enterprise/v1/technology/patent',
method:'post',
data
});
}
// 专家 - 专利 -- 添加
export function patentAdd(data) {
return request({
url: '/enterprise/v1/technology/patent/add',
method:'post',
data
});
}
// 专家 - 专利 -- 修改
export function patentEdit(data) {
return request({
url: '/enterprise/v1/technology/patent/edit',
method:'post',
data
});
}
// 专家 - 专利 -- 详情
export function patentDetail(data) {
return request({
url: '/enterprise/v1/technology/patent/detail',
method:'post',
data
});
}
// 专家 - 专利 -- 删除
export function patentDelete(data) {
return request({
url: '/enterprise/v1/technology/patent/delete',
method:'post',
data
});
}
// -----------------------------------------------------------
// 专家 - 论文
export function expertPaper(data) {
return request({
url: '/enterprise/v1/technology/paper',
method:'post',
data
});
}
// 专家 - 论文 -- 添加
export function paperAdd(data) {
return request({
url: '/enterprise/v1/technology/paper/add',
method:'post',
data
});
}
// 专家 - 论文 -- 修改
export function paperEdit(data) {
return request({
url: '/enterprise/v1/technology/paper/edit',
method:'post',
data
});
}
// 专家 - 论文 -- 删除
export function paperDelete(data) {
return request({
url: '/enterprise/v1/technology/paper/delete',
method:'post',
data
});
}
// -----------------------------------------------------------
// 专家 - 项目
export function expertProject(data) {
return request({
url: '/enterprise/v1/technology/project',
method:'post',
data
});
}
// 专家 - 项目 -- 添加
export function projectAdd(data) {
return request({
url: '/enterprise/v1/technology/project/add',
method:'post',
data
});
}
// 专家 - 项目 -- 修改
export function projectEdit(data) {
return request({
url: '/enterprise/v1/technology/project/edit',
method:'post',
data
});
}
// 专家 - 项目 -- 下架
export function projectShelf(data) {
return request({
url: '/enterprise/v1/technology/project/shelf',
method:'post',
data
});
}
// 专家 - 项目 -- 删除
export function projectDelete(data) {
return request({
url: '/enterprise/v1/technology/project/delete',
method:'post',
data
});
}

View File

@ -24,6 +24,7 @@ const route = useRoute();
const router = useRouter(); const router = useRouter();
const {proxy} = getCurrentInstance(); const {proxy} = getCurrentInstance();
const sizeOptions = ref([ const sizeOptions = ref([
{ label: "Default", value: "default" },
{ label: 'Large', value: 'large' }, { label: 'Large', value: 'large' },
{ label: 'Medium', value: 'medium' }, { label: 'Medium', value: 'medium' },
{ label: 'Small', value: 'small' }, { label: 'Small', value: 'small' },

View File

@ -28,7 +28,7 @@ import './permission' // permission control
import { useDict } from '@/utils/dict' import { useDict } from '@/utils/dict'
import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel } from '@/utils/ruoyi' import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel } from '@/utils/ruoyi'
import { modeOptions, educationOptions, enterpriseOptions } from '@/utils/parameter' import { modeOptions, educationOptions, enterpriseOptions ,maturityOptions,leadOptions,patentOptions} from '@/utils/parameter'
// 分页组件 // 分页组件
import Pagination from '@/components/Pagination' import Pagination from '@/components/Pagination'
@ -60,6 +60,9 @@ app.config.globalProperties.selectDictLabel = selectDictLabel
app.config.globalProperties.modeOptions = modeOptions app.config.globalProperties.modeOptions = modeOptions
app.config.globalProperties.educationOptions = educationOptions app.config.globalProperties.educationOptions = educationOptions
app.config.globalProperties.enterpriseOptions = enterpriseOptions app.config.globalProperties.enterpriseOptions = enterpriseOptions
app.config.globalProperties.maturityOptions = maturityOptions
app.config.globalProperties.leadOptions = leadOptions
app.config.globalProperties.patentOptions = patentOptions
app.config.globalProperties.md5 = md5; app.config.globalProperties.md5 = md5;
// 全局组件挂载 // 全局组件挂载

View File

@ -33,3 +33,26 @@ export const enterpriseOptions = [
{ key: 102, value: '优质企业' }, { key: 102, value: '优质企业' },
{ key: 103, value: '普通企业' }, { key: 103, value: '普通企业' },
] ]
// 成果成熟度 技术
export const maturityOptions = [
{ key: 1, value: '正在研发' },
{ key: 2, value: '小试阶段' },
{ key: 3, value: '通过小试' },
{ key: 4, value: '中试阶段' },
{ key: 5, value: '通过中试' },
{ key: 6, value: '可规模生产' },
]
// 成果领先型 领先标准
export const leadOptions = [
{ key: 1, value: '国内先进' },
{ key: 2, value: '国内领先' },
{ key: 3, value: '国际先进' },
{ key: 4, value: '国际领先' },
]
// 专利类型
export const patentOptions = [
{ key: 1, value: '发明专利' },
{ key: 2, value: '外观设计' },
{ key: 3, value: '实用新型' },
]

View File

@ -6,16 +6,16 @@
:label-width="labelWidth + 'px'" :label-width="labelWidth + 'px'"
> >
<el-row class="mb20"> <el-row class="mb20">
<el-radio-group v-model="modelValue.type"> <el-radio-group v-model="modelValue.mode">
<el-radio-button label="1">免费成果发布</el-radio-button> <el-radio-button :label="1">免费成果发布</el-radio-button>
<el-radio-button label="2">付费成果发布</el-radio-button> <el-radio-button :label="2">付费成果发布</el-radio-button>
</el-radio-group> </el-radio-group>
</el-row> </el-row>
<div class="form_title" v-if="showTitle">基本信息</div> <div class="form_title" v-if="showTitle">基本信息</div>
<el-alert <el-alert
v-if="modelValue.type == 2" v-if="modelValue.mode == 2"
style="margin-bottom: 20px" style="margin-bottom: 20px"
title="1创新币=1元" title="1创新币=1元"
type="warning" type="warning"
@ -23,24 +23,24 @@
:closable="false" :closable="false"
></el-alert> ></el-alert>
<el-row v-if="modelValue.type == 2"> <el-row v-if="modelValue.mode == 2">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="视频定价:"> <el-form-item label="视频定价:">
<el-input v-model="modelValue.name" placeholder="请输入创新币个数"> <el-input v-model="modelValue.title" placeholder="请输入创新币个数">
<template #append>创新币</template> <template #append>创新币</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="免费观看时长:"> <el-form-item label="免费观看时长:">
<el-input v-model="modelValue.name" placeholder="默认视频的1/3时长"> <el-input v-model="modelValue.title" placeholder="默认视频的1/3时长">
<template #append>min</template> <template #append>min</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="modelValue.type == 2"> <el-row v-if="modelValue.mode == 2">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="视频文件:"> <el-form-item label="视频文件:">
<FileUpload <FileUpload
@ -54,9 +54,9 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="成果名称:" prop="name"> <el-form-item label="成果名称:" prop="title">
<el-input <el-input
v-model="modelValue.name" v-model="modelValue.title"
placeholder="请输入成果名称" placeholder="请输入成果名称"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@ -82,44 +82,51 @@
v-model="modelValue" v-model="modelValue"
title="应用客户" title="应用客户"
placeholder="请输入应用客户" placeholder="请输入应用客户"
fieldKey="researchs" fieldKey="customer"
ref="directionsForm" ref="directionsForm"
/> />
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="成果成熟度:" prop="license"> <el-form-item label="成果成熟度:" prop="maturity">
<el-select <el-select
v-model="modelValue.province" v-model="modelValue.maturity"
clearable clearable
placeholder="请选择" placeholder="请选择"
> >
<!-- <el-option <el-option
v-for="(key, value) in provinceSelectList" v-for="item in maturityOptions"
:key="value" :key="item.key"
:label="key" :label="item.value"
:value="value" :value="item.key"
> >
</el-option> --> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="成果领先性:" prop="license"> <el-form-item label="成果领先性:" prop="lead_standard">
<el-select <el-select
v-model="modelValue.province" v-model="modelValue.lead_standard"
clearable clearable
placeholder="请选择" placeholder="请选择"
> >
<el-option
v-for="item in leadOptions"
:key="item.key"
:label="item.value"
:value="item.key"
>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="合作模式:" prop="license"> <el-form-item label="合作模式:" prop="lead_standard">
<el-select <el-select
v-model="modelValue.province" v-model="modelValue.province"
clearable clearable
@ -131,6 +138,7 @@
</el-row> </el-row>
<InputBoxAdd <InputBoxAdd
v-if="modelValue.mode == 2"
:labelWidth="labelWidth" :labelWidth="labelWidth"
v-model="modelValue" v-model="modelValue"
title="应用场景" title="应用场景"
@ -144,7 +152,7 @@
v-model="modelValue" v-model="modelValue"
title="关键词" title="关键词"
placeholder="请输入关键词" placeholder="请输入关键词"
fieldKey="kws" fieldKey="keywords"
ref="directionsForm" ref="directionsForm"
/> />
@ -159,7 +167,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="modelValue.type == 1"> <el-row v-if="modelValue.mode == 1">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="成果来源:" prop="introduce"> <el-form-item label="成果来源:" prop="introduce">
<Editor <Editor
@ -170,11 +178,11 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="modelValue.type == 1"> <el-row v-if="modelValue.mode == 1">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="成果图片:" prop="license"> <el-form-item label="成果图片:" prop="image">
<ImageUpload <ImageUpload
v-model="modelValue.license" v-model="modelValue.image"
:isShowTip="false" :isShowTip="false"
:limit="1" :limit="1"
/> />
@ -186,9 +194,9 @@
</p> </p>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="成熟度证明材料:" prop="license"> <el-form-item label="成熟度证明材料:" prop="file">
<FileUpload <FileUpload
v-model="modelValue.license" v-model="modelValue.file"
:limit="1" :limit="1"
:fileType="['doc', 'xls', 'ppt', 'txt', 'pdf', 'jpg']" :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf', 'jpg']"
/> />
@ -227,7 +235,7 @@ export default {
return { return {
rules: { rules: {
product: [{ required: true, message: "请输入", trigger: "blur" }], product: [{ required: true, message: "请输入", trigger: "blur" }],
name: [{ required: true, message: "请输入", trigger: "blur" }], title: [{ required: true, message: "请输入", trigger: "blur" }],
kind: [{ required: true, message: "请选择", trigger: "change" }], kind: [{ required: true, message: "请选择", trigger: "change" }],
code: [{ required: true, message: "请输入", trigger: "blur" }], code: [{ required: true, message: "请输入", trigger: "blur" }],
mobile: [ mobile: [
@ -258,7 +266,7 @@ export default {
trigger: ["change", "blur"], trigger: ["change", "blur"],
}, },
], ],
license: [ lead_standard: [
{ {
required: true, required: true,
message: "请上传", message: "请上传",

View File

@ -1,31 +1,5 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- <el-form
:model="queryParams"
ref="queryRef"
v-show="showSearch"
:inline="true"
@submit.prevent
>
<el-form-item label="企业名称" prop="researchName">
<el-input
v-model="queryParams.researchName"
placeholder="请输入企业名称"
clearable
size="small"
style="width: 240px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"
>搜索</el-button
>
<el-button icon="Refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</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
@ -37,10 +11,6 @@
>新增</el-button >新增</el-button
> >
</el-col> </el-col>
<!-- <right-toolbar
v-model:showSearch="showSearch"
@queryTable="getList"
></right-toolbar> -->
</el-row> </el-row>
<!-- 表格数据 --> <!-- 表格数据 -->
@ -144,23 +114,9 @@
</template> </template>
<script setup> <script setup>
import { import { expertCooperate } from "@/api/admin/expert/demand";
addRole,
changeRoleStatus, import { addRole, delRole, updateRole } from "@/api/system/role";
dataScope,
delRole,
getRole,
listRole,
updateRole,
} from "@/api/system/role";
import {
roleMenuTreeselect,
treeselect as menuTreeselect,
} from "@/api/system/menu";
import {
treeselect as deptTreeselect,
roleDeptTreeselect,
} from "@/api/system/dept";
const router = useRouter(); const router = useRouter();
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
@ -175,8 +131,8 @@ const title = ref("");
const data = reactive({ const data = reactive({
form: {}, form: {},
queryParams: { queryParams: {
pageNum: 1, page_num: 1,
pageSize: 10, page_size: 10,
researchName: undefined, researchName: undefined,
}, },
rules: { rules: {
@ -210,13 +166,11 @@ function getList() {
dataList.value = [1]; dataList.value = [1];
total.value = 15; total.value = 15;
loading.value = false; loading.value = false;
// listRole(queryParams.value).then( // expertCooperate(queryParams.value).then((response) => {
// (response) => { // dataList.value = response.data.data;
// dataList.value = response.rows; // total.value = response.data.count;
// total.value = response.total; // loading.value = false;
// loading.value = false; // });
// }
// );
} }
/** 搜索按钮操作 */ /** 搜索按钮操作 */
function handleQuery() { function handleQuery() {

View File

@ -119,15 +119,15 @@ const data = reactive({
name: [{ required: true, message: "需求名称不能为空", trigger: "blur" }], name: [{ required: true, message: "需求名称不能为空", trigger: "blur" }],
add: [{ required: true, message: "需求描述不能为空", trigger: "blur" }], add: [{ required: true, message: "需求描述不能为空", trigger: "blur" }],
bankAccount: [ bankAccount: [
{ required: true, message: "开户行账号不能为空", trigger: "blur" }, { required: true, message: "需求联系人不能为空", trigger: "blur" },
], ],
bankPhone: [ bankPhone: [
{ required: true, message: "开户行电话不能为空", trigger: "blur" }, { required: true, message: "联系人手机号不能为空", trigger: "blur" },
], ],
username: [{ required: true, message: "联系人不能为空", trigger: "blur" }], username: [
userPhone: [ { required: true, message: "需求提交人不能为空", trigger: "blur" },
{ required: true, message: "联系人电话不能为空", trigger: "blur" },
], ],
userPhone: [{ required: true, message: "手机号不能为空", trigger: "blur" }],
}, },
}); });
@ -188,4 +188,3 @@ function addCheck() {
} }
} }
</script> </script>

View File

@ -82,14 +82,14 @@
</div> </div>
</template> </template>
<script setup name="Post"> <script setup>
import { import {
listPost, demand,
addPost, demandAdd,
delPost, demandEdit,
getPost, demandDetail,
updatePost, demandDelete,
} from "@/api/system/post"; } from "@/api/admin/expert/demand";
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const router = useRouter(); const router = useRouter();
@ -142,7 +142,7 @@ function getList() {
total.value = 15; total.value = 15;
loading.value = false; loading.value = false;
// loading.value = true; // loading.value = true;
// listPost(proxy.addDateRange(queryParams.value, dateRange.value)).then( // demand(proxy.addDateRange(queryParams.value, dateRange.value)).then(
// (response) => { // (response) => {
// postList.value = response.rows; // postList.value = response.rows;
// total.value = response.total; // total.value = response.total;
@ -166,7 +166,7 @@ function handleDelete(id) {
proxy.$modal proxy.$modal
.confirm('是否确认删除订单号为"' + id + '"的数据项?') .confirm('是否确认删除订单号为"' + id + '"的数据项?')
.then(function () { .then(function () {
return delPost(postIds); return demandDelete(postIds);
}) })
.then(() => { .then(() => {
getList(); getList();

View File

@ -1,104 +1,53 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- <el-form
:model="queryParams"
ref="queryRef"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="订单号" prop="postCode">
<el-input
v-model="queryParams.postCode"
placeholder="请输入订单号"
clearable
size="small"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="dateRange"
size="small"
style="width: 240px"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"
>搜索</el-button
>
<el-button icon="Refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form> -->
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<router-link to="./release"> <router-link to="./release">
<el-button type="primary" size="mini">发布成果</el-button> <el-button type="primary" size="mini">发布成果</el-button>
</router-link> </router-link>
</el-col> </el-col>
<right-toolbar
v-model:showSearch="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-radio-group <el-radio-group
v-model="queryParams.type" v-model="queryParams.status"
size="mini" size="mini"
@change="handleQuery" @change="handleQuery"
> >
<el-radio-button label="1">已发布</el-radio-button> <el-radio-button :label="2">已发布</el-radio-button>
<el-radio-button label="2">待审核</el-radio-button> <el-radio-button :label="1">待审核</el-radio-button>
<el-radio-button label="3">已驳回</el-radio-button> <el-radio-button :label="3">已驳回</el-radio-button>
<el-radio-button label="4">草稿箱</el-radio-button> <el-radio-button :label="0">草稿箱</el-radio-button>
</el-radio-group> </el-radio-group>
<el-table v-loading="loading" :data="postList" style="margin-top: 20px"> <el-table v-loading="loading" :data="postList" style="margin-top: 20px">
<el-table-column label="成果名称" align="center" prop="postCode" /> <el-table-column label="数据编号" prop="id" />
<el-table-column label="成果领域" align="center" prop="postSort" /> <el-table-column label="成果名称" prop="title" />
<el-table-column label="浏览量" align="center" prop="status" /> <el-table-column label="成果领域" prop="industrys" />
<el-table-column <el-table-column label="浏览量" prop="visit_count" />
label="发布时间" <el-table-column label="发布时间" prop="created_at" width="180">
align="center"
prop="createTime"
width="180"
>
<template #default="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.created_at) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作" class-name="small-padding fixed-width">
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template #default="scope"> <template #default="scope">
<el-button <router-link
v-if="queryParams.type == 4" :to="{ path: './release', query: { id: scope.row.id } }"
size="mini" v-if="queryParams.status == 0"
type="text"
icon="Edit"
@click="handleDelete(scope.row.id)"
>编辑</el-button
> >
<el-button size="mini" type="text" icon="Edit">编辑</el-button>
</router-link>
<el-button <el-button
v-if="queryParams.type == 1" v-if="queryParams.status == 2"
size="mini" size="mini"
type="text" type="text"
icon="Download" icon="Download"
@click="handleDelete(scope.row.id)" @click="handleShelf(scope.row)"
>下架</el-button >下架</el-button
> >
<el-button <el-button
v-if="queryParams.type != 2" v-if="queryParams.status != 1"
size="mini" size="mini"
type="text" type="text"
icon="Delete" icon="Delete"
@ -106,7 +55,7 @@
>删除</el-button >删除</el-button
> >
<el-button <el-button
v-if="queryParams.type == 1" v-if="queryParams.status == 2"
size="mini" size="mini"
type="text" type="text"
icon="View" icon="View"
@ -114,11 +63,10 @@
>查看匹配结果</el-button >查看匹配结果</el-button
> >
<el-button <el-button
v-if="queryParams.type == 2" v-if="queryParams.status == 1"
size="mini" size="mini"
type="text" type="text"
icon="Close" icon="Close"
@click="handleDelete(scope.row.id)"
>取消发布</el-button >取消发布</el-button
> >
</template> </template>
@ -137,12 +85,10 @@
<script setup name="Post"> <script setup name="Post">
import { import {
listPost, expertAchievement,
addPost, achievementShelf,
delPost, achievementDelete,
getPost, } from "@/api/admin/expert/technology";
updatePost,
} from "@/api/system/post";
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const router = useRouter(); const router = useRouter();
@ -156,10 +102,9 @@ const dateRange = ref([]);
const data = reactive({ const data = reactive({
form: {}, form: {},
queryParams: { queryParams: {
pageNum: 1, page_num: 1,
pageSize: 10, page_size: 10,
postCode: undefined, status: 2,
type: "1",
}, },
rules: { rules: {
name: [{ required: true, message: "公司名称不能为空", trigger: "blur" }], name: [{ required: true, message: "公司名称不能为空", trigger: "blur" }],
@ -190,18 +135,12 @@ const { queryParams, form, rules } = toRefs(data);
/** 查询列表 */ /** 查询列表 */
function getList() { function getList() {
// console.log(proxy.addDateRange(queryParams.value, dateRange.value)); loading.value = true;
postList.value = [1]; expertAchievement(queryParams.value).then((response) => {
total.value = 15; postList.value = response.data.data;
loading.value = false; total.value = response.data.count;
// loading.value = true; loading.value = false;
// listPost(proxy.addDateRange(queryParams.value, dateRange.value)).then( });
// (response) => {
// postList.value = response.rows;
// total.value = response.total;
// loading.value = false;
// }
// );
} }
/** 搜索按钮操作 */ /** 搜索按钮操作 */
function handleQuery() { function handleQuery() {
@ -217,9 +156,9 @@ function resetQuery() {
/** 删除按钮操作 */ /** 删除按钮操作 */
function handleDelete(id) { function handleDelete(id) {
proxy.$modal proxy.$modal
.confirm('是否确认删除订单号为"' + id + '"的数据项?') .confirm('是否确认删除数据编号为"' + id + '"的成果项?')
.then(function () { .then(function () {
return delPost(postIds); return achievementDelete({ id });
}) })
.then(() => { .then(() => {
getList(); getList();
@ -227,6 +166,20 @@ function handleDelete(id) {
}) })
.catch(() => {}); .catch(() => {});
} }
function handleShelf(row) {
let text = row.shelf_status == 2 ? "上架" : "下架";
proxy.$modal
.confirm('确认要"' + text + '""' + row.id + '"的成果吗?')
.then(function () {
let status = row.shelf_status == 1 ? 2 : 1;
return achievementShelf({ id: row.id, status });
})
.then(() => {
getList();
proxy.$modal.msgSuccess(text + "成功");
})
.catch(() => {});
}
function handleResults(id) { function handleResults(id) {
router.push({ path: "./results" }); router.push({ path: "./results" });
} }

View File

@ -7,9 +7,9 @@
:inline="true" :inline="true"
@submit.prevent @submit.prevent
> >
<el-form-item label="论文题目" prop="roleName"> <el-form-item label="论文题目" prop="title">
<el-input <el-input
v-model="queryParams.roleName" v-model="queryParams.title"
placeholder="请输入论文题目" placeholder="请输入论文题目"
clearable clearable
size="small" size="small"
@ -45,22 +45,18 @@
<!-- 表格数据 --> <!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList"> <el-table v-loading="loading" :data="dataList">
<el-table-column label="数据编号" prop="roleId" /> <el-table-column label="数据编号" prop="id" />
<el-table-column <el-table-column
label="论文题目" label="论文题目"
prop="roleName" prop="title"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column label="刊物" prop="ext" :show-overflow-tooltip="true" />
label="刊物" <el-table-column label="作者" prop="author" />
prop="roleKey" <el-table-column label="关键词" align="center" prop="keywords" />
:show-overflow-tooltip="true" <el-table-column label="出版日期" align="center" prop="created_at">
/>
<el-table-column label="作者" prop="roleSort" />
<el-table-column label="关键词" prop="roleSort" />
<el-table-column label="出版日期" align="center" prop="createTime">
<template #default="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.created_at) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -97,21 +93,21 @@
<!-- 添加或修改数据配置对话框 --> <!-- 添加或修改数据配置对话框 -->
<el-dialog :title="title" v-model="open" width="800px" append-to-body> <el-dialog :title="title" v-model="open" width="800px" append-to-body>
<el-form ref="roleRef" :model="form" :rules="rules" label-width="100px"> <el-form ref="paperRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="论文题目:" prop="roleName"> <el-form-item label="论文题目:" prop="title">
<el-input v-model="form.roleName" placeholder="请输入论文题目" /> <el-input v-model="form.title" placeholder="请输入论文题目" />
</el-form-item> </el-form-item>
<el-form-item label="刊物:" prop="roleKey"> <el-form-item label="刊物:" prop="ext">
<el-input v-model="form.roleKey" placeholder="请输入刊物" /> <el-input v-model="form.ext" placeholder="请输入刊物" />
</el-form-item> </el-form-item>
<el-form-item label="作者:" prop="author"> <el-form-item label="作者:" prop="author">
<el-input v-model="form.author" placeholder="多人员请用 , 隔开" /> <el-input v-model="form.author" placeholder="多人员请用 , 隔开" />
</el-form-item> </el-form-item>
<el-form-item label="出版日期:" prop="time"> <el-form-item label="出版日期:" prop="publish_at">
<el-date-picker <el-date-picker
v-model="form.time" v-model="form.publish_at"
type="date" type="date"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择出版日期" placeholder="请选择出版日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
@ -144,22 +140,11 @@
<script setup> <script setup>
import InputBoxAdd from "@/views/identity/components/InputBoxAdd"; import InputBoxAdd from "@/views/identity/components/InputBoxAdd";
import { import {
addRole, expertPaper,
changeRoleStatus, paperAdd,
dataScope, paperEdit,
delRole, paperDelete,
getRole, } from "@/api/admin/expert/technology";
listRole,
updateRole,
} from "@/api/system/role";
import {
roleMenuTreeselect,
treeselect as menuTreeselect,
} from "@/api/system/menu";
import {
treeselect as deptTreeselect,
roleDeptTreeselect,
} from "@/api/system/dept";
const router = useRouter(); const router = useRouter();
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
@ -174,17 +159,15 @@ const title = ref("");
const data = reactive({ const data = reactive({
form: {}, form: {},
queryParams: { queryParams: {
pageNum: 1, page_num: 1,
pageSize: 10, page_size: 10,
roleName: undefined, title: undefined,
}, },
rules: { rules: {
roleName: [ title: [{ required: true, message: "论文题目不能为空", trigger: "blur" }],
{ required: true, message: "论文题目不能为空", trigger: "blur" }, ext: [{ required: true, message: "刊物不能为空", trigger: "blur" }],
],
roleKey: [{ required: true, message: "刊物不能为空", trigger: "blur" }],
author: [{ required: true, message: "作者不能为空", trigger: "blur" }], author: [{ required: true, message: "作者不能为空", trigger: "blur" }],
time: [ publish_at: [
{ {
required: true, required: true,
message: "请选择出版日期", message: "请选择出版日期",
@ -199,16 +182,11 @@ const { queryParams, form, rules } = toRefs(data);
/** 查询数据列表 */ /** 查询数据列表 */
function getList() { function getList() {
loading.value = true; loading.value = true;
dataList.value = [1]; expertPaper(queryParams.value).then((response) => {
total.value = 15; dataList.value = response.data.data;
loading.value = false; total.value = response.data.count;
// listRole(queryParams.value).then( loading.value = false;
// (response) => { });
// dataList.value = response.rows;
// total.value = response.total;
// loading.value = false;
// }
// );
} }
/** 搜索按钮操作 */ /** 搜索按钮操作 */
function handleQuery() { function handleQuery() {
@ -225,7 +203,7 @@ function handleDelete(row) {
proxy.$modal proxy.$modal
.confirm('是否确认删除数据编号为"' + row.id + '"的数据项?') .confirm('是否确认删除数据编号为"' + row.id + '"的数据项?')
.then(function () { .then(function () {
return delRole(roleIds); return paperDelete({ id: row.id });
}) })
.then(() => { .then(() => {
getList(); getList();
@ -237,15 +215,15 @@ function handleDelete(row) {
/** 重置新增的表单以及其他数据 */ /** 重置新增的表单以及其他数据 */
function reset() { function reset() {
form.value = { form.value = {
roleId: undefined, id: undefined,
roleName: undefined, title: undefined,
roleKey: undefined, ext: undefined,
author: undefined, author: undefined,
time: undefined, publish_at: undefined,
keywords: [], keywords: [],
remark: undefined, remark: undefined,
}; };
proxy.resetForm("roleRef"); proxy.resetForm("paperRef");
} }
/** 添加数据 */ /** 添加数据 */
function handleAdd() { function handleAdd() {
@ -255,29 +233,28 @@ function handleAdd() {
} }
/** 修改数据 */ /** 修改数据 */
function handleUpdate(row) { function handleUpdate(row) {
reset(); form.value = JSON.parse(JSON.stringify(row));
form.value = Object.assign({}, row);
open.value = true; open.value = true;
title.value = "修改数据"; title.value = "修改数据";
} }
/** 提交按钮 */ /** 提交按钮 */
function submitForm() { function submitForm() {
proxy.$refs["roleRef"].validate((valid) => { proxy.$refs["paperRef"].validate((valid) => {
if (valid) { const keywordsForm = proxy.$refs.keywordsForm.submitForm();
console.log(form.value); if (valid && keywordsForm) {
// if (form.value.roleId != undefined) { if (form.value.id != undefined) {
// updateRole(form.value).then((response) => { paperEdit(form.value).then((response) => {
// proxy.$modal.msgSuccess("修改成功"); proxy.$modal.msgSuccess("修改成功");
// open.value = false; open.value = false;
// getList(); getList();
// }); });
// } else { } else {
// addRole(form.value).then((response) => { paperAdd(form.value).then((response) => {
// proxy.$modal.msgSuccess("新增成功"); proxy.$modal.msgSuccess("新增成功");
// open.value = false; open.value = false;
// getList(); getList();
// }); });
// } }
} }
}); });
} }

View File

@ -5,10 +5,11 @@
ref="queryRef" ref="queryRef"
v-show="showSearch" v-show="showSearch"
:inline="true" :inline="true"
@submit.prevent
> >
<el-form-item label="专利名称" prop="roleName"> <el-form-item label="专利名称" prop="title">
<el-input <el-input
v-model="queryParams.roleName" v-model="queryParams.title"
placeholder="请输入专利名称" placeholder="请输入专利名称"
clearable clearable
size="small" size="small"
@ -16,9 +17,9 @@
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="申请人" prop="roleName"> <!-- <el-form-item label="申请人" prop="apply_name">
<el-input <el-input
v-model="queryParams.roleName" v-model="queryParams.apply_name"
placeholder="请输入申请人" placeholder="请输入申请人"
clearable clearable
size="small" size="small"
@ -26,16 +27,16 @@
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="发明人" prop="roleName"> <el-form-item label="发明人" prop="inventor">
<el-input <el-input
v-model="queryParams.roleName" v-model="queryParams.inventor"
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> <el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery" <el-button type="primary" icon="Search" size="mini" @click="handleQuery"
>搜索</el-button >搜索</el-button
@ -56,18 +57,14 @@
>新增</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 <el-button type="primary" plain icon="Plus" size="mini"
type="primary"
plain
icon="Plus"
size="mini"
@click="handleAdd"
>认领</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"
@ -104,7 +101,7 @@
size="mini" size="mini"
type="text" type="text"
icon="Edit" icon="Edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row.id)"
>修改</el-button >修改</el-button
> >
<el-button <el-button
@ -121,14 +118,14 @@
<pagination <pagination
v-show="total > 0" v-show="total > 0"
:total="total" :total="total"
v-model:page="queryParams.pageNum" v-model:page="queryParams.page_num"
v-model:limit="queryParams.pageSize" v-model:limit="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改数据配置对话框 --> <!-- 添加或修改数据配置对话框 -->
<el-dialog :title="title" v-model="open" width="800px" append-to-body> <el-dialog :title="title" v-model="open" width="800px" append-to-body>
<el-form ref="roleRef" :model="form" :rules="rules" label-width="100px"> <el-form ref="patentRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="申请人:" prop="apply_name"> <el-form-item label="申请人:" prop="apply_name">
<el-input <el-input
v-model="form.apply_name" v-model="form.apply_name"
@ -189,13 +186,13 @@
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>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -208,7 +205,7 @@
<el-form-item label="摘要:" prop="description"> <el-form-item label="摘要:" prop="description">
<el-input <el-input
v-model.number="form.description" v-model="form.description"
placeholder="请输入摘要" placeholder="请输入摘要"
type="textarea" type="textarea"
:autosize="{ minRows: 4, maxRows: 8 }" :autosize="{ minRows: 4, maxRows: 8 }"
@ -216,7 +213,7 @@
</el-form-item> </el-form-item>
<el-form-item label="主权项:" prop="principal_claim"> <el-form-item label="主权项:" prop="principal_claim">
<el-input <el-input
v-model.number="form.principal_claim" v-model="form.principal_claim"
placeholder="请输入主权项" placeholder="请输入主权项"
type="textarea" type="textarea"
:autosize="{ minRows: 4, maxRows: 8 }" :autosize="{ minRows: 4, maxRows: 8 }"
@ -235,22 +232,12 @@
<script setup> <script setup>
import { import {
addRole, expertPatent,
changeRoleStatus, patentAdd,
dataScope, patentDetail,
delRole, patentEdit,
getRole, patentDelete,
listRole, } from "@/api/admin/expert/technology";
updateRole,
} from "@/api/system/role";
import {
roleMenuTreeselect,
treeselect as menuTreeselect,
} from "@/api/system/menu";
import {
treeselect as deptTreeselect,
roleDeptTreeselect,
} from "@/api/system/dept";
const router = useRouter(); const router = useRouter();
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
@ -265,9 +252,9 @@ const title = ref("");
const data = reactive({ const data = reactive({
form: {}, form: {},
queryParams: { queryParams: {
pageNum: 1, page_num: 1,
pageSize: 10, page_size: 10,
roleName: undefined, inventor: undefined,
}, },
rules: { rules: {
apply_name: [ apply_name: [
@ -302,20 +289,15 @@ const { queryParams, form, rules } = toRefs(data);
/** 查询数据列表 */ /** 查询数据列表 */
function getList() { function getList() {
loading.value = true; loading.value = true;
dataList.value = [1]; expertPatent(queryParams.value).then((response) => {
total.value = 15; dataList.value = response.data.data;
loading.value = false; total.value = response.data.count;
// listRole(queryParams.value).then( loading.value = false;
// (response) => { });
// dataList.value = response.rows;
// total.value = response.total;
// loading.value = false;
// }
// );
} }
/** 搜索按钮操作 */ /** 搜索按钮操作 */
function handleQuery() { function handleQuery() {
queryParams.value.pageNum = 1; queryParams.value.page_num = 1;
getList(); getList();
} }
/** 重置按钮操作 */ /** 重置按钮操作 */
@ -326,9 +308,9 @@ function resetQuery() {
/** 删除按钮操作 */ /** 删除按钮操作 */
function handleDelete(row) { function handleDelete(row) {
proxy.$modal proxy.$modal
.confirm('是否确认删除数据编号为"' + row.id + '"的数据项?') .confirm('是否确认删除数据编号为"' + row.id + '"的专利项?')
.then(function () { .then(function () {
return delRole(roleIds); return patentDelete({ id: row.id });
}) })
.then(() => { .then(() => {
getList(); getList();
@ -354,7 +336,7 @@ function reset() {
description: undefined, description: undefined,
principal_claim: undefined, principal_claim: undefined,
}; };
proxy.resetForm("roleRef"); proxy.resetForm("patentRef");
} }
/** 添加数据 */ /** 添加数据 */
function handleAdd() { function handleAdd() {
@ -363,30 +345,31 @@ function handleAdd() {
title.value = "添加数据"; title.value = "添加数据";
} }
/** 修改数据 */ /** 修改数据 */
function handleUpdate(row) { function handleUpdate(id) {
reset(); reset();
form.value = Object.assign({}, row); patentDetail({ id }).then((res) => {
open.value = true; form.value = res.data;
title.value = "修改数据"; open.value = true;
title.value = "修改数据";
});
} }
/** 提交按钮 */ /** 提交按钮 */
function submitForm() { function submitForm() {
proxy.$refs["roleRef"].validate((valid) => { proxy.$refs["patentRef"].validate((valid) => {
if (valid) { if (valid) {
console.log(form.value); if (form.value.id != undefined) {
// if (form.value.roleId != undefined) { patentEdit(form.value).then((response) => {
// updateRole(form.value).then((response) => { proxy.$modal.msgSuccess("修改成功");
// proxy.$modal.msgSuccess("修改成功"); open.value = false;
// open.value = false; getList();
// getList(); });
// }); } else {
// } else { patentAdd(form.value).then((response) => {
// addRole(form.value).then((response) => { proxy.$modal.msgSuccess("新增成功");
// proxy.$modal.msgSuccess("新增成功"); open.value = false;
// open.value = false; getList();
// getList(); });
// }); }
// }
} }
}); });
} }

View File

@ -8,26 +8,28 @@
ref="releaseForm" ref="releaseForm"
/> />
<div :style="{ marginLeft: labelWidth + 'px' }"> <div :style="{ marginLeft: labelWidth + 'px' }">
<el-button type="primary" @click="submitForm">保存草稿</el-button> <el-button type="primary" @click="submitForm(0)">保存草稿</el-button>
<el-button type="primary" @click="submitForm">提交审核</el-button> <el-button type="primary" @click="submitForm(1)">提交审核</el-button>
</div> </div>
</el-card> </el-card>
</div> </div>
</template> </template>
<script setup> <script setup>
import { expert } from "@/api/identity/index"; import { achievementAdd } from "@/api/admin/expert/technology";
import ReleaseForm from "../components/ReleaseForm"; import ReleaseForm from "../components/ReleaseForm";
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const labelWidth = 140; const labelWidth = 140;
const form = reactive({ const form = reactive({
type: "1", mode: 1,
}); });
function submitForm(status) { function submitForm(is_submit) {
form["is_submit"] = is_submit;
if (proxy.$refs.releaseForm.submitForm()) { if (proxy.$refs.releaseForm.submitForm()) {
expert(form).then((res) => { console.log(form);
proxy.$modal.msgSuccess("新增成功"); // achievementAdd(form).then((res) => {
proxy.$router.go(-1); // proxy.$modal.msgSuccess("新增成功");
}); // proxy.$router.go(-1);
// });
} else { } else {
console.log("校验未通过"); console.log("校验未通过");
} }

View File

@ -7,9 +7,9 @@
:inline="true" :inline="true"
@submit.prevent @submit.prevent
> >
<el-form-item label="科研项目名称" prop="researchName"> <el-form-item label="科研项目名称" prop="title">
<el-input <el-input
v-model="queryParams.researchName" v-model="queryParams.title"
placeholder="请输入科研项目名称" placeholder="请输入科研项目名称"
clearable clearable
size="small" size="small"
@ -45,22 +45,23 @@
<!-- 表格数据 --> <!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList"> <el-table v-loading="loading" :data="dataList">
<el-table-column label="数据编号" prop="researchId" /> <el-table-column label="数据编号" prop="id" />
<el-table-column <el-table-column
label="科研项目名称" label="科研项目名称"
prop="researchName" prop="title"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column label="类型" prop="kind" />
label="类型" <el-table-column label="课题角色" prop="role">
prop="roleKey"
:show-overflow-tooltip="true"
/>
<el-table-column label="课题角色" prop="roleSort" />
<el-table-column label="课题负责人" prop="roleSort" />
<el-table-column label="发布日期" align="center" prop="createTime">
<template #default="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <div v-if="scope.row.role == 1">承担单位</div>
<div v-else-if="scope.row.role == 2">参与单位</div>
</template>
</el-table-column>
<el-table-column label="课题负责人" prop="director" />
<el-table-column label="发布日期" align="center" prop="created_at">
<template #default="scope">
<span>{{ parseTime(scope.row.created_at) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -72,8 +73,8 @@
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="Edit" icon="Download"
@click="handleEdit(scope.row)" @click="handleShelf(scope.row)"
>下架</el-button >下架</el-button
> >
<!-- <el-button <!-- <el-button
@ -105,33 +106,34 @@
<!-- 添加或修改数据配置对话框 --> <!-- 添加或修改数据配置对话框 -->
<el-dialog :title="title" v-model="open" width="720px" append-to-body> <el-dialog :title="title" v-model="open" width="720px" append-to-body>
<el-form ref="roleRef" :model="form" :rules="rules" label-width="120px"> <el-form ref="roleRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="科研项目名称:" prop="researchName"> <el-form-item label="科研项目名称:" prop="title">
<el-input <el-input v-model="form.title" placeholder="请输入科研项目名称" />
v-model="form.researchName"
placeholder="请输入科研项目名称"
/>
</el-form-item> </el-form-item>
<el-form-item label="课题角色:" prop="company"> <el-form-item label="课题角色:" prop="role">
<el-radio v-model="form.company" label="1">承担单位</el-radio> <el-radio v-model="form.role" :label="1">承担单位</el-radio>
<el-radio v-model="form.company" label="2">参与单位</el-radio> <el-radio v-model="form.role" :label="2">参与单位</el-radio>
</el-form-item> </el-form-item>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="资助经费:" prop="funding"> <el-form-item label="资助经费:" prop="amount">
<el-input v-model="form.funding" placeholder="请输入资助经费" /> <el-input
v-model="form.amount"
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
placeholder="请输入资助经费"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="资助来源:" prop="sources"> <el-form-item label="资助来源:" prop="source">
<el-input v-model="form.sources" placeholder="请输入资助来源" /> <el-input v-model="form.source" placeholder="请输入资助来源" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="开始日期:" prop="beginTime"> <el-form-item label="开始日期:" prop="begin_at">
<el-date-picker <el-date-picker
v-model="form.beginTime" v-model="form.begin_at"
type="date" type="date"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
placeholder="请选择开始日期" placeholder="请选择开始日期"
@ -139,9 +141,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="结束日期:" prop="endTime"> <el-form-item label="结束日期:" prop="finish_at">
<el-date-picker <el-date-picker
v-model="form.endTime" v-model="form.finish_at"
type="date" type="date"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
placeholder="请选择结束日期" placeholder="请选择结束日期"
@ -151,17 +153,14 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="项目类型:" prop="projectType"> <el-form-item label="项目类型:" prop="kind">
<el-input <el-input v-model="form.kind" placeholder="请输入项目类型" />
v-model="form.projectType"
placeholder="请输入项目类型"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="课题负责人:" prop="projectLeader"> <el-form-item label="课题负责人:" prop="director">
<el-input <el-input
v-model="form.projectLeader" v-model="form.director"
placeholder="请输入课题负责人" placeholder="请输入课题负责人"
/> />
</el-form-item> </el-form-item>
@ -180,22 +179,12 @@
<script setup> <script setup>
import { import {
addRole, expertProject,
changeRoleStatus, projectAdd,
dataScope, projectEdit,
delRole, projectShelf,
getRole, projectDelete,
listRole, } from "@/api/admin/expert/technology";
updateRole,
} from "@/api/system/role";
import {
roleMenuTreeselect,
treeselect as menuTreeselect,
} from "@/api/system/menu";
import {
treeselect as deptTreeselect,
roleDeptTreeselect,
} from "@/api/system/dept";
const router = useRouter(); const router = useRouter();
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
@ -210,34 +199,32 @@ const title = ref("");
const data = reactive({ const data = reactive({
form: {}, form: {},
queryParams: { queryParams: {
pageNum: 1, page_num: 1,
pageSize: 10, page_size: 10,
researchName: undefined, title: undefined,
}, },
rules: { rules: {
researchName: [ title: [
{ required: true, message: "科研项目名称不能为空", trigger: "blur" }, { required: true, message: "科研项目名称不能为空", trigger: "blur" },
], ],
funding: [{ required: true, message: "资助经费不能为空", trigger: "blur" }], amount: [{ required: true, message: "资助经费不能为空", trigger: "blur" }],
sources: [{ required: true, message: "资助来源不能为空", trigger: "blur" }], source: [{ required: true, message: "资助来源不能为空", trigger: "blur" }],
beginTime: [ begin_at: [
{ {
required: true, required: true,
message: "请选择开始日期", message: "请选择开始日期",
trigger: ["blur", "change"], trigger: ["blur", "change"],
}, },
], ],
endTime: [ finish_at: [
{ {
required: true, required: true,
message: "请选择结束日期", message: "请选择结束日期",
trigger: ["blur", "change"], trigger: ["blur", "change"],
}, },
], ],
projectType: [ kind: [{ required: true, message: "项目类型不能为空", trigger: "blur" }],
{ required: true, message: "项目类型不能为空", trigger: "blur" }, director: [
],
projectLeader: [
{ required: true, message: "课题负责人不能为空", trigger: "blur" }, { required: true, message: "课题负责人不能为空", trigger: "blur" },
], ],
}, },
@ -248,16 +235,11 @@ const { queryParams, form, rules } = toRefs(data);
/** 查询数据列表 */ /** 查询数据列表 */
function getList() { function getList() {
loading.value = true; loading.value = true;
dataList.value = [1]; expertProject(queryParams.value).then((response) => {
total.value = 15; dataList.value = response.data.data;
loading.value = false; total.value = response.data.count;
// listRole(queryParams.value).then( loading.value = false;
// (response) => { });
// dataList.value = response.rows;
// total.value = response.total;
// loading.value = false;
// }
// );
} }
/** 搜索按钮操作 */ /** 搜索按钮操作 */
function handleQuery() { function handleQuery() {
@ -269,12 +251,26 @@ function resetQuery() {
proxy.resetForm("queryRef"); proxy.resetForm("queryRef");
handleQuery(); handleQuery();
} }
function handleShelf(row) {
let text = row.shelf_status == 2 ? "上架" : "下架";
proxy.$modal
.confirm('确认要"' + text + '""' + row.id + '"的数据吗?')
.then(function () {
let status = row.shelf_status == 1 ? 2 : 1;
return projectShelf({ id: row.id, status });
})
.then(() => {
getList();
proxy.$modal.msgSuccess(text + "成功");
})
.catch(() => {});
}
/** 删除按钮操作 */ /** 删除按钮操作 */
function handleDelete(row) { function handleDelete(row) {
proxy.$modal proxy.$modal
.confirm('是否确认删除数据编号为"' + row.id + '"的数据项?') .confirm('是否确认删除数据编号为"' + row.id + '"的数据项?')
.then(function () { .then(function () {
return delRole(researchIds); return projectDelete({ id: row.id });
}) })
.then(() => { .then(() => {
getList(); getList();
@ -286,15 +282,15 @@ function handleDelete(row) {
/** 重置新增的表单以及其他数据 */ /** 重置新增的表单以及其他数据 */
function reset() { function reset() {
form.value = { form.value = {
researchId: undefined, id: undefined,
researchName: undefined, title: undefined,
company: "1", role: 1,
funding: undefined, amount: undefined,
sources: undefined, source: undefined,
beginTime: undefined, begin_at: undefined,
endTime: undefined, finish_at: undefined,
projectType: undefined, kind: undefined,
projectLeader: undefined, director: undefined,
}; };
proxy.resetForm("roleRef"); proxy.resetForm("roleRef");
} }
@ -315,20 +311,20 @@ function handleUpdate(row) {
function submitForm() { function submitForm() {
proxy.$refs["roleRef"].validate((valid) => { proxy.$refs["roleRef"].validate((valid) => {
if (valid) { if (valid) {
console.log(form.value); form.value.amount = form.value.amount - 0;
// if (form.value.researchId != undefined) { if (form.value.id != undefined) {
// updateRole(form.value).then((response) => { projectEdit(form.value).then((response) => {
// proxy.$modal.msgSuccess("修改成功"); proxy.$modal.msgSuccess("修改成功");
// open.value = false; open.value = false;
// getList(); getList();
// }); });
// } else { } else {
// addRole(form.value).then((response) => { projectAdd(form.value).then((response) => {
// proxy.$modal.msgSuccess("新增成功"); proxy.$modal.msgSuccess("新增成功");
// open.value = false; open.value = false;
// getList(); getList();
// }); });
// } }
} }
}); });
} }