From 1df919eab00c12620e5c2bf136a997e175e500b9 Mon Sep 17 00:00:00 2001 From: liulujia <759670076@qq.com> Date: Thu, 30 Apr 2020 17:04:27 +0800 Subject: [PATCH] =?UTF-8?q?430=E6=96=87=E6=A1=A3V1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/TechnologyCenter/QueryParts.js | 5 ++-- .../GroupMatching/index.vue | 2 +- .../OutsourcingPartsQuery/index.vue | 7 +++++- .../OutsourcingTaskExecution/index.vue | 6 +++-- .../OutsourcingTaskQuery/index.vue | 1 + .../TechnologyCenter/QueryParts/index.vue | 24 +++++++++++-------- 6 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/api/TechnologyCenter/QueryParts.js b/src/api/TechnologyCenter/QueryParts.js index a3ac8126..4b7fd395 100644 --- a/src/api/TechnologyCenter/QueryParts.js +++ b/src/api/TechnologyCenter/QueryParts.js @@ -68,7 +68,7 @@ export function searchModel(machine_check, machine, group_check, group) { } }) } -export function purchasePartsData(num, pageCurrent, pageSize) { +export function purchasePartsData(machine_check, machine, group_check, group, Model_check, ModelValue, pageSize, pageCurrent) { return request({ url: '', method: 'post', @@ -77,7 +77,8 @@ export function purchasePartsData(num, pageCurrent, pageSize) { ModularID: router.currentRoute.path, type: '1', name: 'PDM_零件明细表_标准件和外购件_查询数据', - param: `组件流水号=${num}`, + // param: `组件流水号=${num}`, + param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}&规格_check=${Model_check}&规格=${ModelValue}`, pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue index f9db6dbd..6c2b9262 100644 --- a/src/views/ManufacturingCenter/GroupMatching/index.vue +++ b/src/views/ManufacturingCenter/GroupMatching/index.vue @@ -252,7 +252,7 @@ diff --git a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue index 268059cb..607ccb49 100644 --- a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue +++ b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue @@ -78,7 +78,12 @@ + + + diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue index 1a6cce44..d2b6c4a1 100644 --- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue +++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue @@ -111,7 +111,7 @@ @@ -247,7 +247,8 @@ export default { ManufacturerName: [], // 厂家名称 rules: { 外协厂家: [{ required: true, message: '请选择外协厂家', trigger: 'change' }], - 运费: [{ required: true, message: '请输入运费', trigger: 'blur' }] + 运费: [{ required: true, message: '请输入运费', trigger: 'blur' }], + 到货日期: [{ required: true, message: '请输入日期', trigger: 'blur' }] }, code: 0, code1: 0, @@ -394,6 +395,7 @@ export default { 外协工序: response.data[i].外协工序 }) } + console.log(this.List3, 999) } this.loading = false }) diff --git a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue index 499fbff0..a58693e3 100644 --- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue +++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue @@ -220,6 +220,7 @@ export default { this.List3 = [] getParts(row.外协加工任务单流水号).then(response => { this.List3 = response.data + console.log(response.data, 111) this.loading = false }) }, diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue index d4e4b784..b944d92f 100644 --- a/src/views/TechnologyCenter/QueryParts/index.vue +++ b/src/views/TechnologyCenter/QueryParts/index.vue @@ -1,27 +1,28 @@