From 3018250561a4b626e1a7cf39e652b4e53d01ea9c Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 16 Oct 2024 13:58:09 +0800 Subject: [PATCH] =?UTF-8?q?2024-10-16=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/qc/DoInspectionBySeqNo.vue | 212 ++++++++++++++++--- src/views/modules/qc/IPQCResultEntry.vue | 129 +++++++++-- 2 files changed, 298 insertions(+), 43 deletions(-) diff --git a/src/views/modules/qc/DoInspectionBySeqNo.vue b/src/views/modules/qc/DoInspectionBySeqNo.vue index 60567ce..2e62509 100644 --- a/src/views/modules/qc/DoInspectionBySeqNo.vue +++ b/src/views/modules/qc/DoInspectionBySeqNo.vue @@ -16,31 +16,45 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + - 包含已取消工单 + 显示超出派工数量单据 - - + + - - + + + + + + + + - + + 查询 @@ -147,7 +161,7 @@ - + @@ -155,10 +169,10 @@ - + - + + + 重点检验 + @@ -175,7 +192,7 @@ - + @@ -266,10 +283,13 @@ partNo: '', partDesc: '', operationDesc: '', - qtyrequired: '', - lotsize: '', status: '', cancelFlag: '', + startDate: new Date(), + endDate: new Date(), + workCenterNo: '', + operatorName: '', + departmentID: '', page: 1, limit: 10 }, @@ -281,6 +301,7 @@ modalFlag: false, modalDisableFlag: false, modalData: { + flag: '', site: '', bu: '', inspectionNo:'', @@ -308,7 +329,9 @@ umId: '', umName: '', sjzs: '', - boxNo: '' + boxNo: '', + createBy: '', + importantFlag: '' }, rules: { seqNoType: [ @@ -426,7 +449,7 @@ columnSortable: false, sortLv: 0, status: true, - columnWidth: 170, + columnWidth: 150, }, { userId: this.$store.state.user.name, @@ -464,6 +487,96 @@ status: true, columnWidth: 300, }, + { + userId: this.$store.state.user.name, + functionId: 3010005001, + serialNumber: '3010005001Table1DepartmentID', + tableId: "3010005001Table1", + tableName: "派工单号表", + fixed: '', + columnProp: 'departmentID', + headerAlign: "center", + align: "left", + columnLabel: '车间编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + columnWidth: 100, + }, + { + userId: this.$store.state.user.name, + functionId: 3010005001, + serialNumber: '3010005001Table1DepartmentName', + tableId: "3010005001Table1", + tableName: "派工单号表", + fixed: '', + columnProp: 'departmentName', + headerAlign: "center", + align: "left", + columnLabel: '车间名称', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + columnWidth: 150, + }, + { + userId: this.$store.state.user.name, + functionId: 3010005001, + serialNumber: '3010005001Table1WorkCenterNo', + tableId: "3010005001Table1", + tableName: "派工单号表", + fixed: '', + columnProp: 'workCenterNo', + headerAlign: "center", + align: "left", + columnLabel: '加工中心编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + columnWidth: 100, + }, + { + userId: this.$store.state.user.name, + functionId: 3010005001, + serialNumber: '3010005001Table1WorkCenterDesc', + tableId: "3010005001Table1", + tableName: "派工单号表", + fixed: '', + columnProp: 'workCenterDesc', + headerAlign: "center", + align: "left", + columnLabel: '加工中心名称', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + columnWidth: 150, + }, + { + userId: this.$store.state.user.name, + functionId: 3010005001, + serialNumber: '3010005001Table1OperationDesc', + tableId: "3010005001Table1", + tableName: "派工单号表", + fixed: '', + columnProp: 'operationDesc', + headerAlign: "center", + align: "center", + columnLabel: '工序', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + columnWidth: 100, + }, { userId: this.$store.state.user.name, functionId: 3010005001, @@ -503,21 +616,57 @@ { userId: this.$store.state.user.name, functionId: 3010005001, - serialNumber: '3010005001Table1OperationDesc', + serialNumber: '3010005001Table1RollQty', tableId: "3010005001Table1", tableName: "派工单号表", fixed: '', - columnProp: 'operationDesc', + columnProp: 'rollQty', headerAlign: "center", - align: "center", - columnLabel: '工序', + align: "right", + columnLabel: '送检数量', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, columnWidth: 100, - } + }, + { + userId: this.$store.state.user.name, + functionId: 3010005001, + serialNumber: '3010005001Table1ScheduledDate', + tableId: "3010005001Table1", + tableName: "派工单号表", + fixed: '', + columnProp: 'scheduledDate', + headerAlign: "center", + align: "center", + columnLabel: '派工日期', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + columnWidth: 150, + }, + { + userId: this.$store.state.user.name, + functionId: 3010005001, + serialNumber: '3010005001Table1OperatorName', + tableId: "3010005001Table1", + tableName: "派工单号表", + fixed: '', + columnProp: 'operatorName', + headerAlign: "center", + align: "left", + columnLabel: '派工单创建人', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + columnWidth: 150, + }, ], templateDetailList: [ { @@ -691,6 +840,7 @@ // 生成检验任务 doInspectionModal (row) { this.modalData = { + flag: 'doInspection', site: row.site, bu: this.userBuList[0].buNo, inspectionNo: '', @@ -704,7 +854,7 @@ operationDesc: row.operationDesc, resourceId: row.resourceId, resourceDesc: row.resourceDesc, - rollQty: row.qtyrequired, + rollQty: row.qtyrequired - row.rollQty > 0 ? row.qtyrequired - row.rollQty : 0, seqNo: row.seqNo, spec: row.spec, specialRequirements: '', @@ -716,6 +866,8 @@ umId: row.umId, sjzs: row.sjzs, boxNo: '', + createBy: this.$store.state.user.name, + importantFlag: '' } this.getOperationList() this.modalDisableFlag = false @@ -897,7 +1049,7 @@ async createExportData() { this.searchData.limit = -1 this.searchData.page = 1 - await searchSeqInfo(this.searchData).then(({data}) => { + await searchSeqInfo2(this.searchData).then(({data}) => { this.exportList= data.rows }) return this.exportList diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index 86f17bf..00516ea 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -74,15 +74,18 @@ + + + - + - - + - + - - + 查询 @@ -132,7 +135,7 @@ label="状态"> @@ -262,7 +265,7 @@ - + @@ -270,10 +273,10 @@ - + - + + + 重点检验 + @@ -290,7 +296,7 @@ - + @@ -921,7 +927,7 @@ Chooselist, qcFAIUploadFile, comQcItemImageUploadFile, - subDetailUpload + subDetailUpload, }, computed: { templateTableData () { @@ -1009,6 +1015,7 @@ limit: 10, seqNo: '', states: ['未开始','待检验'], + createBy: '' }, pageIndex: 1, pageSize: 20, @@ -1052,7 +1059,9 @@ umId: '', umName: '', sjzs: '', - boxNo: '' + boxNo: '', + createBy: '', + importantFlag: '' }, // 展示列集 columnList1: [ @@ -1182,6 +1191,24 @@ fixed: '', columnWidth: 170, }, + { + userId: this.$store.state.user.name, + functionId: 301014, + serialNumber: '301014Table1CreateBy', + tableId: "301014Table1", + tableName: "IPQC检验记录表", + columnProp: 'createBy', + headerAlign: "center", + align: "left", + columnLabel: '送检人员', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100, + }, { userId: this.$store.state.user.name, functionId: 301014, @@ -1236,6 +1263,78 @@ fixed: '', columnWidth: 150, }, + { + userId: this.$store.state.user.name, + functionId: 301014, + serialNumber: '301014Table1DepartmentID', + tableId: "301014Table1", + tableName: "IPQC检验记录表", + columnProp: 'departmentID', + headerAlign: "center", + align: "left", + columnLabel: '车间编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100, + }, + { + userId: this.$store.state.user.name, + functionId: 301014, + serialNumber: '301014Table1DepartmentName', + tableId: "301014Table1", + tableName: "IPQC检验记录表", + columnProp: 'departmentName', + headerAlign: "center", + align: "left", + columnLabel: '车间名称', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 150, + }, + { + userId: this.$store.state.user.name, + functionId: 301014, + serialNumber: '301014Table1WorkCenterNo', + tableId: "301014Table1", + tableName: "IPQC检验记录表", + fixed: '', + columnProp: 'workCenterNo', + headerAlign: "center", + align: "left", + columnLabel: '加工中心编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + columnWidth: 100, + }, + { + userId: this.$store.state.user.name, + functionId: 301014, + serialNumber: '301014Table1WorkCenterDesc', + tableId: "301014Table1", + tableName: "IPQC检验记录表", + fixed: '', + columnProp: 'workCenterDesc', + headerAlign: "center", + align: "left", + columnLabel: '加工中心名称', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + columnWidth: 150, + }, { userId: this.$store.state.user.name, functionId: 301014, @@ -3077,7 +3176,9 @@ umId: this.umList[0].umId, umName: this.umList[0].umName, sjzs: '', - boxNo: '' + boxNo: '', + createBy: this.$store.state.user.name, + importantFlag: '' } this.operationList = [] this.resourceList = [] @@ -3191,7 +3292,9 @@ rollNo: '', umId: this.umList[0].umId, umName: this.umList[0].umName, - boxNo: '' + boxNo: '', + createBy: this.$store.state.user.name, + importantFlag: '' } // 获取选中框 let obj = document.getElementsByName('specialTask')