From afc1565a0993b05b856fc3719554ae34fd55cdf7 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 27 Mar 2019 16:15:49 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Inventory/StockInquiry.js | 28 +-- src/views/Inventory/StockInquiry/index.vue | 239 +++++++++++++++++++++ 2 files changed, 254 insertions(+), 13 deletions(-) diff --git a/src/api/Inventory/StockInquiry.js b/src/api/Inventory/StockInquiry.js index 2104299f..70438de1 100644 --- a/src/api/Inventory/StockInquiry.js +++ b/src/api/Inventory/StockInquiry.js @@ -1,18 +1,7 @@ import request from '@/utils/request' -// 初始化项目 -export function initProject() { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: 'PDM_项目名称_查询数据_按时间排序' - } - }) -} // 机床查询 -export function searchmachine(check, num) { +export function getMachines(check, num) { return request({ url: '', method: 'post', @@ -24,7 +13,7 @@ export function searchmachine(check, num) { }) } // 分组查询 -export function searchTeam(machineNumber) { +export function getGroups(machineNumber) { return request({ url: '', method: 'post', @@ -35,3 +24,16 @@ export function searchTeam(machineNumber) { } }) } +// 主表查询 +export function getTable(num1, num2, num3, num4, num5, num6, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_库存管理_基本件库存查询', + param: '机床流水号_check=' + num1 + '&机床流水号=' + num2 + '&组件流水号_check=' + num3 + '&组件流水号=' + num4 + '&零件图号_check=' + num5 + '&零件图号=' + num6, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue index e69de29b..20d9c1a8 100644 --- a/src/views/Inventory/StockInquiry/index.vue +++ b/src/views/Inventory/StockInquiry/index.vue @@ -0,0 +1,239 @@ + + + + From 199b7186d913a419a1689ed0669d38c44cdd8c52 Mon Sep 17 00:00:00 2001 From: caoxinyu Date: Wed, 27 Mar 2019 18:33:32 +0800 Subject: [PATCH 2/7] 11 --- .../ContractCapitalManagement/index.vue | 20 +++++++++---------- .../ContractInformationManagement/index.vue | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue index c2ee328e..e52faa5e 100644 --- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue +++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue @@ -71,17 +71,17 @@ {{ scope.row.付款方式 }} - + - + - + @@ -203,17 +203,17 @@ label="付款批次" type="index" width="150"/> - + - + - + @@ -309,7 +309,7 @@ - +
@@ -333,7 +333,7 @@ - +
@@ -348,10 +348,10 @@ - + - + diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue index 5cc03949..fe387b51 100644 --- a/src/views/MarketingCenter/ContractInformationManagement/index.vue +++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue @@ -213,7 +213,7 @@ - +
From 035b9bcd3147ba998d28c470e6824742c7b17307 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Thu, 28 Mar 2019 11:24:09 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=BB=9E=E8=B4=A7=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingCenter/BacklogGoodsAnalysis.js | 40 +++ src/icons/svg/BacklogGoodsAnalysis.svg | 1 + .../BacklogGoodsAnalysis/index.vue | 251 ++++++++++++++++++ .../CreateInquirySheet/index.vue | 76 +++++- 4 files changed, 354 insertions(+), 14 deletions(-) create mode 100644 src/api/PurchasingCenter/BacklogGoodsAnalysis.js create mode 100644 src/icons/svg/BacklogGoodsAnalysis.svg create mode 100644 src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue diff --git a/src/api/PurchasingCenter/BacklogGoodsAnalysis.js b/src/api/PurchasingCenter/BacklogGoodsAnalysis.js new file mode 100644 index 00000000..b0e934a8 --- /dev/null +++ b/src/api/PurchasingCenter/BacklogGoodsAnalysis.js @@ -0,0 +1,40 @@ +import request from '@/utils/request' + +// 查询库存量 +export function searchMaterialNum(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_物料与货位对照_查询数据', + param: `物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询滞货库存量 +export function searchBacklogNum(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_滞货物料与货位对照_查询数据', + param: `物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 转为滞货 +export function submitTurn(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_转为滞货', + param: `物料流水号=${params[0]}&转滞货数量=${params[1]}&物料与货位对照流水号=${params[2]}&货位流水号=${params[3]}` + } + }) +} diff --git a/src/icons/svg/BacklogGoodsAnalysis.svg b/src/icons/svg/BacklogGoodsAnalysis.svg new file mode 100644 index 00000000..7302de17 --- /dev/null +++ b/src/icons/svg/BacklogGoodsAnalysis.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue new file mode 100644 index 00000000..30f456fc --- /dev/null +++ b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue @@ -0,0 +1,251 @@ + + + + + diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index 5ffdedab..d7e11703 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -36,7 +36,7 @@ 物料变更 - + - - - + + + + + - - - - + + + + - + + + + + + + + + + + + + @@ -656,7 +685,10 @@ export default { standardAndPurchaseValue: '', // 标准件和外购件流水号 title2: '', orderExport: '', - supplierExport: '' + supplierExport: '', + useNumber: '', + maxUseNumber: '', + dialogVisible4: false } }, computed: { @@ -672,6 +704,22 @@ export default { this.searchTable2() // 查表2 }, methods: { + submitUseInventory() { + this.$confirm('该操作不可逆，确定使用滞货?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.dialogVisible4 = false + }).catch(() => { + this.$message.info('已取消操作') + }) + }, + useInventory(row) { // 使用滞货 + console.log(row) + this.maxUseNumber = Number(row.滞货数量) + this.dialogVisible4 = true + }, saveOrder() { // 保存询价单 const orderNumGroup = [] const numGroup = [] From 40e88b96cd399437c769d97b9bbfe1fef81e5020 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Thu, 28 Mar 2019 16:38:37 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=BB=9E=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingCenter/CreateInquirySheet.js | 20 ++++- .../CreateInquirySheet/index.vue | 90 ++++++++++--------- .../PurchaseTaskAllocate/index.vue | 20 +++++ 3 files changed, 86 insertions(+), 44 deletions(-) diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js index f1c797f6..c2261111 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/api/PurchasingCenter/CreateInquirySheet.js @@ -1,27 +1,27 @@ import request from '@/utils/request' // 查询分配后的标准件和外购件 -export function searchMaterial(pageCurrent, pageSize, check1, num1, check2, num2, person) { +export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, person) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_采购部采购_查询物料_分配后', - param: `询价状态编号_check=${check1}&询价状态编号=${num1}&物料名称_check=${check2}&物料名称=${num2}&人员编号=${person}`, + param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&人员编号=${person}`, Pagination: pageCurrent + '&' + pageSize } }) } // 查询分配后的基本件 -export function searchPart(pageCurrent, pageSize, check1, num1, person) { +export function searchPart(pageCurrent, pageSize, num1, person) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_采购部采购_查询物料_基本件_分配后', - param: `询价状态编号_check=${check1}&询价状态编号=${num1}&人员编号=${person}`, + param: `物料状态编号=${num1}&人员编号=${person}`, Pagination: pageCurrent + '&' + pageSize } }) @@ -183,3 +183,15 @@ export function saveOrder(num1, num2, num3) { } }) } +// 编辑询价单 +export function submitUseInventory(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_使用滞货', + param: `物料流水号=${params[0]}&使用滞货数量=${params[1]}&组件零件流水号=${params[2]}` + } + }) +} diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index d7e11703..695f6d66 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -4,13 +4,7 @@ 询价状态: - - - + 物料名称: @@ -140,13 +134,7 @@ 询价状态: - - - + - + - + @@ -593,7 +581,7 @@