diff --git a/index.html b/index.html index 7d978087..c727e55c 100644 --- a/index.html +++ b/index.html @@ -8,6 +8,31 @@
+ diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js index 72d253a9..6f0f26fc 100644 --- a/src/api/ManufacturingCenter/ProcessPlanning.js +++ b/src/api/ManufacturingCenter/ProcessPlanning.js @@ -115,7 +115,7 @@ export function processNameClick() { method: 'post', data: { type: '1', - name: '车间生产管理工艺_基础表_工艺分类名称_查询数据' + name: '车间生产管理工艺_基础表_工艺分类名称_查询数据_零件工艺制定专用' } }) } diff --git a/src/api/ManufacturingCenter/RepairTimeEntry.js b/src/api/ManufacturingCenter/RepairTimeEntry.js index fc99ccd6..937b6c2e 100644 --- a/src/api/ManufacturingCenter/RepairTimeEntry.js +++ b/src/api/ManufacturingCenter/RepairTimeEntry.js @@ -12,6 +12,50 @@ export function searchTechnology(num) { } }) } +export function getNames() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改' + } + }) +} + +export function getMachines(gongyi) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床', + param: '项目流水号=' + gongyi + '=int' + } + }) +} +export function getGroups(stepNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组', + param: '机床流水号=' + stepNumber + '=int' + } + }) +} +export function getParts(stepNumber, a, b, c, d, e, f, g) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理_基础表_员工月修补工时_查询零件', + param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=0' + } + }) +} // 查询人员编号 export function searchperson(num) { return request({ @@ -31,33 +75,45 @@ export function searchtable(check, num, pageCurrent, pageSize) { method: 'post', data: { type: '1', - name: '车间生产管理_基础表_员工月修补工时_查询数据', + name: '车间生产管理_基础表_员工月修补工时_查询数据_MESWORK', param: '人员编号_check=' + check + '&人员编号=' + num, Pagination: pageCurrent + '&' + pageSize } }) } // 增加 -export function edittype(ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, roleName) { +export function edittype(num1, ManufacturerNumber, ManufacturerAbbreviation, address, roleName, num2) { return request({ url: '', method: 'post', data: { type: '2', name: '车间生产管理_基础表_员工月修补工时_增加数据', - param: '人员编号=' + ManufacturerNumber + '&工艺编号=' + ManufacturerName + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName + param: '工艺计划流水号=' + num1 + '&人员编号=' + ManufacturerNumber + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName + '&修补工艺=' + num2 } }) } // 编辑 -export function handlechange(CoManufacturerFlowNumber, ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, roleName) { +export function handlechange(CoManufacturerFlowNumber, num1, ManufacturerNumber, ManufacturerAbbreviation, address, roleName, num2) { return request({ url: '', method: 'post', data: { type: '2', name: '车间生产管理_基础表_员工月修补工时_修改数据', - param: '员工月修补工时流水号=' + CoManufacturerFlowNumber + '&人员编号=' + ManufacturerNumber + '&工艺编号=' + ManufacturerName + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName + param: '员工月修补工时流水号=' + CoManufacturerFlowNumber + '&工艺计划流水号=' + num1 + '&人员编号=' + ManufacturerNumber + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName + '&修补工艺=' + num2 + } + }) +} +// 删除工艺信息 +export function delList(MaterialCode) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理_基础表_员工月修补工时_删除数据', + param: '员工月修补工时流水号=' + MaterialCode } }) } diff --git a/src/api/WorkshopProcurement/AccountingPrice.js b/src/api/WorkshopProcurement/AccountingPrice.js index 175fd598..4a53883d 100644 --- a/src/api/WorkshopProcurement/AccountingPrice.js +++ b/src/api/WorkshopProcurement/AccountingPrice.js @@ -7,19 +7,19 @@ export function initPayState() { method: 'post', data: { type: '1', - name: '车间管理_基本件外购质检_合同查询' + name: '车间采购管理_采购合同_查询' } }) } // 查询表1 -export function searchParts(pageCurrent, pageSize, check1, num, check2, name) { +export function searchParts(pageCurrent, pageSize, check1, num) { return request({ url: '', method: 'post', data: { type: '1', - name: '车间管理_基本件外购质检_查询数据', - param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`, + name: '车间管理_核算价格_查询数据', + param: `采购合同流水号_check=${check1}&采购合同流水号=${num}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/WorkshopProcurement/ProcurementContractApproval.js b/src/api/WorkshopProcurement/ProcurementContractApproval.js index ae79da7d..0116c33e 100644 --- a/src/api/WorkshopProcurement/ProcurementContractApproval.js +++ b/src/api/WorkshopProcurement/ProcurementContractApproval.js @@ -7,7 +7,7 @@ export function initContract() { method: 'post', data: { type: '1', - name: '车间采购管理_采购合同_查询_cjn' + name: '车间采购管理_采购合同_未审批查询' } }) } diff --git a/src/api/WorkshopProcurement/PurchaseContractChange.js b/src/api/WorkshopProcurement/PurchaseContractChange.js index a802ba6a..124734fd 100644 --- a/src/api/WorkshopProcurement/PurchaseContractChange.js +++ b/src/api/WorkshopProcurement/PurchaseContractChange.js @@ -7,7 +7,7 @@ export function initContract() { method: 'post', data: { type: '1', - name: '车间采购管理_采购合同_查询_cjn' + name: '车间采购管理_采购合同_查询' } }) } diff --git a/src/api/WorkshopProcurement/PurchasingQualityInspection.js b/src/api/WorkshopProcurement/PurchasingQualityInspection.js index 4bc6c826..f368dd00 100644 --- a/src/api/WorkshopProcurement/PurchasingQualityInspection.js +++ b/src/api/WorkshopProcurement/PurchasingQualityInspection.js @@ -7,7 +7,7 @@ export function initPayState() { method: 'post', data: { type: '1', - name: '车间管理_基本件外购质检_合同查询' + name: '车间采购管理_采购合同_查询' } }) } diff --git a/src/api/WorkshopProcurement/QualityInspectionQuery.js b/src/api/WorkshopProcurement/QualityInspectionQuery.js index 8be8d887..d2d5e9ab 100644 --- a/src/api/WorkshopProcurement/QualityInspectionQuery.js +++ b/src/api/WorkshopProcurement/QualityInspectionQuery.js @@ -7,30 +7,19 @@ export function initPayState() { method: 'post', data: { type: '1', - name: '车间管理_基本件外购质检_合同查询' - } - }) -} -// 初始化零件 -export function initParts() { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '车间管理_基本件外购质检_零件查询' + name: '车间采购管理_采购合同_查询' } }) } // 查询表1 -export function searchParts(pageCurrent, pageSize, check1, num, check2, name, check3, num1) { +export function searchParts(pageCurrent, pageSize, check1, num, check2, name) { return request({ url: '', method: 'post', data: { type: '1', name: '车间管理_质检情况_查询数据', - param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}&物料流水号_check=${check3}&物料流水号=${num1}`, + param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/icons/svg/CreatePreparationBill.svg b/src/icons/svg/CreatePreparationBill.svg new file mode 100644 index 00000000..82524232 --- /dev/null +++ b/src/icons/svg/CreatePreparationBill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MachiningSequenceAdjustment.svg b/src/icons/svg/MachiningSequenceAdjustment.svg new file mode 100644 index 00000000..399e3967 --- /dev/null +++ b/src/icons/svg/MachiningSequenceAdjustment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MaterialArrivalManagement.svg b/src/icons/svg/MaterialArrivalManagement.svg new file mode 100644 index 00000000..6366a880 --- /dev/null +++ b/src/icons/svg/MaterialArrivalManagement.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue index 0f256c41..b8f4377f 100644 --- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue +++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue @@ -59,6 +59,7 @@ import { searchtable, searchtable2, edit, handlechange } from '@/api/Manufacturi export default { data() { return { + num: 0, arrest: [], all: false, partName: '', @@ -114,9 +115,12 @@ export default { this.$message.warning('请选择零件') } else { for (let i = 0; i < this.arrest.length; i++) { - edit(this.arrest[i].工艺计划流水号) - handlechange(this.arrest[i].工序流水号, '0000') - if (i === this.arrest.length - 1) { + edit(this.arrest[i].工艺计划流水号).then(() => { + handlechange(this.arrest[i].工序流水号, '0000').then(response => { + this.num = this.num + response.data[0].result + }) + }) + if (this.num === this.arrest.length) { this.searchTable() } } diff --git a/src/views/ManufacturingCenter/RepairTimeEntry/index.vue b/src/views/ManufacturingCenter/RepairTimeEntry/index.vue index 71056898..7ae7841d 100644 --- a/src/views/ManufacturingCenter/RepairTimeEntry/index.vue +++ b/src/views/ManufacturingCenter/RepairTimeEntry/index.vue @@ -19,9 +19,9 @@ type="index" align="center" width="50"/> - + @@ -44,18 +44,23 @@ {{ scope.row.姓名 }} - + - + @@ -72,51 +77,97 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + - - - 取消 - 确 定 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +
+ 取消 + 确定 +
@@ -162,8 +213,12 @@