|
@@ -805,26 +805,27 @@
|
|
|
data: [this.workOrderInfo]
|
|
data: [this.workOrderInfo]
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- let resultValue = '0';
|
|
|
|
|
- await parameterGetByCode({
|
|
|
|
|
- code: 'first_article_dual_inspection_for_report'
|
|
|
|
|
- }).then((res) => {
|
|
|
|
|
- resultValue = res.value;
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ // let resultValue = '0';
|
|
|
|
|
+ // await parameterGetByCode({
|
|
|
|
|
+ // code: 'first_article_dual_inspection_for_report'
|
|
|
|
|
+ // }).then((res) => {
|
|
|
|
|
+ // resultValue = res.value;
|
|
|
|
|
+ // });
|
|
|
|
|
|
|
|
- if (resultValue == '1') {
|
|
|
|
|
- const result = await this.checkQualityResult();
|
|
|
|
|
- if (!result) return;
|
|
|
|
|
|
|
+ // if (resultValue == '1') {
|
|
|
|
|
+ const result = await this.checkQualityResult();
|
|
|
|
|
+ this.isFinalCheckProduction = false;
|
|
|
|
|
+ if (!result) return;
|
|
|
|
|
|
|
|
- const firstArticleResult =
|
|
|
|
|
- result.firstArticleDualInspectionResult ?? true;
|
|
|
|
|
|
|
+ const firstArticleResult =
|
|
|
|
|
+ result.firstArticleDualInspectionResult ?? true;
|
|
|
|
|
|
|
|
- this.isFinalCheckProduction = firstArticleResult;
|
|
|
|
|
|
|
+ this.isFinalCheckProduction = firstArticleResult;
|
|
|
|
|
|
|
|
- if (!firstArticleResult) {
|
|
|
|
|
- return this.$message.warning('请完成首件两检再报工!');
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ if (!firstArticleResult) {
|
|
|
|
|
+ return this.$message.warning('请完成首件两检再报工!');
|
|
|
}
|
|
}
|
|
|
|
|
+ // }
|
|
|
|
|
|
|
|
// const isWorkCenter =
|
|
// const isWorkCenter =
|
|
|
// this.$store.state.user.info.workCenterIds.includes(
|
|
// this.$store.state.user.info.workCenterIds.includes(
|