更新项目
admin
parent
6e15b825f3
commit
ccc5672288
|
|
@ -63,9 +63,20 @@ export const MainApi = {
|
|||
exportMain: async (params) => {
|
||||
return await request.download({ url: `/apply/main/export-excel`, params })
|
||||
},
|
||||
|
||||
// 成文
|
||||
generateDoc: async (id: number)=>{
|
||||
return await request.download({ url: `/apply/main/generate-doc?id=` + id })
|
||||
}
|
||||
|
||||
},
|
||||
//提报
|
||||
presentingContract: async (params: any) => {
|
||||
return await request.post({ url: `/apply/main/presentingApply`, params })
|
||||
},
|
||||
// 审核
|
||||
auditContract: async (data: MainVO) => {
|
||||
return await request.post({ url: `/apply/main/auditApply`, data })
|
||||
},
|
||||
// 审核记录
|
||||
getAuditList: async (params) => {
|
||||
return await request.get({ url: `/apply/main/getAuditList`, params })
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ export interface VO {
|
|||
userName: string // 用户姓名
|
||||
userContact: string // 用户联系方式
|
||||
reservationDate: string // 预约日期
|
||||
reservationTime: Date // 预约时间
|
||||
reservationTime: string // 预约时间
|
||||
labName: string // 实验室名称
|
||||
joinPeople: string // 参与人员
|
||||
equipment: string // 实验内容及设备
|
||||
|
|
|
|||
|
|
@ -134,6 +134,8 @@ export enum DICT_TYPE {
|
|||
CHANGE_TYPE = 'change_type', //变更-变更类型
|
||||
PATENT_TYPE = 'patent_type',//知识产权-专利类型
|
||||
LEGAL_STATUS = 'legal_status',//知识产权-法律状态
|
||||
LAB_NAME = 'lab_name', //实验室
|
||||
EQUIPMENT = 'equipment', //设备
|
||||
|
||||
// ========== INFRA 模块 ==========
|
||||
INFRA_BOOLEAN_STRING = 'infra_boolean_string',
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
</template>
|
||||
<el-skeleton :loading="loading" animated>
|
||||
<el-row>
|
||||
<el-col v-for="item in TodoList" :key="`team-${item.name}`" :span="6" class="mb-8px">
|
||||
<el-col v-for="item in TodoList" :key="`team-${item.name}`" :span="8" class="mb-50px">
|
||||
|
||||
<div class="flex flex-col items-center">
|
||||
<el-badge :value="12" class="item">
|
||||
|
|
@ -101,6 +101,7 @@ import { formatTime } from '@/utils'
|
|||
import { useUserStore } from '@/store/modules/user'
|
||||
import type { TodoList, Notice, Message } from './types'
|
||||
import * as NoticeApi from '@/api/system/notice'
|
||||
import {DICT_TYPE, getStrDictOptions} from "@/utils/dict";
|
||||
|
||||
defineOptions({ name: 'Home' })
|
||||
|
||||
|
|
@ -116,62 +117,32 @@ let TodoList = reactive<TodoList[]>([])
|
|||
const getTodoList = async () => {
|
||||
const data = [
|
||||
{
|
||||
name: 'Github',
|
||||
name: '立项',
|
||||
icon: 'akar-icons:github-fill',
|
||||
url: 'github.io'
|
||||
},
|
||||
{
|
||||
name: 'Vue',
|
||||
name: '任务书',
|
||||
icon: 'logos:vue',
|
||||
url: 'vuejs.org'
|
||||
},
|
||||
{
|
||||
name: 'Vite',
|
||||
name: '执行',
|
||||
icon: 'vscode-icons:file-type-vite',
|
||||
url: 'https://vitejs.dev/'
|
||||
},
|
||||
{
|
||||
name: 'Angular',
|
||||
name: '变更',
|
||||
icon: 'logos:angular-icon',
|
||||
url: 'github.io'
|
||||
},
|
||||
{
|
||||
name: 'React',
|
||||
name: '验收',
|
||||
icon: 'logos:react',
|
||||
url: 'github.io'
|
||||
},
|
||||
{
|
||||
name: 'Webpack',
|
||||
icon: 'logos:webpack',
|
||||
url: 'github.io'
|
||||
},
|
||||
{
|
||||
name: 'Github',
|
||||
icon: 'akar-icons:github-fill',
|
||||
url: 'github.io'
|
||||
},
|
||||
{
|
||||
name: 'Vue',
|
||||
icon: 'logos:vue',
|
||||
url: 'vuejs.org'
|
||||
},
|
||||
{
|
||||
name: 'Vite',
|
||||
icon: 'vscode-icons:file-type-vite',
|
||||
url: 'https://vitejs.dev/'
|
||||
},
|
||||
{
|
||||
name: 'Angular',
|
||||
icon: 'logos:angular-icon',
|
||||
url: 'github.io'
|
||||
},
|
||||
{
|
||||
name: 'React',
|
||||
icon: 'logos:react',
|
||||
url: 'github.io'
|
||||
},
|
||||
{
|
||||
name: 'Webpack',
|
||||
name: '知识产权',
|
||||
icon: 'logos:webpack',
|
||||
url: 'github.io'
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
</el-form-item> -->
|
||||
<el-row>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="任务书编号" prop="projectCode">
|
||||
<el-form-item label="项目编号" prop="projectCode">
|
||||
<el-input v-model="formData.projectCode" placeholder="请输入任务书编号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="任务书名称" prop="projectName">
|
||||
<el-form-item label="项目名称" prop="projectName">
|
||||
<el-input v-model="formData.projectName" placeholder="请输入任务书名称" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -28,8 +28,8 @@
|
|||
<!-- <el-form-item label="项目负责人ID" prop="projectLeaderId">
|
||||
<el-input v-model="formData.projectLeaderId" placeholder="请输入项目负责人ID" />
|
||||
</el-form-item> -->
|
||||
<el-form-item label="承担单位名称" prop="undertakingUnitName">
|
||||
<el-input v-model="formData.undertakingUnitName" placeholder="请输入承担单位名称" />
|
||||
<el-form-item label="牵头单位" prop="undertakingUnitName">
|
||||
<el-input v-model="formData.undertakingUnitName" placeholder="请输入牵头单位名称" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
|
|
@ -72,13 +72,13 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="维护单位名称" prop="maintenanceUnitName">
|
||||
<el-form-item label="维护单位" prop="maintenanceUnitName">
|
||||
<el-input v-model="formData.maintenanceUnitName" placeholder="请输入维护单位名称" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="6">
|
||||
<el-form-item label="审核单位名称" prop="reviewUnitName">
|
||||
<el-form-item label="审核单位" prop="reviewUnitName">
|
||||
<el-input v-model="formData.reviewUnitName" placeholder="请输入审核单位名称" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -119,7 +119,7 @@
|
|||
<el-tab-pane label="验收其他成果" name="achie">
|
||||
<AchieForm ref="achieFormRef" :acceptance-id="formData.id" />
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="验收经费-新" name="funds">
|
||||
<el-tab-pane label="验收经费" name="funds">
|
||||
<FundsForm ref="fundsFormRef" :acceptance-id="formData.id" />
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
|
|
@ -304,4 +304,4 @@ const resetForm = () => {
|
|||
}
|
||||
formRef.value?.resetFields()
|
||||
}
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -17,19 +17,19 @@
|
|||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="任务书编号" prop="projectCode">
|
||||
<el-form-item label="项目编号" prop="projectCode">
|
||||
<el-input
|
||||
v-model="queryParams.projectCode"
|
||||
placeholder="请输入任务书编号"
|
||||
placeholder="请输入项目编号"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="任务书名称" prop="projectName">
|
||||
<el-form-item label="项目名称" prop="projectName">
|
||||
<el-input
|
||||
v-model="queryParams.projectName"
|
||||
placeholder="请输入任务书名称"
|
||||
placeholder="请输入项目名称"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
|
|
@ -53,10 +53,10 @@
|
|||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="承担单位名称" prop="undertakingUnitName">
|
||||
<el-form-item label="牵头单位" prop="undertakingUnitName">
|
||||
<el-input
|
||||
v-model="queryParams.undertakingUnitName"
|
||||
placeholder="请输入承担单位名称"
|
||||
placeholder="请输入牵头单位名称"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="开始时间" prop="beginDate">
|
||||
<!-- <el-form-item label="开始时间" prop="beginDate">
|
||||
<el-date-picker
|
||||
v-model="queryParams.beginDate"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
|
|
@ -92,7 +92,7 @@
|
|||
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form-item>-->
|
||||
<el-form-item label="验收年度" prop="accYear">
|
||||
<el-input
|
||||
v-model="queryParams.accYear"
|
||||
|
|
@ -122,7 +122,7 @@
|
|||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="主管部门" prop="competentDeptName">
|
||||
<!-- <el-form-item label="主管部门" prop="competentDeptName">
|
||||
<el-input
|
||||
v-model="queryParams.competentDeptName"
|
||||
placeholder="请输入主管部门"
|
||||
|
|
@ -130,7 +130,7 @@
|
|||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form-item>-->
|
||||
<!-- <el-form-item label="主管工程师ID" prop="managerId">
|
||||
<el-input
|
||||
v-model="queryParams.managerId"
|
||||
|
|
@ -140,7 +140,7 @@
|
|||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="主管工程师" prop="managerName">
|
||||
<!-- <el-form-item label="主管工程师" prop="managerName">
|
||||
<el-input
|
||||
v-model="queryParams.managerName"
|
||||
placeholder="请输入主管工程师"
|
||||
|
|
@ -157,7 +157,7 @@
|
|||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form-item>-->
|
||||
<!-- <el-form-item label="维护单位ID" prop="maintenanceUnitId">
|
||||
<el-input
|
||||
v-model="queryParams.maintenanceUnitId"
|
||||
|
|
@ -167,7 +167,7 @@
|
|||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="审核单位名称" prop="reviewUnitName">
|
||||
<!-- <el-form-item label="审核单位名称" prop="reviewUnitName">
|
||||
<el-input
|
||||
v-model="queryParams.reviewUnitName"
|
||||
placeholder="请输入审核单位名称"
|
||||
|
|
@ -175,7 +175,7 @@
|
|||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form-item>-->
|
||||
<!-- <el-form-item label="审核单位ID" prop="reviewUnitId">
|
||||
<el-input
|
||||
v-model="queryParams.reviewUnitId"
|
||||
|
|
@ -222,7 +222,7 @@
|
|||
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
|
||||
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
|
||||
<el-button type="primary" plain @click="handleInsert">
|
||||
<Icon icon="ep:upload" class="mr-5px" /> 导入立项
|
||||
<Icon icon="ep:upload" class="mr-5px" /> 生成验收
|
||||
</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
|
|
@ -250,25 +250,26 @@
|
|||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
||||
<!-- <el-table-column label="主键Id" align="center" prop="id" />
|
||||
<el-table-column label="合同Id" align="center" prop="contractId" /> -->
|
||||
<el-table-column label="任务书编号" align="center" prop="projectCode" />
|
||||
<el-table-column label="任务书名称" align="center" prop="projectName" />
|
||||
<el-table-column label="项目负责人" align="center" prop="projectLeader" />
|
||||
<el-table-column label="序号" align="center" type="index"/>
|
||||
<el-table-column label="项目编号" align="center" prop="projectCode" width="100" />
|
||||
<el-table-column label="项目名称" align="center" prop="projectName" width="240"/>
|
||||
<el-table-column label="项目负责人" align="center" prop="projectLeader" width="100"/>
|
||||
<!-- <el-table-column label="项目负责人ID" align="center" prop="projectLeaderId" /> -->
|
||||
<el-table-column label="承担单位名称" align="center" prop="undertakingUnitName" />
|
||||
<el-table-column label="牵头单位" align="center" prop="undertakingUnitName" width="200"/>
|
||||
<!-- <el-table-column label="承担单位ID" align="center" prop="undertakingUnitId" /> -->
|
||||
<el-table-column
|
||||
label="开始时间"
|
||||
align="center"
|
||||
prop="beginDate"
|
||||
:formatter="dateFormatter"
|
||||
width="180px"
|
||||
width="180"
|
||||
/>
|
||||
<el-table-column
|
||||
label="结束时间"
|
||||
align="center"
|
||||
prop="endDate"
|
||||
:formatter="dateFormatter"
|
||||
width="180px"
|
||||
width="180"
|
||||
/>
|
||||
<el-table-column label="验收年度" align="center" prop="accYear" />
|
||||
<el-table-column
|
||||
|
|
@ -276,24 +277,24 @@
|
|||
align="center"
|
||||
prop="accDate"
|
||||
:formatter="dateFormatter"
|
||||
width="180px"
|
||||
width="100"
|
||||
/>
|
||||
<!-- <el-table-column label="主管部门ID" align="center" prop="competentDeptId" /> -->
|
||||
<el-table-column label="主管部门" align="center" prop="competentDeptName" />
|
||||
<el-table-column label="主管部门" align="center" prop="competentDeptName" width="240"/>
|
||||
<!-- <el-table-column label="主管工程师ID" align="center" prop="managerId" /> -->
|
||||
<el-table-column label="主管工程师" align="center" prop="managerName" />
|
||||
<el-table-column label="维护单位名称" align="center" prop="maintenanceUnitName" />
|
||||
<el-table-column label="主管工程师" align="center" prop="managerName" width="240" />
|
||||
<el-table-column label="维护单位名称" align="center" prop="maintenanceUnitName" width="240"/>
|
||||
<!-- <el-table-column label="维护单位ID" align="center" prop="maintenanceUnitId" /> -->
|
||||
<el-table-column label="审核单位名称" align="center" prop="reviewUnitName" />
|
||||
<el-table-column label="审核单位名称" align="center" prop="reviewUnitName" width="240"/>
|
||||
<!-- <el-table-column label="审核单位ID" align="center" prop="reviewUnitId" /> -->
|
||||
<el-table-column label="验收形式" align="center" prop="accMode">
|
||||
<el-table-column label="验收形式" align="center" prop="accMode" width="180">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.ACC_MODE" :value="scope.row.accMode" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="验收结果" align="center" prop="accResult" />
|
||||
<el-table-column label="状态" align="center" prop="state" />
|
||||
<el-table-column label="操作" align="center">
|
||||
<el-table-column label="验收结果" align="center" prop="accResult" width="150"/>
|
||||
<el-table-column label="状态" align="center" prop="state" width="100"/>
|
||||
<el-table-column label="操作" align="center" fixed="right" width="200">
|
||||
<template #default="scope">
|
||||
<template v-if="scope.row.state == '1'">
|
||||
<el-button link type="primary" @click="openForm('update', scope.row.id)"
|
||||
|
|
@ -590,4 +591,4 @@ const handleExport = async () => {
|
|||
onMounted(() => {
|
||||
getList()
|
||||
})
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="合作单位" prop="coopUnits" >
|
||||
<el-input v-model="formData.coopUnits" type="textarea" placeholder="请输入合作单位" />
|
||||
<el-input v-model="formData.coopUnits" type="textarea" placeholder="请输入合作单位,多个单位用逗号隔开" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
|
|
|
|||
|
|
@ -81,14 +81,27 @@
|
|||
<el-table-column label="审核状态" align="center" width="120" prop="state" />
|
||||
<el-table-column label="操作" width="200" fixed="right" align="center">
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="openForm('update', scope.row.id)"
|
||||
v-hasPermi="['apply:main:update']"
|
||||
>
|
||||
编辑
|
||||
</el-button>
|
||||
<template v-if="scope.row.state == '1'">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="openForm('update', scope.row.id)"
|
||||
v-hasPermi="['apply:main:update']"
|
||||
>
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="danger"
|
||||
@click="handleDelete(scope.row.id)"
|
||||
v-hasPermi="['apply:main:delete']"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
<el-button link type="primary" v-hasPermi="['apply:main:presentingApply']" @click="handlePresenting(scope.row.id)" >
|
||||
提报
|
||||
</el-button>
|
||||
</template>
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
|
|
@ -97,13 +110,11 @@
|
|||
>
|
||||
成文
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="danger"
|
||||
@click="handleDelete(scope.row.id)"
|
||||
v-hasPermi="['apply:main:delete']"
|
||||
>
|
||||
删除
|
||||
<el-button link type="primary" v-hasPermi="['apply:main:auditApply']" @click="handleauditApply(scope.row.id)" v-if="scope.row.state == '2'">
|
||||
审核
|
||||
</el-button>
|
||||
<el-button link type="primary" v-hasPermi="['apply:main:getAuditList']" @click="handleRecord(scope.row.id)" v-if="scope.row.state == '2'">
|
||||
审核记录
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -117,6 +128,42 @@
|
|||
/>
|
||||
</ContentWrap>
|
||||
|
||||
<Dialog title="审核" v-model="dialogVisible1">
|
||||
<ContentWrap>
|
||||
<el-form label-width="80px" :model="formData" class="m-t-8px" :rules="formRules">
|
||||
<el-form-item label="" prop="status">
|
||||
<el-radio-group v-model="formData.status">
|
||||
<el-radio label="1">审核通过</el-radio>
|
||||
<el-radio label="0">审核不通过</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="审核意见" prop="comment" v-if="formData.status == '0'">
|
||||
<el-input type="textarea" v-model="formData.comment" resize="vertical" :autosize="{ minRows: 2, maxRows: 4 }" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</ContentWrap>
|
||||
<template #footer>
|
||||
<el-button type="primary" @click="submitForm1">确 定</el-button>
|
||||
<el-button @click="dialogVisible1 = false">取 消</el-button>
|
||||
</template>
|
||||
</Dialog>
|
||||
<Dialog title="审核记录" v-model="dialogVisible2">
|
||||
<ContentWrap>
|
||||
<el-timeline>
|
||||
<el-timeline-item :timestamp="formatDate(log.createTime)" placement="top" v-for="(log, index) in logList"
|
||||
:key="index">
|
||||
<el-card>
|
||||
<div>{{ log.creatorName }}</div>
|
||||
<p>{{ log.comment }}</p>
|
||||
<el-tag class="mr-10px" type="danger" v-if="log.status == '0'">审核不通过</el-tag>
|
||||
<el-tag class="mr-10px" type="success" v-if="log.status == '1'">审核通过</el-tag>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
</el-timeline>
|
||||
<div v-if="logList.length == 0"> 暂无审核记录</div>
|
||||
</ContentWrap>
|
||||
</Dialog>
|
||||
|
||||
<!-- 表单弹窗：添加/修改 -->
|
||||
<MainForm ref="formRef" @success="getList" />
|
||||
</template>
|
||||
|
|
@ -125,6 +172,8 @@
|
|||
import download from '@/utils/download'
|
||||
import { MainApi, MainVO } from '@/api/apply/apply'
|
||||
import MainForm from './MainForm.vue'
|
||||
import {formatDate} from "@/utils/formatTime";
|
||||
import {CACHE_KEY, useCache} from "@/hooks/web/useCache";
|
||||
|
||||
/** 立项 列表 */
|
||||
defineOptions({ name: 'ApplyMain' })
|
||||
|
|
@ -132,7 +181,10 @@ defineOptions({ name: 'ApplyMain' })
|
|||
const message = useMessage() // 消息弹窗
|
||||
const { t } = useI18n() // 国际化
|
||||
|
||||
const dialogVisible1 = ref(false) // 弹窗的是否展示
|
||||
const dialogVisible2 = ref(false) // 弹窗的是否展示
|
||||
const loading = ref(true) // 列表的加载中
|
||||
const logList = ref([]) // 弹窗的是否展示
|
||||
const list = ref<MainVO[]>([]) // 列表的数据
|
||||
const total = ref(0) // 列表的总页数
|
||||
const queryParams = reactive({
|
||||
|
|
@ -146,6 +198,19 @@ const queryParams = reactive({
|
|||
const queryFormRef = ref() // 搜索的表单
|
||||
const exportLoading = ref(false) // 导出的加载中
|
||||
|
||||
const { wsCache } = useCache()
|
||||
const user = wsCache.get(CACHE_KEY.USER).user
|
||||
const formData = ref({
|
||||
itemId: undefined,
|
||||
moduleId: "2",
|
||||
creatorName: user.nickname,
|
||||
status: '1',
|
||||
comment: '',
|
||||
})
|
||||
const formRules = reactive({
|
||||
comment: [{ required: true, message: '审核意见不能为空', trigger: 'blur' }],
|
||||
})
|
||||
|
||||
/** 查询列表 */
|
||||
const getList = async () => {
|
||||
loading.value = true
|
||||
|
|
@ -176,6 +241,30 @@ const openForm = (type: string, id?: number) => {
|
|||
formRef.value.open(type, id)
|
||||
}
|
||||
|
||||
/**提报*/
|
||||
const handlePresenting = async (id: number) => {
|
||||
try {
|
||||
var par = { id: id }
|
||||
await MainApi.presentingContract(par)
|
||||
await getList()
|
||||
} catch { }
|
||||
}
|
||||
/**审核*/
|
||||
const handleauditApply = async (id: number) => {
|
||||
formData.value.itemId = id;
|
||||
dialogVisible1.value = true
|
||||
}
|
||||
/**审核记录*/
|
||||
const handleRecord = async (id: number) => {
|
||||
dialogVisible2.value = true
|
||||
try {
|
||||
const data = await MainApi.getAuditList({ id: id })
|
||||
logList.value = data
|
||||
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
/** 成文按钮操作 */
|
||||
const generateDoc = async (id: number,projectName:string) =>{
|
||||
//todo
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<ContentWrap>
|
||||
<!-- 搜索工作栏 -->
|
||||
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
|
||||
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="100px">
|
||||
<el-form-item label="项目名称" prop="projectName">
|
||||
<el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery"
|
||||
class="!w-240px" />
|
||||
|
|
@ -48,31 +48,32 @@
|
|||
<ContentWrap>
|
||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
||||
<!-- <el-table-column label="主键id" align="center" prop="id" /> -->
|
||||
<el-table-column label="项目名称" align="center" prop="projectName" />
|
||||
<el-table-column label="项目负责人" align="center" prop="projectLeader" />
|
||||
<el-table-column label="序号" align="center" type="index" width="80"/>
|
||||
<el-table-column label="项目编号" align="center" prop="projectCode" width="100"/>
|
||||
<el-table-column label="项目名称" align="center" prop="projectName" width="240" />
|
||||
<el-table-column label="项目负责人" align="center" prop="projectLeader" width="150"/>
|
||||
<!-- <el-table-column label="项目负责人Id" align="center" prop="projectLeaderId" /> -->
|
||||
<el-table-column label="项目编号" align="center" prop="projectCode" />
|
||||
<el-table-column label="所属技术领域" align="center" prop="technicalField">
|
||||
<el-table-column label="所属技术领域" align="center" prop="technicalField" width="150">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.TECHNICAL_FIELD" :value="scope.row.technicalField" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="年度" align="center" prop="year" />
|
||||
<el-table-column label="开始时间" align="center" prop="beginDate" :formatter="dateFormatter" width="180px" />
|
||||
<el-table-column label="结束时间" align="center" prop="endDate" :formatter="dateFormatter" width="180px" />
|
||||
<el-table-column label="计划类型" align="center" prop="planName">
|
||||
<el-table-column label="年度" align="center" prop="year" width="100"/>
|
||||
<el-table-column label="开始时间" align="center" prop="beginDate" :formatter="dateFormatter" width="180" />
|
||||
<el-table-column label="结束时间" align="center" prop="endDate" :formatter="dateFormatter" width="180" />
|
||||
<el-table-column label="计划类型" align="center" prop="planName" width="150">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.PLAN_ID" :value="scope.row.planName" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="主管部门" align="center" prop="competentDeptName" />
|
||||
<el-table-column label="主管部门" align="center" prop="competentDeptName" width="150"/>
|
||||
<!-- <el-table-column label="主管工程师ID" align="center" prop="managerId" /> -->
|
||||
<el-table-column label="主管工程师" align="center" prop="managerName" />
|
||||
<el-table-column label="承担单位名称" align="center" prop="undertakingUnitName" />
|
||||
<el-table-column label="审核单位名称" align="center" prop="reviewUnitName" />
|
||||
<el-table-column label="状态" align="center" prop="state" />
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
|
||||
<el-table-column label="操作" align="center" width="300">
|
||||
<el-table-column label="主管工程师" align="center" prop="managerName" width="150" />
|
||||
<el-table-column label="牵头单位" align="center" prop="undertakingUnitName" width="180"/>
|
||||
<el-table-column label="审核单位" align="center" prop="reviewUnitName" width="180"/>
|
||||
<el-table-column label="状态" align="center" prop="state" width="100" />
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180" />
|
||||
<el-table-column label="操作" align="center" fixed="right" width="200">
|
||||
<template #default="scope">
|
||||
<template v-if="scope.row.state == '1'">
|
||||
<el-button link type="primary" @click="openForm('update', scope.row.id)"
|
||||
|
|
@ -82,14 +83,14 @@
|
|||
<el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['contract:main:delete']">
|
||||
删除
|
||||
</el-button>
|
||||
<el-button link type="primary" @click="handlePresenting(scope.row.id)">
|
||||
<el-button link type="primary" v-hasPermi="['contract:main:presentingContract']" @click="handlePresenting(scope.row.id)">
|
||||
提报
|
||||
</el-button>
|
||||
</template>
|
||||
<el-button link type="primary" @click="handleauditContract(scope.row.id)" v-if="scope.row.state == '2'">
|
||||
<el-button link type="primary" v-hasPermi="['contract:main:auditContract']" @click="handleauditContract(scope.row.id)" v-if="scope.row.state == '2'">
|
||||
审核
|
||||
</el-button>
|
||||
<el-button link type="primary" @click="handleRecord(scope.row.id)" v-if="scope.row.state == '2'">
|
||||
<el-button link type="primary" v-hasPermi="['contract:main:getAuditList']" @click="handleRecord(scope.row.id)" v-if="scope.row.state == '2'">
|
||||
审核记录
|
||||
</el-button>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -7,40 +7,66 @@
|
|||
label-width="100px"
|
||||
v-loading="formLoading"
|
||||
>
|
||||
<el-form-item label="用户姓名" prop="userName">
|
||||
<el-input v-model="formData.userName" placeholder="请输入用户姓名" />
|
||||
</el-form-item>
|
||||
<el-form-item label="用户联系方式" prop="userContact">
|
||||
<el-input v-model="formData.userContact" placeholder="请输入用户联系方式" />
|
||||
</el-form-item>
|
||||
<el-form-item label="预约日期" prop="reservationDate">
|
||||
<el-date-picker
|
||||
v-model="formData.reservationDate"
|
||||
type="date"
|
||||
value-format="x"
|
||||
placeholder="选择预约日期"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="预约时间" prop="reservationTime">
|
||||
<el-date-picker
|
||||
v-model="formData.reservationTime"
|
||||
type="date"
|
||||
value-format="x"
|
||||
placeholder="选择预约时间"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="实验室名称" prop="labName">
|
||||
<el-input v-model="formData.labName" placeholder="请输入实验室名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="参与人员" prop="joinPeople">
|
||||
<el-input v-model="formData.joinPeople" placeholder="请输入参与人员" />
|
||||
</el-form-item>
|
||||
<el-form-item label="实验内容及设备" prop="equipment">
|
||||
<el-input v-model="formData.equipment" placeholder="请输入实验内容及设备" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="reservationNotes">
|
||||
<el-input v-model="formData.reservationNotes" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
<el-row gutter="20">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="实验室名称" prop="labName">
|
||||
<el-select v-model="formData.labName" placeholder="请选择实验室">
|
||||
<el-option v-for="dict in getStrDictOptions(DICT_TYPE.LAB_NAME)" :key="dict.value"
|
||||
:label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="实验设备" prop="equipment">
|
||||
<el-select v-model="formData.equipment" placeholder="请选择实验设备">
|
||||
<el-option v-for="dict in getStrDictOptions(DICT_TYPE.EQUIPMENT)" :key="dict.value"
|
||||
:label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="用户姓名" prop="userName">
|
||||
<el-input v-model="formData.userName" placeholder="请输入用户姓名" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="用户联系方式" prop="userContact">
|
||||
<el-input v-model="formData.userContact" placeholder="请输入用户联系方式" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="预约开始时间" prop="reservationDate">
|
||||
<el-date-picker
|
||||
v-model="formData.reservationDate"
|
||||
type="datetime"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
placeholder="选择预约开始时间"
|
||||
class="!w-260px"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="预约结束时间" prop="reservationTime">
|
||||
<el-date-picker
|
||||
v-model="formData.reservationTime"
|
||||
type="datetime"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
placeholder="选择预约结束时间"
|
||||
class="!w-260px"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="参与人员" prop="joinPeople">
|
||||
<el-input v-model="formData.joinPeople" placeholder="请输入参与人员" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="备注" prop="reservationNotes">
|
||||
<el-input v-model="formData.reservationNotes" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
||||
|
|
@ -49,8 +75,11 @@
|
|||
</Dialog>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { Api, VO } from '@/api/publicLab/publicLab'
|
||||
|
||||
import { Api, VO } from '@/api/publicLab/publicLab';
|
||||
import {CACHE_KEY, useCache} from "@/hooks/web/useCache";
|
||||
import {DICT_TYPE, getStrDictOptions} from "@/utils/dict";
|
||||
const { wsCache } = useCache()
|
||||
const user = wsCache.get(CACHE_KEY.USER).user
|
||||
/** 公共实验室信 表单 */
|
||||
defineOptions({ name: 'Form' })
|
||||
|
||||
|
|
@ -63,7 +92,7 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
|
|||
const formType = ref('') // 表单的类型：create - 新增；update - 修改
|
||||
const formData = ref({
|
||||
id: undefined,
|
||||
userName: undefined,
|
||||
userName: user.nickname,
|
||||
userContact: undefined,
|
||||
reservationDate: undefined,
|
||||
reservationTime: undefined,
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
@click="openForm('create')"
|
||||
v-hasPermi="['publicLab::create']"
|
||||
>
|
||||
<Icon icon="ep:plus" class="mr-5px" /> 新增
|
||||
<Icon icon="ep:plus" class="mr-5px" /> 预约
|
||||
</el-button>
|
||||
<el-button
|
||||
type="success"
|
||||
|
|
@ -56,14 +56,21 @@
|
|||
<ContentWrap>
|
||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
||||
<el-table-column label="序号" align="center" width="80" type="index"/>
|
||||
<el-table-column label="实验室名称" align="center" prop="labName" width="200"/>
|
||||
<el-table-column label="实验内容及设备" align="center" prop="equipment" width="200"/>
|
||||
<el-table-column label="预约日期" align="center" prop="reservationDate" width="150" />
|
||||
<el-table-column label="实验室名称" align="center" prop="labName" width="200">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.LAB_NAME" :value="scope.row.labName" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="实验设备" align="center" prop="equipment" width="200">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.EQUIPMENT" :value="scope.row.equipment" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="预约开始时间" align="center" prop="reservationDate" width="180" />
|
||||
<el-table-column
|
||||
label="预约时间"
|
||||
label="预约结束时间"
|
||||
align="center"
|
||||
prop="reservationTime"
|
||||
:formatter="dateFormatter"
|
||||
width="180"
|
||||
/>
|
||||
<el-table-column label="用户姓名" align="center" prop="userName" width="150" />
|
||||
|
|
@ -76,7 +83,7 @@
|
|||
:formatter="dateFormatter"
|
||||
width="180"
|
||||
/>
|
||||
<el-table-column label="操作" align="center" fixed="right">
|
||||
<el-table-column label="操作" align="center" fixed="right" width="200">
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
link
|
||||
|
|
@ -115,6 +122,7 @@ import { dateFormatter } from '@/utils/formatTime'
|
|||
import download from '@/utils/download'
|
||||
import { Api, VO } from '@/api/publicLab/publicLab'
|
||||
import Form from './Form.vue'
|
||||
import {DICT_TYPE} from "@/utils/dict";
|
||||
|
||||
/** 公共实验室信 列表 */
|
||||
defineOptions({ name: 'PublicLab' })
|
||||
|
|
|
|||
Loading…
Reference in New Issue