Skip to content

Y
yn-science-front
Commit 29fcd350 authored by 徐俊's avatar 徐俊
Browse files
Options

Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

parents e20e6d47 eb4372f8
Show whitespace changes
Inline Side-by-side
Showing with 118 additions and 215 deletions
src/views/basicSetting/person/components/infoEdit.vue
View file @ 29fcd350
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
</a-col> </a-col>
<a-col :span="20"> <a-col :span="20">
<a-form-model-item prop="spec"> <a-form-model-item prop="spec">
<!-- <para-multi-select :width="180" v-model="formData.spec" :typeId="57" /> -->
<cascader-select v-model="formData.spec" /> <cascader-select v-model="formData.spec" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
......
src/views/manager/person/components/personEdit.vue
View file @ 29fcd350
...@@ -67,8 +67,8 @@ ...@@ -67,8 +67,8 @@
<div>专业</div> <div>专业</div>
</a-col> </a-col>
<a-col :span="20"> <a-col :span="20">
<a-form-model-item ref="spec" prop="spec" :label-col="{ span: 3 }" :wrapper-col="{ span: 21 }"> <a-form-model-item ref="spec" prop="spec">
<para-multi-select v-model="formData.spec" :typeId="57" /> <cascader-select v-model="formData.spec" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
...@@ -87,11 +87,12 @@ import { isEmptyParams, getCardInfo } from "@/views/utils/common" ...@@ -87,11 +87,12 @@ import { isEmptyParams, getCardInfo } from "@/views/utils/common"
import { isIdentityId } from '@/views/utils/validate' import { isIdentityId } from '@/views/utils/validate'
import moment from 'moment' import moment from 'moment'
import unitTreeSelect from '@/views/components/common/unitTreeSelect' import unitTreeSelect from '@/views/components/common/unitTreeSelect'
import cascaderSelect from '@/views/components/common/cascaderSelect'
export default { export default {
name: "personEdit", name: "personEdit",
components: { components: {
unitTreeSelect unitTreeSelect,cascaderSelect
}, },
data () { data () {
return { return {
......
src/views/person/components/personEdit.vue
View file @ 29fcd350
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
<div class="required">专业</div> <div class="required">专业</div>
</a-col> </a-col>
<a-col :span="20"> <a-col :span="20">
<a-form-model-item ref="spec" prop="spec" :label-col="{ span: 3 }" :wrapper-col="{ span: 21 }"> <a-form-model-item ref="spec" prop="spec" >
<para-multi-select v-model="formData.spec" :typeId="57" /> <cascader-select v-model="formData.spec" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
...@@ -77,12 +77,13 @@ ...@@ -77,12 +77,13 @@
import { isEmptyParams, getCardInfo } from "@/views/utils/common" import { isEmptyParams, getCardInfo } from "@/views/utils/common"
import { isIdentityId } from '@/views/utils/validate' import { isIdentityId } from '@/views/utils/validate'
import moment from 'moment' import moment from 'moment'
import cascaderSelect from '@/views/components/common/cascaderSelect'
export default { export default {
name: "personEdit", name: "personEdit",
components: { components: {
cascaderSelect
}, },
data () { data () {
return { return {
......
src/views/report/project/components/keyProject/projGroupMember.vue
View file @ 29fcd350
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<div class="special-middle"> <div class="special-middle">
<div> <div>
<a-form-model-item :prop="'members.' + index + '.spec'" :rules="{required: true,message: '*',trigger: 'change',}"> <a-form-model-item :prop="'members.' + index + '.spec'" :rules="{required: true,message: '*',trigger: 'change',}">
<para-multi-select v-model="item.spec" :width="120" :typeId="57" /> <cascader-select v-model="item.spec" />
</a-form-model-item> </a-form-model-item>
</div> </div>
</div> </div>
...@@ -154,12 +154,15 @@ ...@@ -154,12 +154,15 @@
//用法 <proj-group-member :members.sync="formData.members" /> //用法 <proj-group-member :members.sync="formData.members" />
import { checkIdentitytionId } from "@/views/utils/common" import { checkIdentitytionId } from "@/views/utils/common"
import cascaderSelect from '@/views/components/common/cascaderSelect'
const Model = { name: null, certId: null, title: null, education: null, degree: null, spec: null, workUnit: null } const Model = { name: null, certId: null, title: null, education: null, degree: null, spec: null, workUnit: null }
export default { export default {
name: 'ProjGroupMember', name: 'ProjGroupMember',
components: {
cascaderSelect
},
data () { data () {
return { return {
...@@ -172,9 +175,6 @@ export default { ...@@ -172,9 +175,6 @@ export default {
return [] return []
} }
}, },
},
components: {
}, },
created () { created () {
}, },
......
src/views/report/project/components/keyProject/projectEdit.vue
View file @ 29fcd350
...@@ -596,7 +596,7 @@ ...@@ -596,7 +596,7 @@
</a-col> </a-col>
<a-col :span="20"> <a-col :span="20">
<a-form-model-item prop="knowledgeId"> <a-form-model-item prop="knowledgeId">
<para-multi-select v-model="formData.knowledgeId" :typeId="57" /> <cascader-select v-model="item.spec" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
......
src/views/report/project/components/participateUnitsEdit.vue
View file @ 29fcd350
...@@ -8,22 +8,17 @@ ...@@ -8,22 +8,17 @@
</a-col> </a-col>
</a-row> </a-row>
<a-row type="flex" class="row_center"> <a-row type="flex" class="row_center">
<a-col :span="5" class="bg-gray"> <a-col :span="6" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div class="required">单位名称</div> <div class="required">单位名称</div>
</div> </div>
</a-col> </a-col>
<a-col :span="3" class="bg-gray"> <a-col :span="5" class="bg-gray">
<div class="special-middle">
<div class="required">单位国别</div>
</div>
</a-col>
<a-col :span="4" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div class="required">单位地址</div> <div class="required">单位地址</div>
</div> </div>
</a-col> </a-col>
<a-col :span="4" class="bg-gray"> <a-col :span="5" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div class="required">组织机构代码/统社会信用代码</div> <div class="required">组织机构代码/统社会信用代码</div>
</div> </div>
...@@ -40,7 +35,7 @@ ...@@ -40,7 +35,7 @@
</a-col> </a-col>
</a-row> </a-row>
<a-row v-for="(item, index) in participateUnits" :key="'participateUnits'+index" type="flex" class="row_center"> <a-row v-for="(item, index) in participateUnits" :key="'participateUnits'+index" type="flex" class="row_center">
<a-col :span="5"> <a-col :span="6">
<div class="special-middle"> <div class="special-middle">
<div> <div>
<a-form-model-item :prop="'participateUnits.' + index + '.unitName'" :rules="{ required: true,message: '*',trigger: 'blur',}"> <a-form-model-item :prop="'participateUnits.' + index + '.unitName'" :rules="{ required: true,message: '*',trigger: 'blur',}">
...@@ -49,16 +44,7 @@ ...@@ -49,16 +44,7 @@
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :span="3"> <a-col :span="5">
<div class="special-middle">
<div>
<a-form-model-item :prop="'participateUnits.' + index + '.unitCountry'" :rules="{ required: true,message: '*',trigger: 'blur',}">
<a-input v-model="item.unitCountry" :maxLength="20" placeholder="单位国别" style="width: 80%" />
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="4">
<div class="special-middle"> <div class="special-middle">
<div> <div>
<a-form-model-item :prop="'participateUnits.' + index + '.unitAddress'" :rules="{ required: true,message: '*',trigger: 'blur',}"> <a-form-model-item :prop="'participateUnits.' + index + '.unitAddress'" :rules="{ required: true,message: '*',trigger: 'blur',}">
...@@ -67,7 +53,7 @@ ...@@ -67,7 +53,7 @@
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :span="4"> <a-col :span="5">
<div class="special-middle"> <div class="special-middle">
<div> <div>
<a-form-model-item :prop="'participateUnits.' + index + '.organizationCode'" :rules="{ required: true,message: '*',trigger: 'blur',}"> <a-form-model-item :prop="'participateUnits.' + index + '.organizationCode'" :rules="{ required: true,message: '*',trigger: 'blur',}">
......
src/views/report/project/components/participateUnitsInfo.vue
View file @ 29fcd350
...@@ -13,22 +13,17 @@ ...@@ -13,22 +13,17 @@
<div>序号</div> <div>序号</div>
</div> </div>
</a-col> </a-col>
<a-col :span="5" class="bg-gray"> <a-col :span="6" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div >单位名称</div> <div >单位名称</div>
</div> </div>
</a-col> </a-col>
<a-col :span="3" class="bg-gray"> <a-col :span="5" class="bg-gray">
<div class="special-middle">
<div >单位国别</div>
</div>
</a-col>
<a-col :span="4" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div >单位地址</div> <div >单位地址</div>
</div> </div>
</a-col> </a-col>
<a-col :span="4" class="bg-gray"> <a-col :span="5" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div >组织机构代码/统社会信用代码</div> <div >组织机构代码/统社会信用代码</div>
</div> </div>
...@@ -47,28 +42,21 @@ ...@@ -47,28 +42,21 @@
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :span="5"> <a-col :span="6">
<div class="special-middle"> <div class="special-middle">
<div> <div>
{{ item.unitName }} {{ item.unitName }}
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :span="3"> <a-col :span="5">
<div class="special-middle">
<div>
{{ item.unitCountry }}
</div>
</div>
</a-col>
<a-col :span="4">
<div class="special-middle"> <div class="special-middle">
<div> <div>
{{ item.unitAddress }} {{ item.unitAddress }}
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :span="4"> <a-col :span="5">
<div class="special-middle"> <div class="special-middle">
<div> <div>
{{ item.organizationCode }} {{ item.organizationCode }}
......
src/views/report/project/components/projStageGoalsEdit.vue
View file @ 29fcd350
...@@ -3,35 +3,26 @@ ...@@ -3,35 +3,26 @@
<a-row> <a-row>
<a-col :span="24"> <a-col :span="24">
<div class="tb-title"> <div class="tb-title">
<span>项目安排及阶段目标</span> <span>项目实施阶段及任务</span>
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row type="flex" class="row_center"> <a-row type="flex" class="row_center">
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">完成时限</div>
</div>
</a-col>
<a-col :span="8" class="bg-gray">
<div class="special-middle">
<div class="required">进度安排</div>
</div>
</a-col>
<a-col :span="8" class="bg-gray"> <a-col :span="8" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div class="required">阶段目标</div> <div class="required">时间</div>
</div> </div>
</a-col> </a-col>
<a-col :span="4" class="bg-gray"> <a-col :span="16" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div>操作</div> <div class="required">计划完成内容和关键节点目标</div>
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row v-for="(item, index) in stageGoals" :key="'stageGoals' + index" type="flex" class="row_center"> <a-row v-for="(item, index) in stageGoals" :key="'stageGoals' + index" type="flex" class="row_center">
<a-col :span="4"> <a-col :span="8">
<div class="special-middle"> <div class="special-middle">
<div><span>第{{toChineseNum(index+1)}}阶段</span></div>
<a-form-model-item :prop="'stageGoals.' + index + '.startTime'" :rules="{ required: true, message: '*' }" style="flex-basis: 45%;"> <a-form-model-item :prop="'stageGoals.' + index + '.startTime'" :rules="{ required: true, message: '*' }" style="flex-basis: 45%;">
<a-date-picker placeholder="请选择开始日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD HH:mm:ss" v-model="item.startTime" style="width: 140px" /> <a-date-picker placeholder="请选择开始日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD HH:mm:ss" v-model="item.startTime" style="width: 140px" />
</a-form-model-item> </a-form-model-item>
...@@ -40,40 +31,20 @@ ...@@ -40,40 +31,20 @@
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="16">
<a-form-model-item :prop="'stageGoals.' + index + '.contentInfo'" :rules="{ required: true, message: '*' }">
<a-textarea v-model="item.contentInfo" placeholder="项目阶段实施内容及目标" :maxLength="500" style="width: 90%;height: 80px;margin-top: 12px;" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item :prop="'stageGoals.' + index + '.target'" :rules="{ required: true, message: '*' }"> <a-form-model-item :prop="'stageGoals.' + index + '.target'" :rules="{ required: true, message: '*' }">
<a-textarea v-model="item.target" placeholder="项目阶段实施内容及目标" :maxLength="500" style="width: 90%;height: 80px;margin-top: 12px;" /> <a-textarea v-model="item.target" placeholder="计划完成内容和关键节点目标" :maxLength="500" style="width: 90%;height: 80px;margin-top: 12px;" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="4">
<div class="special-middle">
<a-popconfirm title="确定要删除吗？" ok-text="确定" cancel-text="取消" @confirm="removeArray(item)">
<a-button type="link" size="small">[删除]</a-button>
</a-popconfirm>
</div>
</a-col>
</a-row>
<a-row type="flex">
<a-col :span="24" style="text-align: center;">
<div class="special-middle">
<a-button type="dashed" style="width: 50%" @click="addArray">
<a-icon type="plus" /> 添加
</a-button>
</div>
</a-col>
</a-row> </a-row>
</div> </div>
</template> </template>
<script> <script>
//用法 <proj-stage-goals :stageGoals.sync="formData.stageGoals" /> //用法 <proj-stage-goals :stageGoals.sync="formData.stageGoals" />
import { toChineseNum } from '@/views/utils/common'
const Model = { startTime: null, endTime: null, contentInfo: null, target: null } const Model = { startTime: null, endTime: null, target: null }
export default { export default {
name: 'projStageGoalsEdit', name: 'projStageGoalsEdit',
...@@ -95,6 +66,7 @@ export default { ...@@ -95,6 +66,7 @@ export default {
created () { created () {
}, },
methods: { methods: {
toChineseNum,
addArray () {//添加成员 addArray () {//添加成员
this.stageGoals.push({ ...Model }) this.stageGoals.push({ ...Model })
}, },
......
src/views/report/project/components/projStageGoalsInfo.vue
View file @ 29fcd350
...@@ -3,37 +3,30 @@ ...@@ -3,37 +3,30 @@
<a-row> <a-row>
<a-col :span="24"> <a-col :span="24">
<div class="tb-title"> <div class="tb-title">
<span>项目安排及阶段目标</span> <span>项目实施阶段及任务</span>
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row type="flex" class="row_center"> <a-row type="flex" class="row_center">
<a-col :span="8" class="bg-gray"> <a-col :span="8" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div>完成时限</div> <div>时间</div>
</div> </div>
</a-col> </a-col>
<a-col :span="8" class="bg-gray"> <a-col :span="16" class="bg-gray">
<div class="special-middle">
<div>进度安排</div>
</div>
</a-col>
<a-col :span="8" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div>阶段目标</div> <div>计划完成内容和关键节点目标</div>
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row v-for="(item, index) in stageGoals" :key="'stageGoals' + index" type="flex" class="row_center"> <a-row v-for="(item, index) in stageGoals" :key="'stageGoals' + index" type="flex" class="row_center">
<a-col :span="8"> <a-col :span="8">
<div class="special-middle"> <div class="special-middle">
{{ moment(item.startTime).format("YYYY-MM-DD HH:mm:ss") }} 至 {{ moment(item.endTime).format("YYYY-MM-DD HH:mm:ss") }} <div><span>第{{toChineseNum(index+1)}}阶段</span></div>
{{ moment(item.startTime).format("YYYY-MM-DD") }} 至 {{ moment(item.endTime).format("YYYY-MM-DD") }}
</div> </div>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="16">
{{ item.contentInfo }}
</a-col>
<a-col :span="8">
{{ item.target }} {{ item.target }}
</a-col> </a-col>
</a-row> </a-row>
...@@ -42,6 +35,7 @@ ...@@ -42,6 +35,7 @@
<script> <script>
import moment from "moment"; import moment from "moment";
import { toChineseNum } from '@/views/utils/common'
export default { export default {
name: "projStageGoalsInfo", name: "projStageGoalsInfo",
...@@ -53,11 +47,12 @@ export default { ...@@ -53,11 +47,12 @@ export default {
} }
}, },
}, },
data() { data () {
return {}; return {};
}, },
methods: { methods: {
moment, moment,
toChineseNum,
} }
}; };
</script> </script>
\ No newline at end of file
src/views/report/project/components/projectEdit.vue
View file @ 29fcd350
...@@ -312,7 +312,6 @@ ...@@ -312,7 +312,6 @@
<a-col :span="20"> <a-col :span="20">
<a-form-model-item prop="knowledgeId"> <a-form-model-item prop="knowledgeId">
<cascader-select v-model="formData.knowledgeId" /> <cascader-select v-model="formData.knowledgeId" />
<!-- <para-multi-select v-model="formData.knowledgeId" :typeId="57" /> -->
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
...@@ -422,6 +421,8 @@ ...@@ -422,6 +421,8 @@
</a-col> </a-col>
</a-row> </a-row>
<!-- 项目主要参与单位及分工 -->
<participate-units-edit :participateUnits.sync="formData.participateUnits" />
<a-row> <a-row>
<a-col :span="24" style="border-top: 0px"> <a-col :span="24" style="border-top: 0px">
<div class="main-title"> <div class="main-title">
...@@ -590,7 +591,7 @@ ...@@ -590,7 +591,7 @@
<manufacture-edit :manufactureList.sync:="formData.manufactureList"></manufacture-edit> <manufacture-edit :manufactureList.sync:="formData.manufactureList"></manufacture-edit>
<!-- 项目安排及阶段目标 --> <!-- 项目安排及阶段目标 -->
<proj-stage-goals :stageGoals.sync="formData.stageGoals" /> <proj-stage-goals-edit :stageGoals.sync="formData.stageGoals" />
<!-- 项目课题设置 --> <!-- 项目课题设置 -->
<project-sub-edit :projectSubList.sync="formData.projectSubList" /> <project-sub-edit :projectSubList.sync="formData.projectSubList" />
...@@ -607,7 +608,7 @@ import previewFile from '@/views/components/common/previewFile' ...@@ -607,7 +608,7 @@ import previewFile from '@/views/components/common/previewFile'
import { getType } from '@/views/utils/auth' import { getType } from '@/views/utils/auth'
import projectMemberEdit from '@/views/report/project/components/projectMemberEdit' import projectMemberEdit from '@/views/report/project/components/projectMemberEdit'
import cooperativeUnitsEdit from '@/views/report/project/components/cooperativeUnitsEdit' import cooperativeUnitsEdit from '@/views/report/project/components/cooperativeUnitsEdit'
import participateUnitsEdit from '@/views/report/project/components/participateUnitsEdit'
import deviceEdit from '@/views/report/project/components/deviceEdit' import deviceEdit from '@/views/report/project/components/deviceEdit'
import projStageGoalsEdit from '@/views/report/project/components/projStageGoalsEdit' import projStageGoalsEdit from '@/views/report/project/components/projStageGoalsEdit'
import budgetEdit from '@/views/report/project/components/budgetEdit' import budgetEdit from '@/views/report/project/components/budgetEdit'
...@@ -619,9 +620,10 @@ import fileEdit from '@/views/report/project/components/fileEdit' ...@@ -619,9 +620,10 @@ import fileEdit from '@/views/report/project/components/fileEdit'
import { isEmptyParams } from "@/views/utils/common" import { isEmptyParams } from "@/views/utils/common"
import moment from 'moment' import moment from 'moment'
const ParticipateUnit = { id: null, unitName: null, unitCountry: null, unitAddress: null, organizationCode: null, projectWork: null }
const ProjResearch = { projNo: null, projName: null, approveUnit: null, leader: null, startDate: null, endDate: null, funds: null } const ProjResearch = { projNo: null, projName: null, approveUnit: null, leader: null, startDate: null, endDate: null, funds: null }
const ManagementRule = { policyName: null, releaseDate: null, documentNumber: null, validityPeriod: null, mainContent: null, fileId: null, downloadId: null, fileName: null, downloadUrl: null } const ManagementRule = { policyName: null, releaseDate: null, documentNumber: null, validityPeriod: null, mainContent: null, fileId: null, downloadId: null, fileName: null, downloadUrl: null }
const StageGoals = { startTime: null, endTime: null, target: null }
const ProjectSub = { projName: null, undertakingUnit: null, address: null, director: null, totalBudget: null, govBudget: null, selfBudget: null, cooperativeUnits: null, fileId: null, downloadId: null, fileName: null, downloadUrl: null } const ProjectSub = { projName: null, undertakingUnit: null, address: null, director: null, totalBudget: null, govBudget: null, selfBudget: null, cooperativeUnits: null, fileId: null, downloadId: null, fileName: null, downloadUrl: null }
const Cooperative = { id: null, unitName: null } const Cooperative = { id: null, unitName: null }
const File = { fileName: '', downloadUrl: '', fileExplain: '', downloadId: '' } const File = { fileName: '', downloadUrl: '', fileExplain: '', downloadId: '' }
...@@ -667,7 +669,7 @@ import cascaderSelect from '@/views/components/common/cascaderSelect' ...@@ -667,7 +669,7 @@ import cascaderSelect from '@/views/components/common/cascaderSelect'
export default { export default {
name: 'projectEdit', name: 'projectEdit',
components: { components: {
projectMemberEdit, cooperativeUnitsEdit, budgetEdit, fundPlanEdit, projectKpiEdit, fileEdit, previewFile, documentView, cascaderSelect, deviceEdit, projStageGoalsEdit, manufactureEdit, projectSubEdit projectMemberEdit, cooperativeUnitsEdit, budgetEdit, fundPlanEdit, projectKpiEdit, fileEdit, previewFile, documentView, cascaderSelect, deviceEdit, projStageGoalsEdit, manufactureEdit, projectSubEdit, participateUnitsEdit
}, },
props: { props: {
value: { value: {
...@@ -725,6 +727,7 @@ export default { ...@@ -725,6 +727,7 @@ export default {
year3Goal: null, year3Goal: null,
projectKPI: projectKPI, projectKPI: projectKPI,
cooperativeUnits: [], cooperativeUnits: [],
participateUnits: [],
members: [], members: [],
budget: [], budget: [],
fundPlan: [], fundPlan: [],
...@@ -804,6 +807,9 @@ export default { ...@@ -804,6 +807,9 @@ export default {
if (!!!this.formData.cooperativeUnits || this.formData.cooperativeUnits.length == 0) if (!!!this.formData.cooperativeUnits || this.formData.cooperativeUnits.length == 0)
this.formData.cooperativeUnits = [{ ...Cooperative }, { ...Cooperative }] this.formData.cooperativeUnits = [{ ...Cooperative }, { ...Cooperative }]
if (!!!this.formData.participateUnits || this.formData.participateUnits.length == 0)
this.formData.participateUnits = [{ ...ParticipateUnit }]
if (!!!this.formData.members || this.formData.members.length == 0) if (!!!this.formData.members || this.formData.members.length == 0)
this.formData.members = [] this.formData.members = []
...@@ -814,7 +820,7 @@ export default { ...@@ -814,7 +820,7 @@ export default {
this.formData.manufactureList = [] this.formData.manufactureList = []
if (!!!this.formData.stageGoals || this.formData.stageGoals.length == 0) if (!!!this.formData.stageGoals || this.formData.stageGoals.length == 0)
this.formData.stageGoals = [] this.formData.stageGoals = [{ ...StageGoals }, { ...StageGoals }, { ...StageGoals }]
if (!!!this.formData.projectSubList || this.formData.projectSubList.length == 0) if (!!!this.formData.projectSubList || this.formData.projectSubList.length == 0)
this.formData.projectSubList = [{ ...ProjectSub }] this.formData.projectSubList = [{ ...ProjectSub }]
......
src/views/report/project/components/projectInfo.vue
View file @ 29fcd350
...@@ -384,6 +384,9 @@ ...@@ -384,6 +384,9 @@
</a-row> </a-row>
</div> </div>
<div v-if="tabsData[2].isShow"> <div v-if="tabsData[2].isShow">
<!-- 项目合作单位 -->
<participate-units-info :dataList.sync="value.participateUnits" />
<a-row> <a-row>
<a-col :span="24" style="border-top: 0px"> <a-col :span="24" style="border-top: 0px">
<div class="main-title"> <div class="main-title">
...@@ -550,13 +553,14 @@ ...@@ -550,13 +553,14 @@
import moment from 'moment' import moment from 'moment'
import cooperativeUnitsInfo from '@/views/report/project/components/cooperativeUnitsInfo' import cooperativeUnitsInfo from '@/views/report/project/components/cooperativeUnitsInfo'
import participateUnitsInfo from '@/views/report/project/components/participateUnitsInfo'
import projectMemberInfo from '@/views/report/project/components/projectMemberInfo' import projectMemberInfo from '@/views/report/project/components/projectMemberInfo'
import projectKpiInfo from '@/views/report/project/components/projectKpiInfo.vue' import projectKpiInfo from '@/views/report/project/components/projectKpiInfo.vue'
import budgetInfo from '@/views/report/project/components/budgetInfo' import budgetInfo from '@/views/report/project/components/budgetInfo'
import fundPlanInfo from '@/views/report/project/components/fundPlanInfo' import fundPlanInfo from '@/views/report/project/components/fundPlanInfo'
import deviceInfo from '@/views/report/project/components/deviceInfo' import deviceInfo from '@/views/report/project/components/deviceInfo'
import manufactureInfo from '@/views/report/project/components/manufactureInfo' import manufactureInfo from '@/views/report/project/components/manufactureInfo'
import projStageGoalsInfo from "@/views/report/project/components/keyProject/projStageGoalsInfo"; import projStageGoalsInfo from "@/views/report/project/components/projStageGoalsInfo";
import projectSubInfo from '@/views/report/project/components/projectSubInfo' import projectSubInfo from '@/views/report/project/components/projectSubInfo'
import fileInfo from "@/views/report/project/components/fileInfo"; import fileInfo from "@/views/report/project/components/fileInfo";
import documentView from '@/views/components/common/documentView' import documentView from '@/views/components/common/documentView'
...@@ -566,7 +570,7 @@ import { toTextarea } from '@/views/utils/common' ...@@ -566,7 +570,7 @@ import { toTextarea } from '@/views/utils/common'
export default { export default {
components: { components: {
cooperativeUnitsInfo, projectMemberInfo, projectKpiInfo, budgetInfo, fundPlanInfo, deviceInfo, manufactureInfo, fileInfo, documentView, AuditList, projStageGoalsInfo,projectSubInfo cooperativeUnitsInfo, projectMemberInfo, projectKpiInfo, budgetInfo, fundPlanInfo, deviceInfo, manufactureInfo, fileInfo, documentView, AuditList, projStageGoalsInfo, projectSubInfo, participateUnitsInfo
}, },
name: "ProjectInfo", name: "ProjectInfo",
data () { data () {
......
src/views/report/project/components/projectSubEdit.vue
View file @ 29fcd350
...@@ -3,109 +3,79 @@ ...@@ -3,109 +3,79 @@
<a-row> <a-row>
<a-col :span="24"> <a-col :span="24">
<div class="tb-title"> <div class="tb-title">
<span>项目课颖设置</span> <span>项目课题设置</span>
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row type="flex" class="row_center"> <a-row type="flex" class="row_center">
<a-col :span="4" class="bg-gray"> <a-col :span="6" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div class="required">课题名称</div> <div class="required">课题名称</div>
</div> </div>
</a-col> </a-col>
<a-col :span="2" class="bg-gray"> <a-col :span="4" class="bg-gray">
<div class="special-middle">
<div class="required">课题承担单位</div>
</div>
</a-col>
<a-col :span="2" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div class="required">所在地</div> <div class="required">承担单位</div>
</div> </div>
</a-col> </a-col>
<a-col :span="2" class="bg-gray"> <a-col :span="2" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div class="required">课颖负责人</div> <div class="required">课题负责人</div>
</div> </div>
</a-col> </a-col>
<a-col :span="2" class="bg-gray"> <a-col :span="3" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div class="required">课题预算总经费</div> <div class="required">课题预算总经费</div>
</div> </div>
</a-col> </a-col>
<a-col :span="2" class="bg-gray"> <a-col :span="3" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div class="required">其中:省科技经费</div> <div class="required">其中：省科技经费</div>
</div> </div>
</a-col> </a-col>
<a-col :span="2" class="bg-gray"> <a-col :span="3" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div>自筹经费</div> <div>自筹经费</div>
</div> </div>
</a-col> </a-col>
<a-col :span="2" class="bg-gray"> <a-col :span="3" class="bg-gray">
<div class="special-middle">
<div>合作单位</div>
</div>
</a-col>
<a-col :span="4" class="bg-gray">
<div class="special-middle">
<div>附件</div>
</div>
</a-col>
<a-col :span="2" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div>操作</div> <div>操作</div>
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row v-for="(item, index) in projectSubList" :key="'projectSubList'+index" type="flex" class="row_center"> <a-row v-for="(item, index) in projectSubList" :key="'projectSubList'+index" type="flex" class="row_center">
<a-col :span="4"> <a-col :span="6">
<a-form-model-item :prop="'projectSubList.' + index + '.projName'" :rules="{ required: true, message: '*', trigger: 'blur',}"> <a-form-model-item :prop="'projectSubList.' + index + '.projName'" :rules="{ required: true, message: '*', trigger: 'blur',}">
<a-input v-model="item.projName" :maxLength="100" placeholder="课题名称" style="width:85%" /> <a-input v-model="item.projName" :maxLength="100" placeholder="课题名称" style="width:85%" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="2"> <a-col :span="4">
<a-form-model-item :prop="'projectSubList.' + index + '.undertakingUnit'" :rules="{ required: true, message: '*', trigger: 'blur',}"> <a-form-model-item :prop="'projectSubList.' + index + '.undertakingUnit'" :rules="{ required: true, message: '*', trigger: 'blur',}">
<a-input v-model="item.undertakingUnit" :maxLength="100" placeholder="课题承担单位" style="width:85%" /> <a-input v-model="item.undertakingUnit" :maxLength="100" placeholder="承担单位" style="width:85%" />
</a-form-model-item>
</a-col>
<a-col :span="2">
<a-form-model-item :prop="'projectSubList.' + index + '.address'" :rules="{ required: true, message: '*', trigger: 'blur',}">
<a-input v-model="item.address" :maxLength="100" placeholder="所在地" style="width:85%" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="2"> <a-col :span="2">
<a-form-model-item :prop="'projectSubList.' + index + '.director'" :rules="{ required: true, message: '*', trigger: 'blur',}"> <a-form-model-item :prop="'projectSubList.' + index + '.director'" :rules="{ required: true, message: '*', trigger: 'blur',}">
<a-input v-model="item.director" :maxLength="50" placeholder="课颖负责人" style="width:85%" /> <a-input v-model="item.director" :maxLength="50" placeholder="课题负责人" style="width:85%" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="2"> <a-col :span="3">
<a-form-model-item :prop="'projectSubList.' + index + '.totalBudget'" :rules="{ required: true, message: '*', trigger: 'blur',}"> <a-form-model-item :prop="'projectSubList.' + index + '.totalBudget'" :rules="{ required: true, message: '*', trigger: 'blur',}">
<a-input-number v-model="item.totalBudget" placeholder="课题预算总经费" :min="0" :step="0.01" style="width:85%" /> <a-input-number v-model="item.totalBudget" placeholder="课题预算总经费" :min="0" :step="0.01" style="width:85%" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="2"> <a-col :span="3">
<a-form-model-item :prop="'projectSubList.' + index + '.govBudget'" :rules="{ required: true, message: '*', trigger: 'blur',}"> <a-form-model-item :prop="'projectSubList.' + index + '.govBudget'" :rules="{ required: true, message: '*', trigger: 'blur',}">
<a-input-number v-model="item.govBudget" placeholder="其中:省科技经费" :min="0" :step="0.01" style="width:85%" /> <a-input-number v-model="item.govBudget" placeholder="其中:省科技经费" :min="0" :step="0.01" style="width:85%" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="2"> <a-col :span="3">
<a-form-model-item :prop="'projectSubList.' + index + '.selfBudget'" :rules="{ required: true, message: '*', trigger: 'blur',}"> <a-form-model-item :prop="'projectSubList.' + index + '.selfBudget'" :rules="{ required: true, message: '*', trigger: 'blur',}">
<a-input-number v-model="item.selfBudget" placeholder="自筹经费" :min="0" :step="0.01" style="width:85%" /> <a-input-number v-model="item.selfBudget" placeholder="自筹经费" :min="0" :step="0.01" style="width:85%" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="2"> <a-col :span="3">
<a-form-model-item :prop="'projectSubList.' + index + '.cooperativeUnits'" :rules="{ required: true, message: '*', trigger: 'blur',}">
<a-input v-model="item.cooperativeUnits" :maxLength="100" placeholder="合作单位" style="width:85%" />
</a-form-model-item>
</a-col>
<a-col :span="4">
<div class="special-middle">
<file-load :file.sync="projectSubList[index]" :index="index" :name="'projectSubList'" />
</div>
</a-col>
<a-col :span="2">
<div class="special-middle"> <div class="special-middle">
<a-popconfirm title="确定要删除吗？" ok-text="确定" cancel-text="取消" @confirm="deleteArray(item)"> <a-popconfirm title="确定要删除吗？" ok-text="确定" cancel-text="取消" @confirm="deleteArray(item)">
<a-button type="link" size="small">删除</a-button> <a-button type="link" size="small">删除</a-button>
......
src/views/report/project/components/projectSubInfo.vue
View file @ 29fcd350
...@@ -3,134 +3,97 @@ ...@@ -3,134 +3,97 @@
<a-row> <a-row>
<a-col :span="24"> <a-col :span="24">
<div class="tb-title"> <div class="tb-title">
<span>项目课颖设置</span> <span>项目课题设置</span>
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row type="flex" class="row_center"> <a-row type="flex" class="row_center">
<a-col :span="1" class="bg-gray"> <a-col :span="2" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div>序号</div> <div>序号</div>
</div> </div>
</a-col> </a-col>
<a-col :span="2" class="bg-gray"> <a-col :span="6" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div >课题名称</div> <div >课题名称</div>
</div> </div>
</a-col> </a-col>
<a-col :span="2" class="bg-gray"> <a-col :span="4" class="bg-gray">
<div class="special-middle">
<div >课题承担单位</div>
</div>
</a-col>
<a-col :span="2" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div >所在地</div> <div >承担单位</div>
</div> </div>
</a-col> </a-col>
<a-col :span="2" class="bg-gray"> <a-col :span="2" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div >课颖负责人</div> <div >课题负责人</div>
</div> </div>
</a-col> </a-col>
<a-col :span="2" class="bg-gray"> <a-col :span="3" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div >课题预算总经费</div> <div >课题预算总经费</div>
</div> </div>
</a-col> </a-col>
<a-col :span="2" class="bg-gray"> <a-col :span="3" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div >其中:省科技经费</div> <div >其中：省科技经费</div>
</div> </div>
</a-col> </a-col>
<a-col :span="2" class="bg-gray"> <a-col :span="3" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div>自筹经费</div> <div>自筹经费</div>
</div> </div>
</a-col> </a-col>
<a-col :span="2" class="bg-gray">
<div class="special-middle">
<div>合作单位</div>
</div>
</a-col>
<a-col :span="7" class="bg-gray">
<div class="special-middle">
<div>附件</div>
</div>
</a-col>
</a-row> </a-row>
<a-row v-for="(item, index) in dataList" :key="'projectSubList'+index" type="flex" class="row_center"> <a-row v-for="(item, index) in dataList" :key="'projectSubList'+index" type="flex" class="row_center">
<a-col :span="1"> <a-col :span="2">
<div class="special-middle"> <div class="special-middle">
<div> <div>
{{ index + 1 }} {{ index + 1 }}
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :span="2"> <a-col :span="6">
<div class="special-middle"> <div class="special-middle">
<div> <div>
{{ item.projName }} {{ item.projName }}
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :span="2"> <a-col :span="4">
<div class="special-middle"> <div class="special-middle">
<div> <div>
{{ item.undertakingUnit }} {{ item.undertakingUnit }}
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :span="2"> <a-col :span="3">
<div class="special-middle">
<div>
{{ item.address }}
</div>
</div>
</a-col>
<a-col :span="2">
<div class="special-middle"> <div class="special-middle">
<div> <div>
{{ item.director }} {{ item.director }}
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :span="2"> <a-col :span="3">
<div class="special-middle"> <div class="special-middle">
<div> <div>
{{ item.totalBudget }} {{ item.totalBudget }}
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :span="2"> <a-col :span="3">
<div class="special-middle"> <div class="special-middle">
<div> <div>
{{ item.govBudget }} {{ item.govBudget }}
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :span="2"> <a-col :span="3">
<div class="special-middle"> <div class="special-middle">
<div> <div>
{{ item.selfBudget }} {{ item.selfBudget }}
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :span="2">
<div class="special-middle">
<div>
{{ item.cooperativeUnits }}
</div>
</div>
</a-col>
<a-col :span="7">
<div class="special-middle">
<div v-if="item.fileName" style="text-align: left;">
<document-view :fileUrl="item.downloadUrl" :fileName="item.fileName" :imageArray="[item.downloadUrl]"></document-view>
</div>
<div v-else>无</div>
</div>
</a-col>
</a-row> </a-row>
</div> </div>
</template> </template>
......
src/views/utils/common.js
View file @ 29fcd350
...@@ -357,6 +357,23 @@ export const tableColumnsName = (tableColumns) => { ...@@ -357,6 +357,23 @@ export const tableColumnsName = (tableColumns) => {
}) })
return arr return arr
} }
export const toChineseNum = (num) => {
let changeNum = ['零', '一', '二', '三', '四', '五', '六', '七', '八', '九'];
let unit = ["", "十", "百", "千", "万"];
num = parseInt(num);
let getWan = (temp) => {
let strArr = temp.toString().split("").reverse();
let newNum = "";
for (var i = 0; i < strArr.length; i++) {
newNum = (i == 0 && strArr[i] == 0 ? "" : (i > 0 && strArr[i] == 0 && strArr[i - 1] == 0 ? "" : changeNum[strArr[i]] + (strArr[i] == 0 ? unit[0] : unit[i]))) + newNum;
}
return newNum;
}
let overWan = Math.floor(num / 10000);
let noWan = num % 10000;
if (noWan.toString().length < 4) noWan = "0" + noWan;
return overWan ? getWan(overWan) + "万" + getWan(noWan) : getWan(num);
}
/** /**
* 生成UUID * 生成UUID
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment