|
@@ -370,13 +370,14 @@ export default {
|
|
|
getYears(){
|
|
|
let optionsArray = new Array();
|
|
|
let years= new Date().getFullYear();
|
|
|
- for(var i=years-3;i<=years;i++){
|
|
|
+ for(var i=years;i>=years-3;i--){
|
|
|
let anOption = {};
|
|
|
anOption.dictValue=i;
|
|
|
anOption.dictLabel=i;
|
|
|
optionsArray.push(anOption);
|
|
|
}
|
|
|
this.yearsOptions = optionsArray;
|
|
|
+ console.log(this.yearsOptions, "this.yearsOptions")
|
|
|
},
|
|
|
getLayDate(){
|
|
|
let _self = this
|
|
@@ -389,9 +390,14 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- getEntData() {
|
|
|
+ getEntData(e) {
|
|
|
listEntUserApi().then(res => {
|
|
|
+ this.form = {}
|
|
|
if(res.code == 200) {
|
|
|
+ if(e) {
|
|
|
+ this.form.projectYear = e
|
|
|
+ }
|
|
|
+ console.log("$$$$$$$$$$$$")
|
|
|
this.form.entName = res.data.entName
|
|
|
this.form.linkName = res.data.linkName
|
|
|
this.form.linkPhone = res.data.linkPhone
|
|
@@ -434,6 +440,8 @@ export default {
|
|
|
let industryArray = this.form.industry.split(',') || [];
|
|
|
this.$set(this.form, 'industryArray', industryArray);
|
|
|
}
|
|
|
+ }else {
|
|
|
+ this.getEntData(e)
|
|
|
}
|
|
|
})
|
|
|
},
|
|
@@ -510,7 +518,7 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
}).catch(() => {
|
|
|
- _self.loading = false
|
|
|
+ _self.loading = false
|
|
|
});
|
|
|
}
|
|
|
})
|
|
@@ -518,9 +526,12 @@ export default {
|
|
|
},
|
|
|
watch: {
|
|
|
'tempVariable'(val) {
|
|
|
- if(val.invest && val.sales) {
|
|
|
- this.form.techRate = ((val.invest / val.sales)*100).toFixed(2)
|
|
|
+ if(val) {
|
|
|
+ if(val.invest && val.sales) {
|
|
|
+ this.form.techRate = ((val.invest / val.sales)*100).toFixed(2)
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
},
|
|
|
info: {
|
|
|
immediate: true,
|