|
@@ -3065,7 +3065,7 @@ export default {
|
|
}
|
|
}
|
|
if (this.currentNode.nodeCode == 'ASSET_REPORT_TAKE_NO') {
|
|
if (this.currentNode.nodeCode == 'ASSET_REPORT_TAKE_NO') {
|
|
this.nodeBusinessInfo.businessMinId = this.commitProductionNo;
|
|
this.nodeBusinessInfo.businessMinId = this.commitProductionNo;
|
|
- aProListSelectDTO.productionNos = this.assetsProductionData.filter(obj => obj.productionType !== 'STATEMENT').map(obj => obj.productionNo);
|
|
|
|
|
|
+ aProListSelectDTO.productionNos = this.assetsEvaluationTarget.filter(obj => obj.reportNo).map(obj => obj.reportNo);
|
|
}
|
|
}
|
|
|
|
|
|
aProListSelectDTO.businessId = this.assetsForm.id;
|
|
aProListSelectDTO.businessId = this.assetsForm.id;
|
|
@@ -3088,7 +3088,7 @@ export default {
|
|
(obj.reportNo === null || obj.reportNo === '')
|
|
(obj.reportNo === null || obj.reportNo === '')
|
|
);
|
|
);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+console.log(isNotWriteAllPro)
|
|
// 判断是否完成节点
|
|
// 判断是否完成节点
|
|
if (isNotWriteAllPro) { // 还有未撰写或未提交产品不完成节点
|
|
if (isNotWriteAllPro) { // 还有未撰写或未提交产品不完成节点
|
|
this.nodeBusinessInfo.ifCheckTask = false;
|
|
this.nodeBusinessInfo.ifCheckTask = false;
|
|
@@ -3165,7 +3165,9 @@ export default {
|
|
} else {
|
|
} else {
|
|
this.assetsProductionForm.signatory = null;
|
|
this.assetsProductionForm.signatory = null;
|
|
}
|
|
}
|
|
- this.$api.assets.productionUpdate(this.assetsProductionForm).then(res => {
|
|
|
|
|
|
+ this.taskRecordDTO.recordId = this.currentNode.tasks[0].recordId;
|
|
|
|
+ this.taskRecordDTO.taskData = this.assetsProductionForm;
|
|
|
|
+ this.$api.assets.productionUpdate(this.taskRecordDTO).then(res => {
|
|
if (res.code == 200) {
|
|
if (res.code == 200) {
|
|
this.$notify({
|
|
this.$notify({
|
|
title: '成功',
|
|
title: '成功',
|