From 35431f0d62636091cd050b5338a1d3bffabe1fc4 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Mon, 29 Jan 2024 11:24:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9D=A5=E6=96=99=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quality/income.js | 13 ++-- .../quality/qcIncome/checkProjectType.vue | 59 ++++++++++++++----- 2 files changed, 49 insertions(+), 23 deletions(-) diff --git a/src/api/quality/income.js b/src/api/quality/income.js index e23fa50..900404b 100644 --- a/src/api/quality/income.js +++ b/src/api/quality/income.js @@ -93,12 +93,13 @@ export function getCkeckProjectList(query) { } //合格不合格 -export function changeCheckDetailStatus(recordId, status,defectCode,remark) { +export function changeCheckDetailStatus(recordId, status,remark,defectCode,defectQuality) { const data = { recordId, status, + remark, defectCode, - remark + defectQuality } return request({ url: '/quality/qcIncome/changeCheckDetailStatus', @@ -121,13 +122,7 @@ export function commitActualValue(recordId, actualValues) { } //审核结果提交 -export function commitCheckResult(recordId,typeCode,checkType,orderNo) { - const data = { - recordId, - typeCode, - checkType, - orderNo - } +export function commitCheckResult(data) { return request({ url: '/quality/qcIncome/commitCheckResult', method: 'put', diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue index cc8747c..b067777 100644 --- a/src/views/quality/qcIncome/checkProjectType.vue +++ b/src/views/quality/qcIncome/checkProjectType.vue @@ -9,7 +9,7 @@ - + @@ -18,12 +18,12 @@ - + + + @@ -37,6 +37,23 @@ + + + + + + @@ -121,7 +137,7 @@ export default { total: 0, // BOM产品表格数据 itemList: null, - + qcCheckTaskDetails: [], //树名称 bomCode: undefined, defaultProps: { @@ -156,7 +172,7 @@ export default { methods: { getDefect(){ - getDefectList('defect_in').then(response => { + getDefectList('material').then(response => { this.defectList = response; }); }, @@ -207,10 +223,25 @@ export default { this.resetForm("queryForm"); this.handleQuery(); }, + getAllRowData() { + this.rowData = this.$refs.myTable.data; + }, //提交整体检测结果 submitBomForm() { - commitCheckResult(this.queryParams.belongTo,this.typeCode,this.checkType,this.orderNo).then(response => { + //获取待检验信息列表--点处理后获取检测项--提交 + this.getAllRowData(); + const data = { + recordId: this.data.recordId, + typeCode: this.typeCode, + checkType: this.checkType, + orderCode: this.orderNo, + workorderCodeSap: this.orderNo, + sampleQuality: this.data.sampleQuality, + incomeBatchNo: this.data.incomeBatchNo, + qcCheckTaskDetails: this.rowData, + } + commitCheckResult(data).then(response => { this.$modal.msgSuccess("检测完成"); this.$emit('saveCheck'); this.showFlag = false; @@ -223,16 +254,16 @@ export default { }, // 数据状态修改/Y合格N不合格 - handleStatusChange(row) { + /* handleStatusChange(row) { let text = row.status === "N" ? "不合格" : "合格"; this.$modal.confirm('确认' + '"' + row.projectNo + '"'+text+'吗？').then(function() { - return changeCheckDetailStatus(row.recordId, row.status, row.defectCode,row.remark); + return changeCheckDetailStatus(row.recordId, row.status, row.remark, row.defectCode, row.defectQuality); }).then(() => { this.$modal.msgSuccess(text + "操作成功"); }).catch(function() { row.status = row.status === "N" ? "Y" : "N"; }); - }, + }, */ //动态测量值 /** 检测结果钮操作 */ From 4c17ec66c70a20f63d1c4fdbd52ab4883ff53101 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Mon, 29 Jan 2024 15:30:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/quality/qcIncome/checkProjectType.vue | 4 +++- src/views/quality/qcIncome/index.vue | 1 + src/views/quality/qcInventory/index.vue | 1 + src/views/quality/qcWarehousing/index.vue | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue index b067777..e4cea86 100644 --- a/src/views/quality/qcIncome/checkProjectType.vue +++ b/src/views/quality/qcIncome/checkProjectType.vue @@ -121,6 +121,7 @@ import { getCkeckProjectList,changeCheckDetailStatus,commitActualValue,commitChe export default { name: "itemSelectUser", dicts: ["check_result","qc_rule_prop"], + props: ['defectType'], data() { return { viewStatus : '0', @@ -172,7 +173,8 @@ export default { methods: { getDefect(){ - getDefectList('material').then(response => { + console.log(this.defectType); + getDefectList(this.defectType).then(response => { this.defectList = response; }); }, diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue index 5e3171d..eb81334 100644 --- a/src/views/quality/qcIncome/index.vue +++ b/src/views/quality/qcIncome/index.vue @@ -355,6 +355,7 @@ diff --git a/src/views/quality/qcInventory/index.vue b/src/views/quality/qcInventory/index.vue index 97c5355..a48448c 100644 --- a/src/views/quality/qcInventory/index.vue +++ b/src/views/quality/qcInventory/index.vue @@ -325,6 +325,7 @@ diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue index 4b494f1..3d1865f 100644 --- a/src/views/quality/qcWarehousing/index.vue +++ b/src/views/quality/qcWarehousing/index.vue @@ -394,6 +394,7 @@ From 8a81c8221edcab339f38027fc6120a0525e88c4b Mon Sep 17 00:00:00 2001 From: shaoyong Date: Mon, 29 Jan 2024 17:56:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/quality/qcIncome/checkProjectType.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue index e4cea86..53f557a 100644 --- a/src/views/quality/qcIncome/checkProjectType.vue +++ b/src/views/quality/qcIncome/checkProjectType.vue @@ -226,7 +226,15 @@ export default { this.handleQuery(); }, getAllRowData() { - this.rowData = this.$refs.myTable.data; + const rowArray = this.$refs.myTable.data; + this.rowData = rowArray.map(obj => { + const found = this.defectList.find(subObj => subObj.defectCode === obj.defectCode); + if (found) { + return { ...obj, defectSubclass: found.defectSubclass }; + } else { + return obj; + } + }); }, //提交整体检测结果