From 7199bf5f5da490e94da935bff25e0c10238be8fb Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sat, 15 Dec 2018 15:11:28 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A4=87=E6=96=99=E5=88=B0=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/MaterialArrivalManagement/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue index 4fe49653..f84900a2 100644 --- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue +++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue @@ -6,7 +6,7 @@ 查询 查询全部 - 到货 + 到货 From b0a1c347047ec307f339f3fdfcfa70058c26c33f Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sat, 15 Dec 2018 15:13:20 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A4=87=E6=96=99=E5=88=B0=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/MaterialArrivalManagement/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue index f84900a2..2321edd2 100644 --- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue +++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue @@ -5,7 +5,7 @@ 零件图号: 查询 - 查询全部 + 查询全部 到货 From 962dd49aa3b421ac67c0138c93e052e935e4f874 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sat, 15 Dec 2018 15:50:13 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=AE=9A=E9=A2=9D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue index 8a863728..1d2c2221 100644 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue @@ -605,6 +605,7 @@ export default { }, created() { this.fetchData() + this.searchData() }, methods: { fetchData() { @@ -617,7 +618,6 @@ export default { searchData() { this.loading = true search(this.pageCurrent, this.pageSize, this.PrNum).then(response => { - console.log(response.data) this.tableData = response.data.rows this.total = response.data.total this.loading = false From 7250957ce09e1b3b2870f222193643f35ced6dc0 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Sat, 15 Dec 2018 15:50:58 +0800 Subject: [PATCH 4/6] =?UTF-8?q?js=E5=8E=BB=E5=BA=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/PurchasingCenter/CreateInquirySheet.js | 11 ----------- src/api/PurchasingCenter/PurchaseContractSearch.js | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js index 5cd99a83..cb6176a7 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/api/PurchasingCenter/CreateInquirySheet.js @@ -1,16 +1,5 @@ import request from '@/utils/request' -// 初始化询价状态 -export function initInquiryState() { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '采购部采购_询价状态_查询' - } - }) -} // 查询分配后的标准件和外购件 export function searchMaterial(pageCurrent, pageSize, check1, num1, check2, num2, person) { return request({ diff --git a/src/api/PurchasingCenter/PurchaseContractSearch.js b/src/api/PurchasingCenter/PurchaseContractSearch.js index fed900b1..336f1362 100644 --- a/src/api/PurchasingCenter/PurchaseContractSearch.js +++ b/src/api/PurchasingCenter/PurchaseContractSearch.js @@ -60,14 +60,3 @@ export function searchTable2(num) { } }) } -export function submitApproval(num, num1, num2) { - return request({ - url: '', - method: 'post', - data: { - type: '2', - name: '采购管理_合同审批_修改数据', - param: '采购合同流水号=' + num + '&审批情况流水号=' + num1 + '&未通过原因=' + num2 - } - }) -} From 413f14314d9b908186fd0c45c58df4e924f4bc06 Mon Sep 17 00:00:00 2001 From: lixin Date: Sat, 15 Dec 2018 18:00:57 +0800 Subject: [PATCH 5/6] lx --- src/api/BasicData/ShiftManagement.js | 13 +- src/api/Inventory/PartsReplacement.js | 36 ++ src/views/BasicData/ShiftManagement/index.vue | 481 ++++++++++++------ .../Inventory/PartsReplacement/index.vue | 234 ++++++--- src/views/Inventory/PickingList/index.vue | 4 + 5 files changed, 534 insertions(+), 234 deletions(-) diff --git a/src/api/BasicData/ShiftManagement.js b/src/api/BasicData/ShiftManagement.js index 57d9a7b5..033f7c59 100644 --- a/src/api/BasicData/ShiftManagement.js +++ b/src/api/BasicData/ShiftManagement.js @@ -19,7 +19,7 @@ export function searchProgramme() { method: 'post', data: { type: '1', - name: 'dbo.设备管理_基础表_班次表_查询数据' + name: '设备管理_基础表_班次表_查询班次' } }) } @@ -60,4 +60,15 @@ export function deleteShift(shiftCode) { } }) } +// 删除班次 +export function addShiftType() { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '设备管理_基础表_班次表_班次类型与工作时间_增加' + } + }) +} diff --git a/src/api/Inventory/PartsReplacement.js b/src/api/Inventory/PartsReplacement.js index 2fe2da7a..6febb2ff 100644 --- a/src/api/Inventory/PartsReplacement.js +++ b/src/api/Inventory/PartsReplacement.js @@ -61,3 +61,39 @@ export function searchErrorRecord(pageCurrent, pageSize, project_check, project, } }) } +// 补投查询 +export function searchReplacementCard(card_check, card) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_补投单_补投单查询', + param: '补投单编号_check=' + card_check + '&补投单编号=' + card + } + }) +} +// 补投增加 +export function addReplacementCard(Number) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_补投单_补投单增加', + param: '人员编号=' + Number + } + }) +} +// 补投删除 +export function deleteReplacementCard(Number) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_补投单_补投单删除', + param: '补投单流水号=' + Number + } + }) +} diff --git a/src/views/BasicData/ShiftManagement/index.vue b/src/views/BasicData/ShiftManagement/index.vue index c700b608..4c6f53d8 100644 --- a/src/views/BasicData/ShiftManagement/index.vue +++ b/src/views/BasicData/ShiftManagement/index.vue @@ -1,126 +1,179 @@