Commit fc7c733b authored by wangxl's avatar wangxl

22

parent 07c0b73a
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
import { getType, getComplete, setComplete } from '@/views/utils/auth' import { getType, getComplete, setComplete } from '@/views/utils/auth'
import moment from 'moment' import moment from 'moment'
import { isEmptyParams, filterExportExcelData, tableColumnsName, checkEmail, personGender, personBirthday, checkImageFileType, checkDocumentFileType } from "@/views/utils/common" import { isEmptyParams, filterExportExcelData, tableColumnsName, checkEmail, personGender, personBirthday, checkImageFileType, checkDocumentFileType } from "@/views/utils/common"
import projectCreate from '@/views/report/project/components/projectCreate' import projectCreate from '@/views/report/project/components/edit/projectCreate'
import projectView from '@/views/report/project/components/projectView' import projectView from '@/views/report/project/components/projectView'
import previewFile from '@/views/components/common/previewFile' import previewFile from '@/views/components/common/previewFile'
import knowledgeSelect from '@/views/components/common/knowledgeSelect' import knowledgeSelect from '@/views/components/common/knowledgeSelect'
......
...@@ -2,6 +2,11 @@ ...@@ -2,6 +2,11 @@
<template> <template>
<div class="app-content" style="height: 76vh;overflow: auto;"> <div class="app-content" style="height: 76vh;overflow: auto;">
<a-spin :spinning="loading" style="width: 100%;height: 100%;"> <a-spin :spinning="loading" style="width: 100%;height: 100%;">
<div>
<a-steps size="small" @change="stepsChange" :initial="0">
<a-step :status="item" v-for="(item,index) in completeStatus" :key="index+'completeStatus'" :disabled="false" />
</a-steps>
</div>
<div class="page-content"> <div class="page-content">
<project-edit v-model="value" @close="closeWindow" @load="onLoad" ref="projCreate" v-if="projType"></project-edit> <project-edit v-model="value" @close="closeWindow" @load="onLoad" ref="projCreate" v-if="projType"></project-edit>
<project-edit-key v-model="value" @close="closeWindow" @load="onLoad" ref="projCreate" v-else></project-edit-key> <project-edit-key v-model="value" @close="closeWindow" @load="onLoad" ref="projCreate" v-else></project-edit-key>
...@@ -26,7 +31,13 @@ export default { ...@@ -26,7 +31,13 @@ export default {
data () { data () {
return { return {
loading: false, loading: false,
projType: getType() == "1" projType: getType() == "1",
current: 0,
completeStatus: ["process", "finish", "process", "process", "", "", "", "", "", ""],
stepStyle: {
marginBottom: '60px',
boxShadow: '0px -1px 0 0 #e8e8e8 inset',
},
} }
}, },
props: { props: {
...@@ -40,6 +51,12 @@ export default { ...@@ -40,6 +51,12 @@ export default {
created () { created () {
}, },
methods: { methods: {
stepsChange (e) {
var clone = [].concat(this.completeStatus)
clone[e] = "process"
this.completeStatus = clone
console.log(this.completeStatus)
},
save () { save () {
this.$refs.projCreate.save() this.$refs.projCreate.save()
}, },
......
<template> <template>
<div> <div>
<div>
<a-steps :current="current" size="small" @change="stepsChange">
<a-step :status="item" v-for="(item,index) in completeStatus" :key="index+'completeStatus'" />
</a-steps>
</div>
<a-form-model ref="form" :model="formData" :rules="rules" style="border-top: 0px" class="from-table font-line-space"> <a-form-model ref="form" :model="formData" :rules="rules" style="border-top: 0px" class="from-table font-line-space">
<div v-if="true">
<a-row> <a-row>
<a-col :span="24" style="border-top: 0px;text-align: center;"> <a-col :span="24" style="border-top: 0px;text-align: center;">
<div class="main-title"> <div class="main-title">
<span>项目基本情况1111</span> <span>项目基本情况</span>
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
...@@ -392,9 +388,8 @@ ...@@ -392,9 +388,8 @@
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
<!-- 项目主要参与单位及分工 --> </div>
<participate-units-edit :participateUnits.sync="formData.participateUnits" /> <div v-if="false">
<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">
...@@ -411,7 +406,10 @@ ...@@ -411,7 +406,10 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<!-- 项目主要参与单位及分工 -->
<participate-units-edit :participateUnits.sync="formData.participateUnits" />
</div>
<div v-if="false">
<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">
...@@ -505,6 +503,8 @@ ...@@ -505,6 +503,8 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
</div>
<div v-if="false">
<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">
...@@ -535,7 +535,8 @@ ...@@ -535,7 +535,8 @@
<preview-file v-model="formData.downloadUrl" :fileName="formData.fileName"></preview-file> --> <preview-file v-model="formData.downloadUrl" :fileName="formData.fileName"></preview-file> -->
</a-col> </a-col>
</a-row> </a-row>
</div>
<div v-if="false">
<!-- 经费预算 --> <!-- 经费预算 -->
<budget-edit :budget.sync="formData.budget" @save="budgetSave" /> <budget-edit :budget.sync="formData.budget" @save="budgetSave" />
<a-row type="flex"> <a-row type="flex">
...@@ -547,15 +548,35 @@ ...@@ -547,15 +548,35 @@
</a-row> </a-row>
<!-- 分年度用款计划 --> <!-- 分年度用款计划 -->
<fund-plan-edit :fundPlan.sync="formData.fundPlan" @save="planSave" /> <fund-plan-edit :fundPlan.sync="formData.fundPlan" @save="planSave" />
<a-row type="flex">
<!-- 项目承担单位研究资金支出预算明细表 --> <a-col :span="24" style="text-align: center;">
<unit-payment-edit :unitPayment.sync="formData.unitPayment" /> <div class="special-middle">
<!-- <equipments-edit :equipments.sync="formData.equipments" /> --> &nbsp;
</div>
</a-col>
</a-row>
<!-- 设备费-购置设备预算明细表 --> <!-- 设备费-购置设备预算明细表 -->
<device-edit :deviceList.sync="formData.deviceList" /> <device-edit :deviceList.sync="formData.deviceList" />
<a-row type="flex">
<a-col :span="24" style="text-align: center;">
<div class="special-middle">
&nbsp;
</div>
</a-col>
</a-row>
<!-- 设备费-试制设备预算明细表 --> <!-- 设备费-试制设备预算明细表 -->
<manufacture-edit :manufactureList.sync:="formData.manufactureList" /> <manufacture-edit :manufactureList.sync:="formData.manufactureList" />
<a-row type="flex">
<a-col :span="24" style="text-align: center;">
<div class="special-middle">
&nbsp;
</div>
</a-col>
</a-row>
<!-- 项目承担单位研究资金支出预算明细表 -->
<unit-payment-edit :unitPayment.sync="formData.unitPayment" />
</div>
<div v-if="false">
<a-row type="flex"> <a-row type="flex">
<a-col :span="24" style="text-align: center;"> <a-col :span="24" style="text-align: center;">
<div class="special-middle"> <div class="special-middle">
...@@ -565,15 +586,17 @@ ...@@ -565,15 +586,17 @@
</a-row> </a-row>
<!-- 项目绩效指标 --> <!-- 项目绩效指标 -->
<project-kpi-edit :projectKPI.sync="formData.projectKPI" /> <project-kpi-edit :projectKPI.sync="formData.projectKPI" />
</div>
<div v-if="false">
<!-- 项目安排及阶段目标 --> <!-- 项目安排及阶段目标 -->
<proj-stage-goals-edit :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" />
</div>
<div v-if="false">
<!-- 附件 --> <!-- 附件 -->
<file-edit :fileList.sync="formData.fileList" /> <file-edit :fileList.sync="formData.fileList" />
</div>
</a-form-model> </a-form-model>
</div> </div>
</template> </template>
...@@ -664,12 +687,6 @@ export default { ...@@ -664,12 +687,6 @@ export default {
}, },
data () { data () {
return { return {
current: 0,
completeStatus: ["wait", "finish", "process", "", "", "", "", "", "", ""],
stepStyle: {
marginBottom: '60px',
boxShadow: '0px -1px 0 0 #e8e8e8 inset',
},
overseasShow: false, overseasShow: false,
formData: { formData: {
id: null, id: null,
...@@ -762,11 +779,6 @@ export default { ...@@ -762,11 +779,6 @@ export default {
}, },
methods: { methods: {
moment, moment,
stepsChange (e) {
this.completeStatus[e] = "finish"
console.log(this.completeStatus)
console.log(e)
},
getProject () { getProject () {
this.$emit('load', true) this.$emit('load', true)
if (!!this.value) { if (!!this.value) {
......
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