diff --git a/src/api/ManufacturingCenter/CreatePreparationBill.js b/src/api/ManufacturingCenter/CreatePreparationBill.js index 56b61613..d27a4851 100644 --- a/src/api/ManufacturingCenter/CreatePreparationBill.js +++ b/src/api/ManufacturingCenter/CreatePreparationBill.js @@ -8,7 +8,7 @@ export function searchtable(num1, num2, num3, num4, pageCurrent, pageSize) { data: { type: '1', name: '车间生产管理工艺_零件工艺计划_编制工艺_备料零件查询', - param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料打印_check=' + num3 + '&备料打印=' + num4, + param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料打印_check=' + num3 + '&备料打印=' + num4 + '&备料到货=0', Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/ManufacturingCenter/MaterialArrivalManagement.js b/src/api/ManufacturingCenter/MaterialArrivalManagement.js new file mode 100644 index 00000000..f58bc510 --- /dev/null +++ b/src/api/ManufacturingCenter/MaterialArrivalManagement.js @@ -0,0 +1,51 @@ +import request from '@/utils/request' + +// 查询零件 +export function searchtable(num1, num2, num3, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工艺计划_编制工艺_备料到货查询', + param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料到货_check=' + num3, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询零件工艺 +export function searchtable2(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_备料打印_查询工序信息', + param: '工艺计划流水号=' + num1 + } + }) +} +// 更改打印状态 +export function edit(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_备料到货_状态更改', + param: '工艺计划流水号=' + num1 + } + }) +} + +export function handlechange(Number, code) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_修改数据_工作者', + param: '工序流水号=' + Number + '&工作者考勤编号=' + code + } + }) +} diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index 73e8f9ce..03466263 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -18,8 +18,8 @@ align="center"/> @@ -27,7 +27,7 @@ {{ scope.row.零件名称 }} - + @@ -58,8 +58,8 @@ - GAOJING - 备料单 + GAOJING + 备料单 零件名称 @@ -101,6 +101,7 @@ export default { searchTable() { this.loading = true this.tableData = [] + this.Data = [] if (this.partName !== '' && this.partName !== null) { this.partNamecheck = true } else { @@ -119,6 +120,7 @@ export default { this.tableData.push({ 零件名称: this.Data[i].零件名称, 零件图号: this.Data[i].零件图号, + 备料打印: this.Data[i].备料打印, 工艺要求: response.data[i].工艺要求 }) }) diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue new file mode 100644 index 00000000..e14509b8 --- /dev/null +++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue @@ -0,0 +1,141 @@ + + + + +