From 866971dc4af3cb47b5391d90af86050a41d9f22b Mon Sep 17 00:00:00 2001 From: bryan sun Date: Tue, 24 Dec 2019 10:52:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=87=AA=E5=88=B6=E4=BB=B6=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E4=B8=8D=E9=9C=80=E8=A6=81=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SelfMadePartsWarehouseOut/index.vue | 81 ++++++++++--------- .../ProcessingStatusNew/index.vue | 4 +- 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue index 3f16611e..bd25eb53 100644 --- a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue +++ b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue @@ -2,28 +2,28 @@
- - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + 查询 出库 @@ -89,7 +89,7 @@ - + - - - + + +
取消 @@ -237,20 +237,21 @@ export default { }, CHUKU() { console.log(this.form.name, 909090, this.form.leader) - if (Number(this.form.leader) === Number(this.form.name)) { - warehousing(this.multipleSelection, this.form.leader, this.remarks).then(response => { - if (response.data[0].result === '1') { - this.$message.success('出库成功') - this.dialogFormVisible = false - this.searchData() - } else { - this.$message.error('出库失败') - this.dialogFormVisible = false - } - }) - } else { - this.$message.error('人员编号错误') - } + // if (Number(this.form.leader) === Number(this.form.name)) { + warehousing(this.multipleSelection, this.form.name, this.remarks).then(response => { + if (response.data[0].result === '1') { + this.$message.success('出库成功') + this.dialogFormVisible = false + this.searchData() + } else { + this.$message.error('出库失败') + this.dialogFormVisible = false + } + }) + // } + // else { + // this.$message.error('人员编号错误') + // } }, handleSizeChange(val) { this.pageSize = val diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue index f533c4ac..2d7dea53 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue @@ -69,7 +69,7 @@ - + - + From e542e864a53280770e7607a7894ceed75dca659e Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 25 Dec 2019 11:50:12 +0800 Subject: [PATCH 2/4] qw --- src/utils/request.js | 2 +- src/views/ManufacturingCenter/ManHourAnalysis/index.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/utils/request.js b/src/utils/request.js index fc41e22d..2cb92ad8 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/ManufacturingCenter/ManHourAnalysis/index.vue b/src/views/ManufacturingCenter/ManHourAnalysis/index.vue index 6cd658d1..94c8f275 100644 --- a/src/views/ManufacturingCenter/ManHourAnalysis/index.vue +++ b/src/views/ManufacturingCenter/ManHourAnalysis/index.vue @@ -142,6 +142,7 @@ export default { this.search2() this.search4() this.search5() + this.search6() }, methods: { fetchData() { From 940589a13725e807d3d4b9ca7bc4578b16e53fff Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 25 Dec 2019 14:21:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=9B=BE=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4clearable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/TechnologyCenter/PartDrawingMaintenance/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue index 5a1db1b3..c84da4e1 100644 --- a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue +++ b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue @@ -2,7 +2,7 @@
项目名称 - + 机床图号 - + 组号 - + Date: Wed, 25 Dec 2019 14:43:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/DiscardedPartsInquiry.js | 2 +- src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/api/ManufacturingCenter/DiscardedPartsInquiry.js b/src/api/ManufacturingCenter/DiscardedPartsInquiry.js index 14ae7554..1dc278d1 100644 --- a/src/api/ManufacturingCenter/DiscardedPartsInquiry.js +++ b/src/api/ManufacturingCenter/DiscardedPartsInquiry.js @@ -41,7 +41,7 @@ export function searchTable(entryValue, machineValue, check2, GroupNumValue, che data: { type: '1', name: '车间生产管理工艺_传递后_零件报废补投_查询数据_综合查询', - param: '项目流水号_check=1&项目流水号=' + entryValue + '&机床流水号_check=1&机床流水号=' + machineValue + '&组件流水号_check=' + check2 + '&组件流水号=' + GroupNumValue + '&组件零件基本件流水号_check=0&工艺计划流水号_check=0&工艺计划流水号_补投前_check=0&零件图号_check=' + check3 + '&零件图号=' + PartDrawingNumber, + param: '项目流水号_check=0&项目流水号=' + entryValue + '&机床流水号_check=1&机床流水号=' + machineValue + '&组件流水号_check=' + check2 + '&组件流水号=' + GroupNumValue + '&组件零件基本件流水号_check=0&工艺计划流水号_check=0&工艺计划流水号_补投前_check=0&零件图号_check=' + check3 + '&零件图号=' + PartDrawingNumber, pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue index b28e0396..de58c121 100644 --- a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue +++ b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue @@ -21,7 +21,7 @@ 机床图号: - + { + console.log(response.data) this.tableData = response.data.rows this.total = response.data.total this.listLoading = false