|
@@ -180,7 +180,7 @@
|
|
|
<span>{{scope.row.projectStartDate}} - {{scope.row.projectEndDate}}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="研发人员数" prop="projectName" align="center"/>
|
|
|
+ <el-table-column label="研发人员数" prop="techPersons" align="center"/>
|
|
|
</el-table>
|
|
|
<template v-if="type == 'year' || type == 'update'">
|
|
|
<el-row :gutter="40" v-if="!disabledVisible">
|
|
@@ -372,9 +372,9 @@ export default {
|
|
|
}
|
|
|
//获取年度信息
|
|
|
if(this.type == 'year') {
|
|
|
- this.getEntData()
|
|
|
- // let years= new Date().getFullYear();
|
|
|
- // this.handleYear(years)
|
|
|
+ // this.getEntData()
|
|
|
+ let years= new Date().getFullYear();
|
|
|
+ this.handleYear(years)
|
|
|
}
|
|
|
if(this.type == 'update') {
|
|
|
this.yearVisible = true
|
|
@@ -467,7 +467,9 @@ export default {
|
|
|
//根据企业id获取年度信息
|
|
|
getYearData(projectYear) {
|
|
|
getYearDataApi(projectYear, this.entId).then(res => {
|
|
|
- this.form = res.data
|
|
|
+ // this.form = res.data
|
|
|
+ this.form = Object.assign({}, this.form, res.data)
|
|
|
+ this.$set(this.form, 'projectYear', res.data.projectYear)
|
|
|
this.form.fileName = '高新证书'
|
|
|
if(this.form.techStartDate && this.form.techEndDate) {
|
|
|
this.form.licenseTime = this.form.techStartDate + ' 至 ' + this.form.techEndDate
|
|
@@ -526,38 +528,29 @@ export default {
|
|
|
this.form.techStartDate = ""
|
|
|
this.form.techEndDate = ""
|
|
|
}
|
|
|
- let _self = this;
|
|
|
- this.$confirm('是否确认保存?', "警告", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- cancelButtonText: "取消",
|
|
|
- type: "warning"
|
|
|
- }).then(function() {
|
|
|
- if(_self.type == 'year') {
|
|
|
- yearApi(_self.form).then(res => {
|
|
|
- _self.$alert('企业加计年度企业基本信息保存成功', '提示', {
|
|
|
- confirmButtonText: '确定',
|
|
|
- callback: action => {
|
|
|
- _self.loading = false
|
|
|
- // _self.$store.dispatch("tagsView/delView", _self.$route);
|
|
|
- _self.$router.go(-1);
|
|
|
- }
|
|
|
- })
|
|
|
+ if(this.type == 'year') {
|
|
|
+ yearApi(this.form).then(res => {
|
|
|
+ this.$alert('企业加计年度企业基本信息保存成功', '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ callback: action => {
|
|
|
+ this.loading = false
|
|
|
+ // this.$store.dispatch("tagsView/delView", this.$route);
|
|
|
+ this.$router.go(-1);
|
|
|
+ }
|
|
|
})
|
|
|
- } else {
|
|
|
- yearUpdateApi(_self.form).then(res => {
|
|
|
- _self.$alert('企业加计年度企业基本信息保存成功', '提示', {
|
|
|
- confirmButtonText: '确定',
|
|
|
- callback: action => {
|
|
|
- _self.loading = false
|
|
|
- // _self.$store.dispatch("tagsView/delView", _self.$route);
|
|
|
- _self.$router.go(-1);
|
|
|
- }
|
|
|
- })
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ yearUpdateApi(this.form).then(res => {
|
|
|
+ this.$alert('企业加计年度企业基本信息保存成功', '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ callback: action => {
|
|
|
+ this.loading = false
|
|
|
+ // this.$store.dispatch("tagsView/delView", this.$route);
|
|
|
+ this.$router.go(-1);
|
|
|
+ }
|
|
|
})
|
|
|
- }
|
|
|
- }).catch(() => {
|
|
|
- _self.loading = false
|
|
|
- });
|
|
|
+ })
|
|
|
+ }
|
|
|
}
|
|
|
})
|
|
|
}
|