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' 

# Conflicts:
#	src/views/apply/apply/MainForm.vue
pull/480/head
lizilong 2024-04-15 23:01:05 +08:00
parent 34fa382726 382dcb0edc
commit 6b83ca5916
4 changed files with 121 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/apply/apply/components/InfoForm.vue
View File

@ -21,7 +21,6 @@
<el-form-item label="课题实施的风险分析" prop="riskAnalysis">
<el-input v-model="formData.riskAnalysis" placeholder="请输入课题实施的风险分析" type="textarea" :rows="6" />
</el-form-item> </el-col>
</el-row>
</fieldset>
<fieldset>

166
src/views/apply/apply/components/ParticipantForm.vue
View File

@ -1,129 +1,63 @@
<template>
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
v-loading="formLoading"
label-width="0px"
:inline-message="true"
>
<el-table :data="formData" class="-mt-10px">
<!-- <el-table-column label="序号" type="index" width="100" /> -->
<el-table-column label="排序号" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.orderNo`" :rules="formRules.orderNo" class="mb-0px!">
<el-input v-model="row.orderNo" placeholder="请输入排序号" />
<el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="150px"
:inline-message="true">
<fieldset v-for="(item, index) in formData" :key="index">
<el-row :gutter="20">
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.orderNo" label="排序号">
<el-input v-model="item.orderNo" placeholder="请输入排序号" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="姓名" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.name`" :rules="formRules.name" class="mb-0px!">
<el-input v-model="row.name" placeholder="请输入姓名" />
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.name" label="姓名">
<el-input v-model="item.name" placeholder="请输入姓名" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="性别" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.gender`" :rules="formRules.gender" class="mb-0px!">
<el-input v-model="row.gender" placeholder="请输入性别" />
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.gender" label="性别">
<el-input v-model="item.gender" placeholder="请输入性别" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="年龄" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.age`" :rules="formRules.age" class="mb-0px!">
<el-input v-model="row.age" placeholder="请输入年龄" />
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.age" label="年龄">
<el-input v-model="item.age" placeholder="请输入年龄" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="学历" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.education`" :rules="formRules.education" class="mb-0px!">
<el-input v-model="row.education" placeholder="请输入学历" />
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.education" label="学历">
<el-input v-model="item.education" placeholder="请输入学历" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="职务（职称）" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.position`" :rules="formRules.position" class="mb-0px!">
<el-input v-model="row.position" placeholder="请输入职务（职称）" />
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.position" label="职务（职称）">
<el-input v-model="item.position" placeholder="请输入职务（职称）" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="从事专业" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.engagingProfession`" :rules="formRules.engagingProfession" class="mb-0px!">
<el-input v-model="row.engagingProfession" placeholder="请输入从事专业" />
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.engagingProfession" label="从事专业">
<el-input v-model="item.engagingProfession" placeholder="请输入从事专业" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="课题主要分工" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.divideWork`" :rules="formRules.divideWork" class="mb-0px!">
<el-input v-model="row.divideWork" placeholder="请输入课题主要分工" />
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.divideWork" label="课题主要分工">
<el-input v-model="item.divideWork" placeholder="请输入课题主要分工" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="所在单位id" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.deptId`" :rules="formRules.deptId" class="mb-0px!">
<el-input v-model="row.deptId" placeholder="请输入所在单位id" />
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.deptName" label="所在单位名称">
<el-input v-model="item.deptName" placeholder="请输入所在单位名称" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="所在单位名称" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.deptName`" :rules="formRules.deptName" class="mb-0px!">
<el-input v-model="row.deptName" placeholder="请输入所在单位名称" />
</el-form-item>
</template>
</el-table-column>
<!-- <el-table-column label="创建人" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.creator`" :rules="formRules.creator" class="mb-0px!">
<el-input v-model="row.creator" placeholder="请输入创建人" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="创建时间" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.createTime`" :rules="formRules.createTime" class="mb-0px!">
<el-date-picker
v-model="row.createTime"
type="date"
value-format="x"
placeholder="选择创建时间"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="更新人" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.updater`" :rules="formRules.updater" class="mb-0px!">
<el-input v-model="row.updater" placeholder="请输入更新人" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="更新时间" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.updateTime`" :rules="formRules.updateTime" class="mb-0px!">
<el-date-picker
v-model="row.updateTime"
type="date"
value-format="x"
placeholder="选择更新时间"
/>
</el-form-item>
</template>
</el-table-column> -->
<el-table-column align="center" fixed="right" label="操作" width="60">
<template #default="{ $index }">
<el-button @click="handleDelete($index)" link>—</el-button>
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
<el-row>
<el-col><el-button @click="handleDelete(index)" link style="float:right" type="danger" plain>
<Icon icon="ep:delete" class="mr-5px" /> 删除
</el-button>
</el-col>
</el-row>
</fieldset>
</el-form>
<el-row justify="center" class="mt-3">
<el-button @click="handleAdd" round>+ 添加主要参加人员</el-button>

203
src/views/apply/apply/components/UnitsForm.vue
View File

@ -1,157 +1,78 @@
<template>
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
v-loading="formLoading"
label-width="0px"
:inline-message="true"
>
<el-table :data="formData" class="-mt-10px">
<!-- <el-table-column label="序号" type="index" width="100" /> -->
<!-- <el-table-column label="单位ID" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.deptId`" :rules="formRules.deptId" class="mb-0px!">
<el-input v-model="row.deptId" placeholder="请输入单位ID" />
<el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" :inline-message="true" label-width="150px">
<fieldset v-for="(item, index) in formData" :key="index">
<el-row :gutter="20">
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.orderNo" label="排序号">
<el-input v-model="item.orderNo" placeholder="请输入排序号" />
</el-form-item>
</template>
</el-table-column> -->
<el-table-column label="排序号" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.orderNo`" :rules="formRules.orderNo" class="mb-0px!">
<el-input v-model="row.orderNo" placeholder="请输入排序号" />
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.deptName" label="单位名称">
<el-input v-model="item.deptName" placeholder="请输入单位名称" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="单位名称" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.deptName`" :rules="formRules.deptName" class="mb-0px!">
<el-input v-model="row.deptName" placeholder="请输入单位名称" />
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.groupFunds" label="集团经费">
<el-input v-model="item.groupFunds" placeholder="请输入集团经费" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="集团经费" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.groupFunds`" :rules="formRules.groupFunds" class="mb-0px!">
<el-input v-model="row.groupFunds" placeholder="请输入集团经费" />
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.selfFunds" label="自筹">
<el-input v-model="item.selfFunds" placeholder="请输入自筹" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="自筹" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.selfFunds`" :rules="formRules.selfFunds" class="mb-0px!">
<el-input v-model="row.selfFunds" placeholder="请输入自筹" />
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.otheerFunds" label="其他">
<el-input v-model="item.otheerFunds" placeholder="请输入其他" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="其他" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.otheerFunds`" :rules="formRules.otheerFunds" class="mb-0px!">
<el-input v-model="row.otheerFunds" placeholder="请输入其他" />
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.linkPerson" label="联系人">
<el-input v-model="item.linkPerson" placeholder="请输入联系人" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="联系人" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.linkPerson`" :rules="formRules.linkPerson" class="mb-0px!">
<el-input v-model="row.linkPerson" placeholder="请输入联系人" />
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.phoneNo" label="联系电话">
<el-input v-model="item.phoneNo" placeholder="请输入联系电话" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="联系电话" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.phoneNo`" :rules="formRules.phoneNo" class="mb-0px!">
<el-input v-model="row.phoneNo" placeholder="请输入联系电话" />
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.email" label="邮箱">
<el-input v-model="item.email" placeholder="请输入邮箱" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="邮箱" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.email`" :rules="formRules.email" class="mb-0px!">
<el-input v-model="row.email" placeholder="请输入邮箱" />
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.fax" label="传真">
<el-input v-model="item.fax" placeholder="请输入传真" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="传真" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.fax`" :rules="formRules.fax" class="mb-0px!">
<el-input v-model="row.fax" placeholder="请输入传真" />
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.postalCode" label="邮编">
<el-input v-model="item.postalCode" placeholder="请输入邮编" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="邮编" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.postalCode`" :rules="formRules.postalCode" class="mb-0px!">
<el-input v-model="row.postalCode" placeholder="请输入邮编" />
</el-col>
<el-col :xs="24" :sm="12" :md="8" :lg="6">
<el-form-item :rules="formRules.address" label="通讯地址">
<el-input v-model="item.address" placeholder="请输入通讯地址" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="通讯地址" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.address`" :rules="formRules.address" class="mb-0px!">
<el-input v-model="row.address" placeholder="请输入通讯地址" />
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24">
<el-form-item :rules="formRules.sign" label="标识（1：承担单位，2：联合承担单位，3：参加单位 )" label-width="200px">
<el-input v-model="item.sign" placeholder="请输入标识1：承担单位，2：联合承担单位，3：参加单位" type="textarea" :rows="3" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="标识（1：承担单位，2：联合承担单位，3：参加单位）" min-width="400">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.sign`" :rules="formRules.sign" class="mb-0px!">
<el-input v-model="row.sign" placeholder="请输入标识（1：承担单位，2：联合承担单位，3：参加单位）" />
</el-form-item>
</template>
</el-table-column>
<!-- <el-table-column label="租户号" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.tenantId`" :rules="formRules.tenantId" class="mb-0px!">
<el-input v-model="row.tenantId" placeholder="请输入租户号" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="创建人" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.creator`" :rules="formRules.creator" class="mb-0px!">
<el-input v-model="row.creator" placeholder="请输入创建人" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="创建时间" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.createTime`" :rules="formRules.createTime" class="mb-0px!">
<el-date-picker
v-model="row.createTime"
type="date"
value-format="x"
placeholder="选择创建时间"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="更新人" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.updater`" :rules="formRules.updater" class="mb-0px!">
<el-input v-model="row.updater" placeholder="请输入更新人" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="更新时间" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.updateTime`" :rules="formRules.updateTime" class="mb-0px!">
<el-date-picker
v-model="row.updateTime"
type="date"
value-format="x"
placeholder="选择更新时间"
/>
</el-form-item>
</template>
</el-table-column> -->
<el-table-column align="center" fixed="right" label="操作" width="60">
<template #default="{ $index }">
<el-button @click="handleDelete($index)" link>—</el-button>
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
<el-row>
<el-col><el-button @click="handleDelete(index)" link style="float:right" type="danger" plain>
<Icon icon="ep:delete" class="mr-5px" /> 删除
</el-button>
</el-col>
</el-row>
</fieldset>
</el-form>
<el-row justify="center" class="mt-3">
<el-button @click="handleAdd" round>+ 添加立项单位信息</el-button>

18
src/views/apply/apply/index.vue
View File

@ -67,18 +67,18 @@
<!-- <el-table-column label="id" align="center" prop="id" /> -->
<el-table-column type="selection" width="55" />
<el-table-column label="编号" align="center" prop="number" />
<el-table-column label="项目名称" align="center" prop="name" />
<el-table-column label="所属技术领域" align="center" prop="technicalField" />
<el-table-column label="项目名称" align="center" prop="name" width="200"/>
<el-table-column label="所属技术领域" align="center" prop="technicalField" width="200"/>
<el-table-column label="年度" align="center" prop="year" />
<el-table-column label="负责人姓名" align="center" prop="director" />
<el-table-column label="电话" align="center" prop="phoneNo" />
<el-table-column label="负责人姓名" align="center" prop="director" width="200"/>
<el-table-column label="电话" align="center" prop="phoneNo" width="200"/>
<el-table-column label="主管部门" align="center" prop="competentDeptName" />
<el-table-column label="主管工程师" align="center" prop="managerName" />
<el-table-column label="维护单位名称" align="center" prop="maintenanceUnitName" />
<el-table-column label="承担单位名称" align="center" prop="undertakingUnitName" />
<el-table-column label="审核单位名称" align="center" prop="reviewUnitName" />
<el-table-column label="主管工程师" align="center" prop="managerName" width="200"/>
<el-table-column label="维护单位名称" align="center" prop="maintenanceUnitName" width="200"/>
<el-table-column label="承担单位名称" align="center" prop="undertakingUnitName" width="200"/>
<el-table-column label="审核单位名称" align="center" prop="reviewUnitName" width="200"/>
<el-table-column label="状态" align="center" prop="state" />
<el-table-column label="操作" align="center" fixed="right">
<el-table-column label="操作" align="center" fixed="right" width="300">
<template #default="scope">
<el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['apply:main:update']">
编辑