yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

pull/480/head
admin 2024-06-12 09:19:34 +08:00
parent 8564c9ed26 82dbe45662
commit 3e917bb783
6 changed files with 417 additions and 379 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

265
src/api/contract/contract/index.ts
View File

@ -1,129 +1,136 @@
import request from '@/config/axios'
// 任务书主 VO
export interface MainVO {
id: number // 主键id
projectName: string // 项目名称
projectLeader: string // 项目负责人
projectLeaderId: number // 项目负责人Id
projectCode: string // 项目编号
technicalField: string // 所属技术领域
year: string // 年度
beginDate: Date // 开始时间
endDate: Date // 结束时间
planName: string // 计划类型
planId: string // 计划Id
supportingCondition: string // 课题实施所需的其他配套条件
gender: number // 性别
age: string // 年龄
education: string // 学历
major: string // 所学专业
engagMajor: string // 从事专业
position: string // 职务（职称）
phoneNo: string // 电话
email: string // 邮箱
fax: string // 传真
postalCode: string // 邮编
address: string // 通讯地址
achievement: string // 主要业绩
competentDeptId: number // 主管部门ID
competentDeptName: string // 主管部门
managerId: number // 主管工程师ID
managerName: string // 主管工程师
maintenanceUnitName: string // 维护单位名称
maintenanceUnitId: number // 维护单位ID
undertakingUnitName: string // 承担单位名称
undertakingUnitId: number // 承担单位ID
reviewUnitName: string // 审核单位名称
reviewUnitId: number // 审核单位ID
state: string // 状态
}
// 任务书主 API
export const MainApi = {
// 查询任务书主分页
getMainPage: async (params: any) => {
return await request.get({ url: `/contract/main/page`, params })
},
// 查询任务书主详情
getMain: async (id: number) => {
return await request.get({ url: `/contract/main/get?id=` + id })
},
// 新增任务书主
createMain: async (data: MainVO) => {
return await request.post({ url: `/contract/main/create`, data })
},
// 修改任务书主
updateMain: async (data: MainVO) => {
return await request.put({ url: `/contract/main/update`, data })
},
// 删除任务书主
deleteMain: async (id: number) => {
return await request.delete({ url: `/contract/main/delete?id=` + id })
},
// 导出任务书主 Excel
exportMain: async (params) => {
return await request.download({ url: `/contract/main/export-excel`, params })
},
// ==================== 子表（任务书详细信息） ====================
// 获得任务书详细信息
getInfoByContractId: async (contractId) => {
return await request.get({ url: `/contract/main/info/get-by-contract-id?contractId=` + contractId })
},
// ==================== 子表（任务书项目目标） ====================
// 获得任务书项目目标列表
getTargetListByContractId: async (contractId) => {
return await request.get({ url: `/contract/main/target/list-by-contract-id?contractId=` + contractId })
},
// ==================== 子表（任务书考核指标） ====================
// 获得任务书考核指标列表
getCheckListByContractId: async (contractId) => {
return await request.get({ url: `/contract/main/check/list-by-contract-id?contractId=` + contractId })
},
// ==================== 子表（项目实施计划） ====================
// 获得项目实施计划列表
getPlanListByContractId: async (contractId) => {
return await request.get({ url: `/contract/main/plan/list-by-contract-id?contractId=` + contractId })
},
// ==================== 子表（任务书经费） ====================
// 获得任务书经费列表
getFundsListByContractId: async (contractId) => {
return await request.get({ url: `/contract/main/funds/list-by-contract-id?contractId=` + contractId })
},
// ==================== 子表（参加单位） ====================
// 获得参加单位列表
getUnitListByContractId: async (contractId) => {
return await request.get({ url: `/contract/main/unit/list-by-contract-id?contractId=` + contractId })
},
// ==================== 子表（项目所需设备） ====================
// 获得项目所需设备列表
getDeviceListByContractId: async (contractId) => {
return await request.get({ url: `/contract/main/device/list-by-contract-id?contractId=` + contractId })
},
// ==================== 子表（主要参加人员） ====================
// 获得主要参加人员列表
getParticipantListByContractId: async (contractId) => {
return await request.get({ url: `/contract/main/participant/list-by-contract-id?contractId=` + contractId })
},
}
import request from '@/config/axios'
// 任务书主 VO
export interface MainVO {
id: number // 主键id
projectName: string // 项目名称
projectLeader: string // 项目负责人
projectLeaderId: number // 项目负责人Id
projectCode: string // 项目编号
technicalField: string // 所属技术领域
year: string // 年度
beginDate: Date // 开始时间
endDate: Date // 结束时间
planName: string // 计划类型
planId: string // 计划Id
supportingCondition: string // 课题实施所需的其他配套条件
gender: number // 性别
age: string // 年龄
education: string // 学历
major: string // 所学专业
engagMajor: string // 从事专业
position: string // 职务（职称）
phoneNo: string // 电话
email: string // 邮箱
fax: string // 传真
postalCode: string // 邮编
address: string // 通讯地址
achievement: string // 主要业绩
competentDeptId: number // 主管部门ID
competentDeptName: string // 主管部门
managerId: number // 主管工程师ID
managerName: string // 主管工程师
maintenanceUnitName: string // 维护单位名称
maintenanceUnitId: number // 维护单位ID
undertakingUnitName: string // 承担单位名称
undertakingUnitId: number // 承担单位ID
reviewUnitName: string // 审核单位名称
reviewUnitId: number // 审核单位ID
state: string // 状态
}
// 任务书主 API
export const MainApi = {
// 查询任务书主分页
getMainPage: async (params: any) => {
return await request.get({ url: `/contract/main/page`, params })
},
// 查询任务书主详情
getMain: async (id: number) => {
return await request.get({ url: `/contract/main/get?id=` + id })
},
// 新增任务书主
createMain: async (data: MainVO) => {
return await request.post({ url: `/contract/main/create`, data })
},
// 修改任务书主
updateMain: async (data: MainVO) => {
return await request.put({ url: `/contract/main/update`, data })
},
// 删除任务书主
deleteMain: async (id: number) => {
return await request.delete({ url: `/contract/main/delete?id=` + id })
},
// 导出任务书主 Excel
exportMain: async (params) => {
return await request.download({ url: `/contract/main/export-excel`, params })
},
// 导入立项
getListPage: async (params) => {
return await request.get({ url: `/apply/main/page`, params })
},
generateContract: async (data: MainVO) => {
return await request.post({ url: `/contract/main/generateContract`, data })
},
// ==================== 子表（任务书详细信息） ====================
// 获得任务书详细信息
getInfoByContractId: async (contractId) => {
return await request.get({ url: `/contract/main/info/get-by-contract-id?contractId=` + contractId })
},
// ==================== 子表（任务书项目目标） ====================
// 获得任务书项目目标列表
getTargetListByContractId: async (contractId) => {
return await request.get({ url: `/contract/main/target/list-by-contract-id?contractId=` + contractId })
},
// ==================== 子表（任务书考核指标） ====================
// 获得任务书考核指标列表
getCheckListByContractId: async (contractId) => {
return await request.get({ url: `/contract/main/check/list-by-contract-id?contractId=` + contractId })
},
// ==================== 子表（项目实施计划） ====================
// 获得项目实施计划列表
getPlanListByContractId: async (contractId) => {
return await request.get({ url: `/contract/main/plan/list-by-contract-id?contractId=` + contractId })
},
// ==================== 子表（任务书经费） ====================
// 获得任务书经费列表
getFundsListByContractId: async (contractId) => {
return await request.get({ url: `/contract/main/funds/list-by-contract-id?contractId=` + contractId })
},
// ==================== 子表（参加单位） ====================
// 获得参加单位列表
getUnitListByContractId: async (contractId) => {
return await request.get({ url: `/contract/main/unit/list-by-contract-id?contractId=` + contractId })
},
// ==================== 子表（项目所需设备） ====================
// 获得项目所需设备列表
getDeviceListByContractId: async (contractId) => {
return await request.get({ url: `/contract/main/device/list-by-contract-id?contractId=` + contractId })
},
// ==================== 子表（主要参加人员） ====================
// 获得主要参加人员列表
getParticipantListByContractId: async (contractId) => {
return await request.get({ url: `/contract/main/participant/list-by-contract-id?contractId=` + contractId })
},
}

1
src/utils/dict.ts
View File

@ -124,6 +124,7 @@ export enum DICT_TYPE {
SYSTEM_NOTIFY_TEMPLATE_TYPE = 'system_notify_template_type',
SYSTEM_SOCIAL_TYPE = 'system_social_type',
SYSTEM_EDUCATION = "education", // 学历
PLAN_ID="plan_id",//计划类型
SYSTEM_MAJOR = "major", //专业
// ========== 所属技术领域 ==========

315
src/views/contract/contract/MainForm.vue
View File

@ -1,141 +1,174 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="项目名称" prop="projectName">
<el-input v-model="formData.projectName" placeholder="请输入项目名称" />
</el-form-item>
<el-form-item label="项目负责人" prop="projectLeader">
<el-input v-model="formData.projectLeader" placeholder="请输入项目负责人" />
</el-form-item>
<!-- <el-form-item label="项目负责人Id" prop="projectLeaderId">
<el-input v-model="formData.projectLeaderId" placeholder="请输入项目负责人Id" />
</el-form-item> -->
<el-form-item label="项目编号" prop="projectCode">
<el-input v-model="formData.projectCode" placeholder="请输入项目编号" />
</el-form-item>
<el-form-item label="所属技术领域" prop="technicalField">
<el-select v-model="formData.technicalField" placeholder="请选择所属技术领域">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.TECHNICAL_FIELD)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="年度" prop="year">
<el-input v-model="formData.year" placeholder="请输入年度" />
</el-form-item>
<el-form-item label="开始时间" prop="beginDate">
<el-date-picker
v-model="formData.beginDate"
type="date"
value-format="x"
placeholder="选择开始时间"
/>
</el-form-item>
<el-form-item label="结束时间" prop="endDate">
<el-date-picker
v-model="formData.endDate"
type="date"
value-format="x"
placeholder="选择结束时间"
/>
</el-form-item>
<el-form-item label="计划类型" prop="planName">
<el-select v-model="formData.planName" placeholder="请选择计划类型">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.PLAN_ID)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="计划Id" prop="planId">
<el-input v-model="formData.planId" placeholder="请输入计划Id" />
</el-form-item> -->
<el-form-item label="课题实施所需的其他配套条件" prop="supportingCondition">
<el-input v-model="formData.supportingCondition" placeholder="请输入课题实施所需的其他配套条件" />
</el-form-item>
<el-form-item label="性别" prop="gender">
<el-input v-model="formData.gender" placeholder="请输入性别" />
</el-form-item>
<el-form-item label="年龄" prop="age">
<el-input v-model="formData.age" placeholder="请输入年龄" />
</el-form-item>
<el-form-item label="学历" prop="education">
<el-input v-model="formData.education" placeholder="请输入学历" />
</el-form-item>
<el-form-item label="所学专业" prop="major">
<el-input v-model="formData.major" placeholder="请输入所学专业" />
</el-form-item>
<el-form-item label="从事专业" prop="engagMajor">
<el-input v-model="formData.engagMajor" placeholder="请输入从事专业" />
</el-form-item>
<el-form-item label="职务（职称）" prop="position">
<el-input v-model="formData.position" placeholder="请输入职务（职称）" />
</el-form-item>
<el-form-item label="电话" prop="phoneNo">
<el-input v-model="formData.phoneNo" placeholder="请输入电话" />
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-input v-model="formData.email" placeholder="请输入邮箱" />
</el-form-item>
<el-form-item label="传真" prop="fax">
<el-input v-model="formData.fax" placeholder="请输入传真" />
</el-form-item>
<el-form-item label="邮编" prop="postalCode">
<el-input v-model="formData.postalCode" placeholder="请输入邮编" />
</el-form-item>
<el-form-item label="通讯地址" prop="address">
<el-input v-model="formData.address" placeholder="请输入通讯地址" />
</el-form-item>
<el-form-item label="主要业绩" prop="achievement">
<el-input v-model="formData.achievement" placeholder="请输入主要业绩" />
</el-form-item>
<!-- <el-form-item label="主管部门ID" prop="competentDeptId">
<el-input v-model="formData.competentDeptId" placeholder="请输入主管部门ID" />
</el-form-item> -->
<el-form-item label="主管部门" prop="competentDeptName">
<el-input v-model="formData.competentDeptName" placeholder="请输入主管部门" />
</el-form-item>
<!-- <el-form-item label="主管工程师ID" prop="managerId">
<el-input v-model="formData.managerId" placeholder="请输入主管工程师ID" />
</el-form-item> -->
<el-form-item label="主管工程师" prop="managerName">
<el-input v-model="formData.managerName" placeholder="请输入主管工程师" />
</el-form-item>
<el-form-item label="维护单位名称" prop="maintenanceUnitName">
<el-input v-model="formData.maintenanceUnitName" placeholder="请输入维护单位名称" />
</el-form-item>
<!-- <el-form-item label="维护单位ID" prop="maintenanceUnitId">
<el-input v-model="formData.maintenanceUnitId" placeholder="请输入维护单位ID" />
</el-form-item> -->
<el-form-item label="承担单位名称" prop="undertakingUnitName">
<el-input v-model="formData.undertakingUnitName" placeholder="请输入承担单位名称" />
</el-form-item>
<!-- <el-form-item label="承担单位ID" prop="undertakingUnitId">
<el-input v-model="formData.undertakingUnitId" placeholder="请输入承担单位ID" />
</el-form-item> -->
<el-form-item label="审核单位名称" prop="reviewUnitName">
<el-input v-model="formData.reviewUnitName" placeholder="请输入审核单位名称" />
</el-form-item>
<!-- <el-form-item label="审核单位ID" prop="reviewUnitId">
<el-input v-model="formData.reviewUnitId" placeholder="请输入审核单位ID" />
</el-form-item> -->
<el-form-item label="状态" prop="state">
<el-input v-model="formData.state" placeholder="请输入状态" />
</el-form-item>
</el-form>
<!-- 子表的表单 -->
<el-tabs v-model="subTabsName">
<el-tab-pane label="基础信息" name="basic">
<el-form ref="formRef" :model="formData" :rules="formRules" label-width="250px" v-loading="formLoading">
<el-row>
<el-col :span="12">
<el-form-item label="项目名称" prop="projectName">
<el-input v-model="formData.projectName" placeholder="请输入项目名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="项目负责人" prop="projectLeader">
<el-input v-model="formData.projectLeader" placeholder="请输入项目负责人" />
</el-form-item></el-col>
<!-- <el-col :span="12">
<el-form-item label="项目负责人Id" prop="projectLeaderId">
<el-input v-model="formData.projectLeaderId" placeholder="请输入项目负责人Id" />
</el-form-item></el-col>-->
<el-col :span="12">
<el-form-item label="项目编号" prop="projectCode">
<el-input v-model="formData.projectCode" placeholder="请输入项目编号" />
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="所属技术领域" prop="technicalField">
<el-select v-model="formData.technicalField" placeholder="请选择所属技术领域">
<el-option v-for="dict in getStrDictOptions(DICT_TYPE.TECHNICAL_FIELD)" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="年度" prop="year">
<el-input v-model="formData.year" placeholder="请输入年度" />
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="开始时间" prop="beginDate">
<el-date-picker v-model="formData.beginDate" type="date" value-format="x" placeholder="选择开始时间" />
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="结束时间" prop="endDate">
<el-date-picker v-model="formData.endDate" type="date" value-format="x" placeholder="选择结束时间" />
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="计划类型" prop="planName">
<el-select v-model="formData.planName" placeholder="请选择计划类型">
<el-option v-for="dict in getStrDictOptions(DICT_TYPE.PLAN_ID)" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item></el-col>
<!-- <el-col :span="12">
<el-form-item label="计划Id" prop="planId">
<el-input v-model="formData.planId" placeholder="请输入计划Id" />
</el-form-item></el-col>-->
<el-col :span="12">
<el-form-item label="课题实施所需的其他配套条件" prop="supportingCondition">
<el-input v-model="formData.supportingCondition" placeholder="请输入课题实施所需的其他配套条件" />
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="性别" prop="gender">
<el-select v-model="formData.gender" placeholder="请选择性别">
<el-option v-for="dict in getStrDictOptions(DICT_TYPE.SYSTEM_USER_SEX)" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="年龄" prop="age">
<el-input v-model="formData.age" placeholder="请输入年龄" />
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="学历" prop="education">
<el-select v-model="formData.education" placeholder="请选择学历">
<el-option v-for="dict in getStrDictOptions(DICT_TYPE.SYSTEM_EDUCATION)" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="所学专业" prop="major">
<el-select v-model="formData.major" placeholder="请选择所学专业">
<el-option v-for="dict in getStrDictOptions(DICT_TYPE.SYSTEM_MAJOR)" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="从事专业" prop="engagMajor">
<el-select v-model="formData.engagMajor" placeholder="请选择从事专业">
<el-option v-for="dict in getStrDictOptions(DICT_TYPE.SYSTEM_MAJOR)" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="职务（职称）" prop="position">
<el-input v-model="formData.position" placeholder="请输入职务（职称）" />
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="电话" prop="phoneNo">
<el-input v-model="formData.phoneNo" placeholder="请输入电话" />
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-input v-model="formData.email" placeholder="请输入邮箱" />
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="传真" prop="fax">
<el-input v-model="formData.fax" placeholder="请输入传真" />
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="邮编" prop="postalCode">
<el-input v-model="formData.postalCode" placeholder="请输入邮编" />
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="通讯地址" prop="address">
<el-input v-model="formData.address" placeholder="请输入通讯地址" />
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="主要业绩" prop="achievement">
<el-input v-model="formData.achievement" placeholder="请输入主要业绩" />
</el-form-item></el-col>
<!-- <el-col :span="12">
<el-form-item label="主管部门ID" prop="competentDeptId">
<el-input v-model="formData.competentDeptId" placeholder="请输入主管部门ID" />
</el-form-item></el-col>-->
<el-col :span="12">
<el-form-item label="主管部门" prop="competentDeptName">
<el-input v-model="formData.competentDeptName" placeholder="请输入主管部门" />
</el-form-item></el-col>
<!-- <el-col :span="12">
<el-form-item label="主管工程师ID" prop="managerId">
<el-input v-model="formData.managerId" placeholder="请输入主管工程师ID" />
</el-form-item>
</el-col>-->
<el-col :span="12">
<el-form-item label="主管工程师" prop="managerName">
<el-input v-model="formData.managerName" placeholder="请输入主管工程师" />
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="维护单位名称" prop="maintenanceUnitName">
<el-input v-model="formData.maintenanceUnitName" placeholder="请输入维护单位名称" />
</el-form-item></el-col>
<!-- <el-col :span="12">
<el-form-item label="维护单位ID" prop="maintenanceUnitId">
<el-input v-model="formData.maintenanceUnitId" placeholder="请输入维护单位ID" />
</el-form-item>
</el-col>-->
<el-col :span="12">
<el-form-item label="承担单位名称" prop="undertakingUnitName">
<el-input v-model="formData.undertakingUnitName" placeholder="请输入承担单位名称" />
</el-form-item></el-col>
<!-- <el-col :span="12">
<el-form-item label="承担单位ID" prop="undertakingUnitId">
<el-input v-model="formData.undertakingUnitId" placeholder="请输入承担单位ID" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="审核单位名称" prop="reviewUnitName">
<el-input v-model="formData.reviewUnitName" placeholder="请输入审核单位名称" />
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="审核单位ID" prop="reviewUnitId">
<el-input v-model="formData.reviewUnitId" placeholder="请输入审核单位ID" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态" prop="state">
<el-input v-model="formData.state" placeholder="请输入状态" />
</el-form-item></el-col>-->
</el-row>
</el-form>
</el-tab-pane>
<el-tab-pane label="任务书详细信息" name="info">
<InfoForm ref="infoFormRef" :contract-id="formData.id" />
</el-tab-pane>
@ -229,14 +262,14 @@ const formData = ref({
const formRules = reactive({
projectName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
projectLeader: [{ required: true, message: '项目负责人不能为空', trigger: 'blur' }],
projectLeaderId: [{ required: true, message: '项目负责人Id不能为空', trigger: 'blur' }],
//projectLeaderId: [{ required: true, message: '项目负责人Id不能为空', trigger: 'blur' }],
projectCode: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
technicalField: [{ required: true, message: '所属技术领域不能为空', trigger: 'change' }],
year: [{ required: true, message: '年度不能为空', trigger: 'blur' }],
beginDate: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
endDate: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }],
planName: [{ required: true, message: '计划类型不能为空', trigger: 'change' }],
planId: [{ required: true, message: '计划Id不能为空', trigger: 'blur' }],
//planId: [{ required: true, message: '计划Id不能为空', trigger: 'blur' }],
supportingCondition: [{ required: true, message: '课题实施所需的其他配套条件不能为空', trigger: 'blur' }],
gender: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
age: [{ required: true, message: '年龄不能为空', trigger: 'blur' }],
@ -246,11 +279,11 @@ const formRules = reactive({
position: [{ required: true, message: '职务（职称）不能为空', trigger: 'blur' }],
phoneNo: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
email: [{ required: true, message: '邮箱不能为空', trigger: 'blur' }],
fax: [{ required: true, message: '传真不能为空', trigger: 'blur' }],
//fax: [{ required: true, message: '传真不能为空', trigger: 'blur' }],
postalCode: [{ required: true, message: '邮编不能为空', trigger: 'blur' }],
address: [{ required: true, message: '通讯地址不能为空', trigger: 'blur' }],
achievement: [{ required: true, message: '主要业绩不能为空', trigger: 'blur' }],
competentDeptId: [{ required: true, message: '主管部门ID不能为空', trigger: 'blur' }],
/* competentDeptId: [{ required: true, message: '主管部门ID不能为空', trigger: 'blur' }],
competentDeptName: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
managerId: [{ required: true, message: '主管工程师ID不能为空', trigger: 'blur' }],
managerName: [{ required: true, message: '主管工程师不能为空', trigger: 'blur' }],
@ -259,12 +292,12 @@ const formRules = reactive({
undertakingUnitName: [{ required: true, message: '承担单位名称不能为空', trigger: 'blur' }],
undertakingUnitId: [{ required: true, message: '承担单位ID不能为空', trigger: 'blur' }],
reviewUnitName: [{ required: true, message: '审核单位名称不能为空', trigger: 'blur' }],
reviewUnitId: [{ required: true, message: '审核单位ID不能为空', trigger: 'blur' }],
reviewUnitId: [{ required: true, message: '审核单位ID不能为空', trigger: 'blur' }],*/
})
const formRef = ref() // 表单 Ref
/** 子表的表单 */
const subTabsName = ref('info')
const subTabsName = ref('basic')
const infoFormRef = ref()
const targetFormRef = ref()
const checkFormRef = ref()
@ -415,4 +448,4 @@ const resetForm = () => {
}
formRef.value?.resetFields()
}
</script>
</script>

4
src/views/contract/contract/components/FundsForm.vue
View File

@ -16,7 +16,7 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column label="来源或支出;0：来源；1：支出" min-width="150">
<el-table-column label="来源或支出;0：来源；1：支出" min-width="250">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.sourceExpend`" :rules="formRules.sourceExpend" class="mb-0px!">
<el-input v-model="row.sourceExpend" placeholder="请输入来源或支出;0：来源；1：支出" />
@ -37,7 +37,7 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column label="项目承担单位自筹经费" min-width="150">
<el-table-column label="项目承担单位自筹经费" min-width="200">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.sSelfFinancing`" :rules="formRules.sSelfFinancing" class="mb-0px!">
<el-input v-model="row.sSelfFinancing" placeholder="请输入项目承担单位自筹经费" />

8
src/views/contract/contract/components/InfoForm.vue
View File

@ -3,7 +3,7 @@
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
label-width="350px"
v-loading="formLoading"
>
<el-form-item label="项目目的与意义" prop="purposeSignificance">
@ -45,7 +45,7 @@ const formLoading = ref(false) // 表单的加载中
const formData = ref([])
const formRules = reactive({
contractId: [{ required: true, message: '任务书ID不能为空', trigger: 'blur' }],
purposeSignificance: [{ required: true, message: '项目目的与意义不能为空', trigger: 'blur' }],
/* purposeSignificance: [{ required: true, message: '项目目的与意义不能为空', trigger: 'blur' }],
currentSituation: [{ required: true, message: '项目所属领域国内外产业、技术的现状和发展趋势不能为空', trigger: 'blur' }],
workFoundation: [{ required: true, message: '项目现有工作基础不能为空', trigger: 'blur' }],
projectAccording: [{ required: true, message: '项目实施目标及考核指标-考核指标依据不能为空', trigger: 'blur' }],
@ -53,7 +53,7 @@ const formRules = reactive({
researchRoadmap: [{ required: true, message: '主要研究开发内容-技术路线不能为空', trigger: 'blur' }],
researchInnovation: [{ required: true, message: '主要研究开发内容-创新性不能为空', trigger: 'blur' }],
riskAnalysis: [{ required: true, message: '课题实施的风险分析不能为空', trigger: 'blur' }],
projectAchie: [{ required: true, message: '预期主要成果形式、知识产权归属不能为空', trigger: 'blur' }],
projectAchie: [{ required: true, message: '预期主要成果形式、知识产权归属不能为空', trigger: 'blur' }],*/
})
const formRef = ref() // 表单 Ref
@ -104,4 +104,4 @@ const getData = () => {
}
defineExpose({ validate, getData })
</script>
</script>

203
src/views/contract/contract/index.vue
View File

@ -1,82 +1,43 @@
<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="68px">
<el-form-item label="项目名称" prop="projectName">
<el-input
v-model="queryParams.projectName"
placeholder="请输入项目名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
<el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery"
class="!w-240px" />
</el-form-item>
<el-form-item label="项目负责人" prop="projectLeader">
<el-input
v-model="queryParams.projectLeader"
placeholder="请输入项目负责人"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
<el-input v-model="queryParams.projectLeader" placeholder="请输入项目负责人" clearable @keyup.enter="handleQuery"
class="!w-240px" />
</el-form-item>
<el-form-item label="项目编号" prop="projectCode">
<el-input
v-model="queryParams.projectCode"
placeholder="请输入项目编号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
<el-input v-model="queryParams.projectCode" placeholder="请输入项目编号" clearable @keyup.enter="handleQuery"
class="!w-240px" />
</el-form-item>
<el-form-item label="所属技术领域" prop="technicalField">
<el-select
v-model="queryParams.technicalField"
placeholder="请选择所属技术领域"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.TECHNICAL_FIELD)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-select v-model="queryParams.technicalField" placeholder="请选择所属技术领域" clearable class="!w-240px">
<el-option v-for="dict in getStrDictOptions(DICT_TYPE.TECHNICAL_FIELD)" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="年度" prop="year">
<el-input
v-model="queryParams.year"
placeholder="请输入年度"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
<el-input v-model="queryParams.year" placeholder="请输入年度" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item>
<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="openForm('create')"
v-hasPermi="['contract:main:create']"
>
<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" /> 导入立项
</el-button>
<el-button type="primary" plain @click="openForm('create')" v-hasPermi="['contract:main:create']">
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['contract:main:export']"
>
<el-button type="success" plain @click="handleExport" :loading="exportLoading"
v-hasPermi="['contract:main:export']">
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
@ -97,20 +58,8 @@
</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="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">
<template #default="scope">
<dict-tag :type="DICT_TYPE.PLAN_ID" :value="scope.row.planName" />
@ -122,43 +71,47 @@
<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" prop="createTime" :formatter="dateFormatter" width="180px" />
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['contract:main:update']"
>
<el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['contract:main:update']">
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['contract:main:delete']"
>
<el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['contract:main:delete']">
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
@pagination="getList" />
</ContentWrap>
<!-- 导入立项 -->
<Dialog title="导入立项" v-model="dialogVisible">
<ContentWrap>
<el-table v-loading="loading1" :data="list1" :stripe="true" :show-overflow-tooltip="true" highlight-current-row>
<el-table-column align="center" width="65">
<template #default="scope">
<el-radio :label="scope.row.id" v-model="currentRowValue" @change="handleCurrentChange(scope.row)">
&nbsp;
</el-radio>
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="立项年度" align="center" prop="year" />
<!-- <el-table-column label="项目负责人Id" align="center" prop="projectLeaderId" /> -->
<el-table-column label="审核状态" align="center" prop="state" />
</el-table>
<Pagination :total="total1" v-model:page="queryParams1.pageNo" v-model:limit="queryParams1.pageSize"
@pagination="getList1" />
</ContentWrap>
<template #footer>
<el-button :disabled="!currentRow" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</template>
</Dialog>
<!-- 表单弹窗：添加/修改 -->
<MainForm ref="formRef" @success="getList" />
</template>
@ -176,9 +129,13 @@ defineOptions({ name: 'ContractMain' })
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
const dialogVisible = ref(false) // 弹窗的是否展示
const loading = ref(true) // 列表的加载中
const loading1 = ref(true) // 列表的加载中
const list = ref<MainVO[]>([]) // 列表的数据
const list1 = ref<MainVO[]>([]) // 导入立项列表的数据
const total = ref(0) // 列表的总页数
const total1 = ref(0) // 列表的总页数
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
@ -188,6 +145,15 @@ const queryParams = reactive({
technicalField: undefined,
year: undefined,
})
const queryParams1 = reactive({
pageNo: 1,
pageSize: 10,
projectName: undefined,
projectLeader: undefined,
projectCode: undefined,
technicalField: undefined,
year: undefined,
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
@ -202,7 +168,32 @@ const getList = async () => {
loading.value = false
}
}
const getList1 = async () => {
loading1.value = true
try {
const data = await MainApi.getListPage(queryParams1)
list1.value = data.list
total1.value = data.total
} finally {
loading1.value = false
}
}
/** 选中行 */
const currentRowValue = ref(undefined) // 选中行的 value
const currentRow = ref(undefined) // 选中行
const handleCurrentChange = (row) => {
currentRow.value = row.id
}
const submitForm = async () => {
try {
const data = await MainApi.generateContract({id:currentRow.value})
console.log(data)
} finally {
// 关闭弹窗
currentRow.value =undefined
dialogVisible.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
@ -220,6 +211,12 @@ const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
// 点击导入立项
const handleInsert = async () => {
dialogVisible.value = true
getList1()
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
@ -231,7 +228,7 @@ const handleDelete = async (id: number) => {
message.success(t('common.delSuccess'))
// 刷新列表
await getList()
} catch {}
} catch { }
}
/** 导出按钮操作 */