diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index d74da78e9..f2c2f7c08 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -1446,6 +1446,7 @@ export const InspectRequest = [ type: "name", width: orderWidth }, + { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "操作员", prop: "worker" }, { label: "采购订单号", prop: "poNumber",width: orderWidth }, @@ -1461,7 +1462,6 @@ export const InspectRequest = [ { label: "仓库", prop: 'warehouseCode' }, { label: "要货计划单号", prop: 'rpNumber' }, { label: "事务ID", prop: "tenantId" }, - { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" }, { label: "上游任务编号", prop: 'upStreamJobNumber' }, { label: "任务类型", prop: 'jobType' }, { label: "优先级", prop: 'priority' }, diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue index 9f873d739..2c35bf1aa 100644 --- a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue +++ b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue @@ -438,15 +438,16 @@ export default { id: null, inspectReport: null, lastModificationTime: null, + sampleQty: 0, // 要求检验数量 filesList:[], formFile: [], - details: [] + details: [], // inspectUserEmail: null, // supplierPackQty: 0, // tenantId: null, // inspectUserName: null, // receiveUom: null, - // sampleQty: 0, // 要求检验数量 + // goodQty: 0, // supplierPackUom: null, // inspectUserPhone: null, @@ -619,6 +620,7 @@ export default { id: null, inspectReport: null, lastModificationTime: null, + sampleQty: 0, // 要求检验数量 filesList:[], formFile: [], details: [] @@ -627,7 +629,6 @@ export default { // tenantId: null, // inspectUserName: null, // receiveUom: null, - // sampleQty: 0, // 要求检验数量 // goodQty: 0, // supplierPackUom: null, // inspectUserPhone: null, @@ -654,12 +655,14 @@ export default { getListByItemcode({itemCode: row.itemCode}, 'basedata/AQL').then(res => { for(var i=0;i= res[i].floorQty && this.inspectNoticeDetailsFormData.receiveQty <= res[i].ceilingQty) { this.inspectNoticeDetailsFormData.sampleQty = res[i].sampleQty break } } } + console.log('2222',this.inspectNoticeDetailsFormData.sampleQty) if (this.inspectNoticeDetailsFormData.sampleQty == 0) { this.$alert('没有找到当前物品代码对应的质检标准!') // this.$confirm('没有找到当前物品代码对应的质检标准!, 是否继续?', '提示', {