|
@@ -604,10 +604,7 @@
|
|
|
return this.$store.state.user.info;
|
|
return this.$store.state.user.info;
|
|
|
},
|
|
},
|
|
|
hasFirstArticleInspectionTarget() {
|
|
hasFirstArticleInspectionTarget() {
|
|
|
- if (this.activeName === '0') {
|
|
|
|
|
- return this.workListIds.length > 0;
|
|
|
|
|
- }
|
|
|
|
|
- return !!this.taskData;
|
|
|
|
|
|
|
+ return this.activeName === '0' && this.workListIds.length > 0;
|
|
|
},
|
|
},
|
|
|
qualityInspectionDisabled() {
|
|
qualityInspectionDisabled() {
|
|
|
return (
|
|
return (
|
|
@@ -1131,13 +1128,13 @@
|
|
|
this.workListIds = data.ids;
|
|
this.workListIds = data.ids;
|
|
|
this.workData = data;
|
|
this.workData = data;
|
|
|
this.checkProductionResult();
|
|
this.checkProductionResult();
|
|
|
- this.refreshFirstArticlePickFeedStatus();
|
|
|
|
|
|
|
+ // this.refreshFirstArticlePickFeedStatus();
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
taskSelect(data) {
|
|
taskSelect(data) {
|
|
|
this.workOrderDetailPreviewSuppressed = false;
|
|
this.workOrderDetailPreviewSuppressed = false;
|
|
|
this.taskData = data.list && data.list.length > 0 ? data.list[0] : null;
|
|
this.taskData = data.list && data.list.length > 0 ? data.list[0] : null;
|
|
|
- this.refreshFirstArticlePickFeedStatus();
|
|
|
|
|
|
|
+ this.resetFirstArticlePickFeedStatus();
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
buildWorkOrderInfoFromTaskRow(row) {
|
|
buildWorkOrderInfoFromTaskRow(row) {
|
|
@@ -1309,10 +1306,6 @@
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
getFirstArticleInspectionRows() {
|
|
getFirstArticleInspectionRows() {
|
|
|
- if (this.activeName === '1') {
|
|
|
|
|
- return this.taskData ? [this.taskData] : [];
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
const selectedIds = new Set(this.workListIds.map((id) => String(id)));
|
|
const selectedIds = new Set(this.workListIds.map((id) => String(id)));
|
|
|
const rows = this.workData?.list || [];
|
|
const rows = this.workData?.list || [];
|
|
|
const selectedRows = rows.filter((row) =>
|
|
const selectedRows = rows.filter((row) =>
|
|
@@ -1387,7 +1380,7 @@
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
async refreshFirstArticlePickFeedStatus() {
|
|
async refreshFirstArticlePickFeedStatus() {
|
|
|
- if (this.info?.clientEnvironmentId != 9) {
|
|
|
|
|
|
|
+ if (this.info?.clientEnvironmentId != 9 || this.activeName !== '0') {
|
|
|
this.resetFirstArticlePickFeedStatus();
|
|
this.resetFirstArticlePickFeedStatus();
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
@@ -1941,10 +1934,6 @@
|
|
|
return this.$message.warning('该任务单已被拒绝');
|
|
return this.$message.warning('该任务单已被拒绝');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (!(await this.validateFirstArticlePickFeedBeforeInspection())) {
|
|
|
|
|
- return;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
this.selfRequest(this.taskData);
|
|
this.selfRequest(this.taskData);
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|