From 59ec93bf3e6032272bee453e2f5d78910136775a Mon Sep 17 00:00:00 2001 From: chenjianan Date: Fri, 29 Mar 2019 18:32:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E7=94=A8=E6=BB=9E=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Inventory/PickingList.js | 27 +- .../PurchasingCenter/BacklogGoodsPrepare.js | 44 +++- .../PurchasingCenter/CreateInquirySheet.js | 2 +- src/views/Inventory/PickingList/index.vue | 61 ++++- .../BacklogGoodsPrepare/index.vue | 247 +++++++++++++++++- .../CreateInquirySheet/index.vue | 64 ++--- 6 files changed, 394 insertions(+), 51 deletions(-) diff --git a/src/api/Inventory/PickingList.js b/src/api/Inventory/PickingList.js index d9b753bc..d9516691 100644 --- a/src/api/Inventory/PickingList.js +++ b/src/api/Inventory/PickingList.js @@ -144,7 +144,32 @@ export function addListDetail(PickingListNumberx, projectnumber, machinenumber, data: { type: '2', name: '车间装配管理_领料单_领料单明细增加', - param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&采购合同明细流水号=' + data4 + '&请购单明细流水号=' + data5 + '&货位流水号=' + data6 + '&出库类型=' + data7 + '&物料与货位对照流水号=' + data8 + '&名称=' + data9 + '&物料规格=' + data10 + '&物料型号=' + data11 + '&零件图号=' + data12 + '&材料=' + data13 + param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注\\=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&采购合同明细流水号=' + data4 + '&请购单明细流水号=' + data5 + '&货位流水号=' + data6 + '&出库类型=' + data7 + '&物料与货位对照流水号=' + data8 + '&名称=' + data9 + '&物料规格\\=' + data10 + '&物料型号=' + data11 + '&零件图号=' + data12 + '&材料=' + data13 + } + }) +} +// 查询滞货件 +export function searchBacklogPart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_滞货件领料_查询数据', + param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 领料滞货件 +export function submitAddBacklogList(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_领料单明细_滞货件_增加数据', + param: `领料单流水号=${params[0]}&项目流水号=${params[1]}&机床流水号=${params[2]}&组件流水号=${params[3]}&出库数量=${params[4]}&备注\\=${params[5]}&货位流水号=${params[6]}&物料与货位对照流水号=${params[7]}&名称=${params[8]}&物料规格\\=${params[9]}&物料型号=${params[10]}` } }) } diff --git a/src/api/PurchasingCenter/BacklogGoodsPrepare.js b/src/api/PurchasingCenter/BacklogGoodsPrepare.js index 6dc21fe4..bdd1b2d2 100644 --- a/src/api/PurchasingCenter/BacklogGoodsPrepare.js +++ b/src/api/PurchasingCenter/BacklogGoodsPrepare.js @@ -1,13 +1,51 @@ import request from '@/utils/request' -// 初始化项目 -export function initProject() { +// 查询滞货使用记录 +export function searchBacklogUseRecord(pageCurrent, pageSize, status) { return request({ url: '', method: 'post', data: { type: '1', - name: 'PDM_项目名称_查询数据_按时间排序' + name: '采购管理_滞货使用记录_查询数据', + param: '关联状态=' + status, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询滞货使用记录 +export function searchBacklogLocation(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_滞货物料与货位_查询数据', + param: '物料流水号=' + num + } + }) +} +// 提交关联 +export function submitConnectBacklog(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_滞货物料关联_增加数据', + param: `滞货使用流水号=${params[0]}&物料与货位对照流水号组=${params[1]}&关联数量组=${params[2]}` + } + }) +} +// 查询滞货关联明细 +export function searchBacklogConnectDetail(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_滞货关联明细_查询数据', + param: '滞货使用流水号=' + num } }) } diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js index 874ed6f9..326bf49b 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/api/PurchasingCenter/CreateInquirySheet.js @@ -191,7 +191,7 @@ export function submitUseInventory(...params) { data: { type: '2', name: '采购管理_使用滞货', - param: `物料流水号=${params[0]}&使用滞货数量=${params[1]}&组件零件流水号=${params[2]}` + param: `物料流水号=${params[0]}&使用滞货数量=${params[1]}&组件零件流水号=${params[2]}&使用人编号=${params[3]}` } }) } diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue index cc80590e..0839966c 100644 --- a/src/views/Inventory/PickingList/index.vue +++ b/src/views/Inventory/PickingList/index.vue @@ -325,19 +325,17 @@ @@ -512,7 +510,7 @@ @@ -41,4 +277,7 @@ export default { span{ margin: 10px 0 10px 10px; } + .el-tag{ + margin: 0 + } diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index 78e6c59e..0c80fd9b 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -97,14 +97,14 @@ {{ Number(scope.row.使用滞货数量) }} - + @@ -573,10 +573,10 @@ - + 使用滞货数量: -
注意:若设置待询价物料全部使用滞货,则将不可再取消使用滞货
+
注意:确定后将不可取消使用滞货