Commit 3bf710d6 authored by wangxl's avatar wangxl

44444

parent 374d80e6
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
</div> </div>
<div style="width: 100%;height: calc(100% - 50px);overflow: auto;" ref="main"> <div style="width: 100%;height: calc(100% - 50px);overflow: auto;" ref="main">
<div class="x_modal_content"> <div class="x_modal_content">
<project-info v-model="projectInfo" :tabsData.sync="tabsData" v-if="projType" /> <project-info v-model="formData" :tabsData.sync="tabsData" v-if="projectType=='1'" />
<project-info-Key v-model="projectInfo" :tabsData.sync="tabsData" v-else /> <project-info-Key v-model="formData" :tabsData.sync="tabsData" v-if="projectType=='2'" />
<a-row> <a-row>
<a-col :span="24"> <a-col :span="24">
<div class="tb-title"> <div class="tb-title">
...@@ -121,7 +121,7 @@ export default { ...@@ -121,7 +121,7 @@ export default {
auditResult: { required: true, message: '请选择审核结果', trigger: 'change' }, auditResult: { required: true, message: '请选择审核结果', trigger: 'change' },
}, },
loading: false, loading: false,
projType: getType() == "1" projType: getType()
}; };
}, },
props: { props: {
......
...@@ -150,7 +150,6 @@ export default { ...@@ -150,7 +150,6 @@ export default {
}, },
data () { data () {
return { return {
projType: getType() == "1",
loadState: false, //判断是否查询信息完整状态 loadState: false, //判断是否查询信息完整状态
isComplete: false, isComplete: false,
formData: { id: null, nation: null, title: null, education: null, spec: null, email: null, sex: null, birthday: null }, formData: { id: null, nation: null, title: null, education: null, spec: null, email: null, sex: null, birthday: null },
......
...@@ -710,7 +710,6 @@ export default { ...@@ -710,7 +710,6 @@ export default {
projectSubList: [], projectSubList: [],
managementRuleList: [], managementRuleList: [],
fileList: [], fileList: [],
projType: getType()
}, },
rules: { rules: {
organizationCode: [{ required: true, message: '请填写组织机构代码/统一社会信用代码', trigger: 'blur' },], organizationCode: [{ required: true, message: '请填写组织机构代码/统一社会信用代码', trigger: 'blur' },],
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
<div class="page-footer"> <div class="page-footer">
<!-- 申报项目详情 --> <!-- 申报项目详情 -->
<!-- <a-button type="primary" @click="onExport">导出</a-button> --> <!-- <a-button type="primary" @click="onExport">导出</a-button> -->
<project-info v-model="projectInfo" :tabsData.sync="tabsData" v-if="projType" /> <project-info v-model="formData" :tabsData.sync="tabsData" v-if="projectType=='1'" />
<project-info-Key v-model="projectInfo" :tabsData.sync="tabsData" v-else /> <project-info-Key v-model="formData" :tabsData.sync="tabsData" v-if="projectType=='2'" />
</div> </div>
</a-spin> </a-spin>
</div> </div>
...@@ -71,7 +71,7 @@ export default { ...@@ -71,7 +71,7 @@ export default {
{ title: '单位科研项目及资金管理制度', key: '10', isShow: true }, { title: '单位科研项目及资金管理制度', key: '10', isShow: true },
// { title: '诚信承诺书', key: '11', isShow: true }, // { title: '诚信承诺书', key: '11', isShow: true },
], ],
projectInfo: { formData: {
id: null, id: null,
organizationCode: null, organizationCode: null,
address: null, address: null,
...@@ -119,10 +119,9 @@ export default { ...@@ -119,10 +119,9 @@ export default {
projectSubList: [], projectSubList: [],
managementRuleList: [], managementRuleList: [],
fileList: [], fileList: [],
projType: getType()
}, },
loading: false, loading: false,
projType: getType() == "1" projType: getType()
}; };
}, },
props: { props: {
...@@ -131,7 +130,7 @@ export default { ...@@ -131,7 +130,7 @@ export default {
default: () => { default: () => {
return null return null
} }
} },
}, },
created () { created () {
this.getProjectInfoById() this.getProjectInfoById()
...@@ -142,7 +141,7 @@ export default { ...@@ -142,7 +141,7 @@ export default {
this.loading = true this.loading = true
this.$api.project.getProjectInfoById({ id: this.value }).then(({ data = {} }) => { this.$api.project.getProjectInfoById({ id: this.value }).then(({ data = {} }) => {
if (data) { if (data) {
this.projectInfo = data this.formData = data
this.loading = false this.loading = false
} else } else
this.$emit('close', 'error') this.$emit('close', 'error')
...@@ -154,7 +153,7 @@ export default { ...@@ -154,7 +153,7 @@ export default {
let blob = new Blob([res], { let blob = new Blob([res], {
type: "application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=utf-8", type: "application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=utf-8",
}); });
const fileName = this.projectInfo.projName + '.doc'; const fileName = this.formData.projName + '.doc';
let downloadElement = document.createElement('a') let downloadElement = document.createElement('a')
let href = window.URL.createObjectURL(blob); //创建下载的链接 let href = window.URL.createObjectURL(blob); //创建下载的链接
downloadElement.href = href; downloadElement.href = href;
......
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