diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js index f32536c..29e4fb8 100644 --- a/src/api/qc/qc.js +++ b/src/api/qc/qc.js @@ -28,6 +28,7 @@ export const templateSave = data => createAPI(`/pms/qc/templateSave`,'post',data export const templateUpdate = data => createAPI(`/pms/qc/templateUpdate`,'post',data) export const templateDelete = data => createAPI(`/pms/qc/templateDelete`,'post',data) export const inspectionTypeSearch = data => createAPI(`/pms/qc/inspectionTypeSearch`,'post',data) +export const itemTypeSearch = data => createAPI(`/pms/qc/itemTypeSearch`,'post',data) export const objectSearch = data => createAPI(`/pms/qc/objectSearch`,'post',data) export const templateDetailsSearch = data => createAPI(`/pms/qc/templateDetailsSearch`,'post',data) export const addItemDetails = data => createAPI(`/pms/qc/addItemDetails`,'post',data) diff --git a/src/views/modules/qc/FQASResultEntry.vue b/src/views/modules/qc/FQASResultEntry.vue index af738cd..6e5cb54 100644 --- a/src/views/modules/qc/FQASResultEntry.vue +++ b/src/views/modules/qc/FQASResultEntry.vue @@ -43,20 +43,27 @@ - + - + - + - + - + + + 关联单号6 + + + + + @@ -258,9 +265,12 @@ - 责任人 - 责任人 - + 责任人(供应商) + 责任人(供应商) + + + + 明细导入 @@ -739,6 +749,7 @@ orderRef3: '', orderRef4: '', orderRef5: '', + orderRef6: '', }, pageIndex: 1, pageSize: 20, @@ -1098,6 +1109,24 @@ fixed: '', columnWidth: 130, }, + { + userId: this.$store.state.user.name, + functionId: 301016, + serialNumber: '301016Table1OrderRef6', + tableId: "301016Table1", + tableName: "FQAS检验记录表", + columnProp: 'orderRef6', + headerAlign: "center", + align: "center", + columnLabel: '关联单号6', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 130, + }, { userId: this.$store.state.user.name, functionId: 301016, @@ -2252,6 +2281,14 @@ conSql = " and bu_no = '" + this.changeData.buNo + "'" this.$refs.baseList.init(val, strVal, conSql) } + if (val === 509) { + strVal = this.detailData.responsiblePerson + this.$refs.baseList.init(val, strVal) + } + if (val === 24) { + strVal = this.searchData.orderRef6 + this.$refs.baseList.init(val, strVal) + } }) }, @@ -2273,6 +2310,12 @@ this.changeData.samplingLevelNo = val.sampling_level_no this.changeData.samplingLevelDesc = val.sampling_level_desc } + if (this.tagNo === 509) { + this.detailData.responsiblePerson = val.SupplierID + } + if (this.tagNo === 24) { + this.searchData.orderRef6 = val.WorkCenterNo + } }, // 获取主信息数据列表 diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index e4a97d6..a32cbb6 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -208,7 +208,7 @@ 派工单号 - + 派工单号 @@ -231,13 +231,13 @@ - + 机台 - - - - + + + + @@ -283,7 +283,7 @@ 检验模板 检验模板 - + @@ -298,7 +298,7 @@ - 保存 + 保存 关闭 @@ -375,9 +375,12 @@ - 责任人 - 责任人 - + 责任人(供应商) + 责任人(供应商) + + + + 工作文件 @@ -2113,7 +2116,7 @@ { columnProp: 'partNo', headerAlign: "center", - align: "center", + align: "left", columnLabel: '物料编码', columnHidden: false, columnImage: false, @@ -2121,11 +2124,12 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 120, }, { columnProp: 'partDesc', headerAlign: "center", - align: "center", + align: "left", columnLabel: '物料名称', columnHidden: false, columnImage: false, @@ -2133,6 +2137,7 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 300, }, ], checked: false, @@ -2221,6 +2226,7 @@ inspectionTypeNo: '' }, currentRow: {}, + saveLoading: false } }, @@ -2852,6 +2858,10 @@ strVal = this.modalData.resourceDesc this.$refs.baseList.init(val, strVal) } + if (val === 509) { + strVal = this.detailData.responsiblePerson + this.$refs.baseList.init(val, strVal) + } // if (val === 206) { // strVal = this.modalData.partNo // this.$refs.baseList.init(val, strVal) @@ -2870,8 +2880,11 @@ //this.getPartList() } if (this.tagNo === 505) { - this.modalData.resourceId = val.resource_id - this.modalData.resourceDesc = val.resource_desc + this.modalData.resourceId = val.ResourceID + this.modalData.resourceDesc = val.ResourceDesc + } + if (this.tagNo === 509) { + this.detailData.responsiblePerson = val.SupplierID } // if (this.tagNo === 206) { // this.modalData.partNo = val.part_no @@ -3065,6 +3078,7 @@ this.modalData.qtyrequired = row.qtyrequired this.modalData.rollQty = row.qtyrequired this.modalData.sjzs = row.sjzs + this.modalData.umId = row.umId this.getOperationList() this.seqDetailFlag = false }, @@ -3186,6 +3200,7 @@ this.$message.warning('请选择检验模板！') return } + this.saveLoading = true if(this.modalData.flag === '1'){ saveOsInspection(this.modalData).then(({data}) => { if (data && data.code === 0) { @@ -3205,6 +3220,9 @@ confirmButtonText: '确定' }) } + this.saveLoading = false + }).catch(()=>{ + this.saveLoading = false }) } }, diff --git a/src/views/modules/qc/OQCResultEntry.vue b/src/views/modules/qc/OQCResultEntry.vue index 9e31854..7e6c375 100644 --- a/src/views/modules/qc/OQCResultEntry.vue +++ b/src/views/modules/qc/OQCResultEntry.vue @@ -258,9 +258,12 @@ - 责任人 - 责任人 - + 责任人(供应商) + 责任人(供应商) + + + + 明细导入 @@ -2252,6 +2255,10 @@ conSql = " and bu_no = '" + this.changeData.buNo + "'" this.$refs.baseList.init(val, strVal, conSql) } + if (val === 509) { + strVal = this.detailData.responsiblePerson + this.$refs.baseList.init(val, strVal) + } }) }, @@ -2273,6 +2280,9 @@ this.changeData.samplingLevelNo = val.sampling_level_no this.changeData.samplingLevelDesc = val.sampling_level_desc } + if (this.tagNo === 509) { + this.detailData.responsiblePerson = val.SupplierID + } }, // 获取主信息数据列表 diff --git a/src/views/modules/qc/qcItem.vue b/src/views/modules/qc/qcItem.vue index ad2a116..5cb7ae5 100644 --- a/src/views/modules/qc/qcItem.vue +++ b/src/views/modules/qc/qcItem.vue @@ -85,7 +85,7 @@ fixed="right" header-align="center" align="center" - width="160" + width="120" label="操作">