From f86a745aaddd1c427a10d3369d99d1c82825161f Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Mon, 30 Sep 2019 17:23:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E4=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/WorkshopProcurement/NewArrivalList.js | 88 +++- .../NewArrivalList/index.vue | 497 ++++++++++++++++-- 2 files changed, 532 insertions(+), 53 deletions(-) diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/api/WorkshopProcurement/NewArrivalList.js index 8822f92e..85e039b5 100644 --- a/src/api/WorkshopProcurement/NewArrivalList.js +++ b/src/api/WorkshopProcurement/NewArrivalList.js @@ -1,27 +1,99 @@ import request from '@/utils/request' -// 查询原材料库存 -export function searchRawMaterial(num, pageCurrent, pageSize) { +// 查询采购单 +export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name) { return request({ url: '', method: 'post', data: { type: '1', - name: '库存管理_原材料库存管理_查询', - param: '原材料名称=' + num, + name: '备料管理_采购计划_查询数据_到货', + param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}`, Pagination: pageCurrent + '&' + pageSize } }) } -// 保存重量和备注 -export function saveWeight(num1, num2, num3, num4) { +// 查询采购计划明细 +export function searchMateriel(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_采购计划明细_查询数据_未选入', + param: `采购计划流水号=${num}` + } + }) +} +// 查询到货单 +export function searchArriveOrder(pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_到货单查询', + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 新增到货单 +export function addPurchaseOrder(num1, num2, num3, num4, num5) { return request({ url: '', method: 'post', data: { type: '2', - name: '备料管理_采购计划明细_保存重量和备注', - param: `采购计划明细流水号=${num1}&重量=${num2}&备注=${num3}&单价=${num4}` + name: '备料管理_新增到货单', + param: `材料=${num1}&单位=${num2}&数量=${num3}&金额=${num4}&备注=${num5}` + } + }) +} +// 编辑采购单 +export function editPurchaseOrder(num1, num2, num3, num4, num5, num6) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_编辑到货单', + param: `材料=${num1}&单位=${num2}&数量=${num3}&金额=${num4}&备注=${num5}&到货单流水号=${num6}` + } + }) +} +// 删除采购单 +export function deletePurchaseOrder(PurchaseOrderNameValue) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_删除到货单', + param: `到货单流水号=${PurchaseOrderNameValue}` + } + }) +} +// 查询采购计划明细 +export function searchTable5(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_到货单明细查询', + param: `到货单流水号=${num}` + } + }) +} +// 选入 +export function addMateriel(num1, num2, num3) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_到货单明细_选入', + param: `到货单流水号=${num1}&工艺计划流水号组=${num2}&采购计划明细流水号组=${num3}` } }) } diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue index 6a3b3f80..5fe1a994 100644 --- a/src/views/WorkshopProcurement/NewArrivalList/index.vue +++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue @@ -1,58 +1,465 @@