diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/api/WorkshopProcurement/NewArrivalList.js index ffe6a4f2..cfca577d 100644 --- a/src/api/WorkshopProcurement/NewArrivalList.js +++ b/src/api/WorkshopProcurement/NewArrivalList.js @@ -38,38 +38,38 @@ export function searchLxPurchaseOrder(pageCurrent, pageSize, check1, num, check2 }) } // 查询采购计划明细 -export function searchMateriel(num, check, num1) { +export function searchMateriel(num) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_采购计划明细_查询数据_未选入', - param: `采购计划流水号=${num}&零件图号_check=${check}&零件图号=${num1}` + param: `供应商=${num}` } }) } // 查询离线采购计划明细 -export function searchLxMateriel(num, check, num1) { +export function searchLxMateriel(num) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_离线采购计划明细_查询数据_未选入', - param: `离线采购计划流水号=${num}&零件图号_check=${check}&零件图号=${num1}` + param: `供应商流水号=${num}` } }) } // 查询到货单 -export function searchArriveOrder(num8, num9, num2, num3, num5, num6, num7, pageCurrent, pageSize) { +export function searchArriveOrder(num8, num9, num6, num7, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_到货单查询_新', - param: `供应商流水号_check=${num8}&供应商流水号=${num9}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}&是否关联_check=${num6}&是否关联=${num7}`, + param: `供应商流水号_check=${num8}&供应商流水号=${num9}&是否关联_check=${num6}&是否关联=${num7}`, Pagination: pageCurrent + '&' + pageSize } }) @@ -87,14 +87,14 @@ export function addPurchaseOrder(num5, num6, num7) { }) } // 编辑采购单 -export function editPurchaseOrder(num5, num6, num7, num8) { +export function editPurchaseOrder(num5, num6, num8) { return request({ url: '', method: 'post', data: { type: '2', name: '备料管理_编辑到货单', - param: `备注=${num5}&到货单流水号=${num6}&供应商流水号=${num7}}&日期=${num8}` + param: `备注=${num5}&到货单流水号=${num6}&日期=${num8}` } }) } @@ -144,14 +144,14 @@ export function EditArrivalOrderMX(num, num2, num3, num4, num5) { } }) } -export function AddArrivalOrderMX(num, num1, num2, num3, num4, num5) { +export function AddArrivalOrderMX(num, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, id) { return request({ url: '', method: 'post', data: { type: '2', name: '备料管理_新增到货单明细', - param: `到货单流水号=${num}&材料=${num1}&数量=${num2}&单位=${num3}&单价=${num4}&金额=${num5}` + param: `到货单流水号=${num}&材料=${num1}&数量=${num2}&单位=${num3}&单价=${num4}&金额=${num5}&工艺计划流水号组=${num6}&采购计划明细流水号组=${num7}&本次到货数量组=${num8}&离线采购计划明细流水号组=${num9}&到货重量组=${num10}&到货金额组=${num11}&考勤编号=${id}` } }) } @@ -168,14 +168,14 @@ export function deleteMateriel(num1, num2, num3) { }) } // 关联材料 -export function addMateriel(num1, num2, num3, num4, num5, id) { +export function addMateriel(num1, num2, num3, num4, num5, num6, num7, id) { return request({ url: '', method: 'post', data: { type: '2', name: '备料管理_到货单明细关联', - param: `到货单明细流水号=${num1}&工艺计划流水号组=${num2}&采购计划明细流水号组=${num3}&本次到货数量组=${num4}&离线采购计划明细流水号组=${num5}&考勤编号=${id}` + param: `到货单明细流水号=${num1}&工艺计划流水号组=${num2}&采购计划明细流水号组=${num3}&本次到货数量组=${num4}&离线采购计划明细流水号组=${num5}&到货重量组=${num6}&到货金额组=${num7}&考勤编号=${id}` } }) } diff --git a/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js b/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js index 2b27a0fd..2fc72e8a 100644 --- a/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js +++ b/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js @@ -26,14 +26,14 @@ export function searchInvoiceDetail(num) { }) } // 发票增加 -export function addInvoice(time1, money, send, remark, num3) { +export function addInvoice(time1, money, send, remark, num3, num4) { return request({ url: '', method: 'post', data: { type: '2', name: '备料管理_发票_增加数据', - param: `开票时间=${time1}&开票金额=${money}&发票号=${send}&备注=${remark}&供应商=${num3}` + param: `开票时间=${time1}&开票金额=${money}&发票号=${send}&备注=${remark}&供应商=${num3}&到货单流水号组=${num4}` } }) } diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue index 1d82de05..3e89344a 100644 --- a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue +++ b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue @@ -67,22 +67,22 @@ @@ -101,7 +101,7 @@ @@ -111,7 +111,7 @@ @@ -121,7 +121,7 @@ diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue index 2fedc6e8..8e0826f4 100644 --- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue +++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue @@ -1,32 +1,7 @@