|
@@ -82,11 +82,11 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- // 创建测算表,填写测算表基础信息
|
|
|
+ // 创建报告,填写测算表基础信息
|
|
|
createReport() {
|
|
|
this.$refs.baseInfo.validate((valid) => {
|
|
|
if (valid) {
|
|
|
- if (!this.projectStore.reportProgress.id) {
|
|
|
+ if (!this.baseInfo.id) {
|
|
|
this.baseInfo.progress = 'BASE';
|
|
|
}
|
|
|
this.baseInfo.projectId = this.projectStore.projectInfo.id;
|
|
@@ -97,18 +97,20 @@ export default {
|
|
|
message: res.message,
|
|
|
type: 'success'
|
|
|
})
|
|
|
- this.getReportProgress();
|
|
|
- this.$router.push('/home/assets/workbench/report/eqptBaseInfo');
|
|
|
+ this.getReportProgress(true);
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
// 获取未完成报告的进度信息并保存到缓存
|
|
|
- getReportProgress() {
|
|
|
+ getReportProgress(goNext) {
|
|
|
getUnFinishedReportProgress(this.projectStore.projectInfo.id).then(res => {
|
|
|
if (res.data) {
|
|
|
this.projectStore.setReportProgress(res.data);
|
|
|
+ if(goNext) {
|
|
|
+ this.$router.push('/home/assets/workbench/report/eqptBaseInfo');
|
|
|
+ }
|
|
|
}
|
|
|
})
|
|
|
}
|