diff --git a/src/api/BasicData/EquipmentCapabilitySetting.js b/src/api/BasicData/EquipmentCapabilitySetting.js new file mode 100644 index 00000000..1d36976d --- /dev/null +++ b/src/api/BasicData/EquipmentCapabilitySetting.js @@ -0,0 +1,63 @@ +import request from '@/utils/request' + +// 初始化获取工艺 +export function getTechnology() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_基础表_工艺名称_查询数据', + param: '工艺分类流水号_check=0' + } + }) +} +// 查询表格数据 +export function searchtable(pageCurrent, pageSize, num1, ManufacturerNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '设备管理_设备加工能力_查询数据_设备维护', + param: '设备名称_check=' + num1 + '&设备名称=' + ManufacturerNumber, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 增加 +export function edittype(ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, phNumber, Fax, Remarks, category, attention, EquipmentCondition) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '设备管理_设备加工能力_增加数据_设备维护New', + param: '设备名称=' + ManufacturerNumber + '&设备型号=' + ManufacturerName + '&设备性能指标=' + ManufacturerAbbreviation + '&设备工时系数=' + address + '&工艺编号=' + phNumber + '&班次类型=' + Fax + '&设备加工能力工时=' + Remarks + '&整改工时系数=' + category + '&设备编号=' + attention + '&预留工时系数=' + EquipmentCondition + } + }) +} +// 编辑 +export function handlechange(num, ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, phNumber, Fax, Remarks, category, attention, EquipmentCondition) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '设备管理_设备加工能力_修改数据_设备维护New', + param: '设备流水号=' + num + '&设备名称=' + ManufacturerNumber + '&设备型号=' + ManufacturerName + '&设备性能指标=' + ManufacturerAbbreviation + '&设备工时系数=' + address + '&工艺属性代码=' + phNumber + '&班次类型=' + Fax + '&设备加工能力工时=' + Remarks + '&整改工时系数=' + category + '&设备编号=' + attention + '&预留工时系数=' + EquipmentCondition + } + }) +} +// 删除 +export function handledelete(CoManufacturerFlowNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '设备管理_设备加工能力_删除数据_设备维护', + param: '设备流水号=' + CoManufacturerFlowNumber + } + }) +} diff --git a/src/api/BasicData/Materialmaintenance.js b/src/api/BasicData/Materialmaintenance.js new file mode 100644 index 00000000..a104e7d9 --- /dev/null +++ b/src/api/BasicData/Materialmaintenance.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' + +export function featchMaterial(num1, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_材质表_查询数据_根据材料名称', + param: '材料名称=' + num1, + pagination: pageCurrent + '&' + pageSize + } + }) +} +export function addMaterial(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_材质表_增加数据', + param: '材料=' + num1 + } + }) +} +export function delMaterial(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_材质表_删除数据', + param: '材料流水号=' + num1 + } + }) +} +export function editMaterial(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_材质表_修改数据', + param: '材料流水号=' + num1 + '=int&材料=' + num2 + } + }) +} diff --git a/src/api/BasicData/SystemRrolemaintenance.js b/src/api/BasicData/SystemRrolemaintenance.js new file mode 100644 index 00000000..df3b93e5 --- /dev/null +++ b/src/api/BasicData/SystemRrolemaintenance.js @@ -0,0 +1,59 @@ +import request from '@/utils/request' + +export function InitRolefunction(pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '菜单系统模块_项目角色_查询数据_MESWORK', + Pagination: pageCurrent + '&' + pageSize + } + }) +} +export function deleteData(code) { + return request({ + url: '', + method: 'post', + data: { + type: 2, + name: '菜单系统模块_项目角色_删除_MESWORK', + param: '角色编号=' + code + '=int' + } + }) +} +export function searchTable(num, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '菜单系统模块_项目角色_查询数据_MESWORK', + param: '角色功能=' + num + '=string', + Pagination: pageCurrent + '&' + pageSize + } + }) +} +export function addData(code) { + return request({ + url: '', + method: 'post', + data: { + type: 2, + name: '菜单系统模块_项目角色_增加_MESWORK', + param: '角色功能=' + code + '=string' + } + }) +} +export function addData2(code1, num1) { + return request({ + url: '', + method: 'post', + data: { + type: 2, + name: '菜单系统模块_项目角色_修改数据_MESWORK', + param: '角色功能=' + code1 + '&角色编号=' + num1 + } + }) +} + diff --git a/src/api/BasicData/WorkshopPersonnelRoleMana.js b/src/api/BasicData/WorkshopPersonnelRoleMana.js new file mode 100644 index 00000000..d287983e --- /dev/null +++ b/src/api/BasicData/WorkshopPersonnelRoleMana.js @@ -0,0 +1,151 @@ +import request from '@/utils/request.js' +// 查询项目名称 +export function dialogtablevisible() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '人事档案管理_部门关系_查询节点', + param: '子节点=0' + } + }) +} +export function dialogtablevisible1() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '人事档案管理_部门关系_查询节点', + param: '子节点=0' + } + }) +} +export function addData1(code, groupNum) { + return request({ + url: '', + method: 'post', + data: { + type: 2, + name: '菜单系统模块_项目角色员工综合_增加数据', + param: '人员编号=' + code + '=int&角色编号=' + groupNum + '=int&项目编号=10=int' + } + }) +} +export function addData2(lsh, code, groupNum) { + return request({ + url: '', + method: 'post', + data: { + type: 2, + name: '菜单系统模块_项目角色员工综合_修改数据', + param: '人员角色流水号=' + lsh + '&人员编号=' + code + '&角色编号=' + groupNum + } + }) +} +// 初始化科室 +export function initDepartment() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '人事档案管理_部门关系_查询节点' + } + }) +} +// 初始化人员信息 弹出框 +export function getTree() { + return request({ + url: '', + method: 'post', + data: { + type: 1, + name: '人事档案管理_部门关系_查询节点', + param: '子节点=0=int' + } + }) +} +export function fn(data, pid) { + const result = [] + let temp + for (let i = 0; i < data.length; i++) { + if (data[i].父节点 === pid) { + const obj = { label: data[i].节点名称, id: data[i].子节点 } + temp = fn(data, data[i].子节点) + if (temp.length > 0) { + obj.children = temp + } + result.push(obj) + } + } + return result +} +export function getTable8(code) { + return request({ + url: '', + method: 'post', + data: { + type: 1, + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=' + code + '=int' + } + }) +} +export function handledelete(ryjslsh) { + return request({ + url: '', + method: 'post', + data: { + type: 2, + name: '菜单系统模块_项目角色员工综合_删除数据', + param: '人员角色流水号=' + ryjslsh + '=string' + } + }) +} +export function deleteData(Number) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '菜单系统模块_项目角色员工综合_删除数据', + param: '人员角色流水号=' + Number + '=int' + } + }) +} +export function searchdesigner(num2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=' + num2 + '=int' + } + }) +} +export function initOrderType() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '菜单系统模块_项目角色_查询数据_new' + } + }) +} +export function searchTable(check1, staffName, check2, systemAdministrator, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '菜单系统模块_项目角色员工综合_查询数据', + param: '姓名_check=' + check1 + '=int&姓名=' + staffName + '=string&角色编号_check=' + check2 + ' =int&角色编号=' + systemAdministrator + '=int', + Pagination: pageCurrent + '&' + pageSize + } + }) +} + diff --git a/src/api/BasicData/WorkshopProcessMaintenance.js b/src/api/BasicData/WorkshopProcessMaintenance.js new file mode 100644 index 00000000..07e1f574 --- /dev/null +++ b/src/api/BasicData/WorkshopProcessMaintenance.js @@ -0,0 +1,157 @@ +import request from '@/utils/request' +// 查工艺分类名称 +export function searchProcessClassification(ProcessClassification) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_基础表_工艺分类名称_查询数据', + param: '工艺分类名称=' + ProcessClassification + } + }) +} +// 增加工艺分类 +export function addProcessClassification(ProcessClassification) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_基础表_工艺分类名称_增加数据', + param: '工艺分类名称=' + ProcessClassification + } + }) +} +// 编辑工艺分类 +export function editProcessClassification(ProcessClassificationNum, ProcessClassification) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_基础表_工艺分类名称_修改数据', + param: '工艺分类流水号=' + ProcessClassificationNum + '&工艺分类名称=' + ProcessClassification + } + }) +} +// 通过工艺编分类流水号查工艺分类名称 +export function searchProcessClassificationOfProcessClassificationNum(ProcessNum) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_基础表_工艺分类名称_根据流水号_查询数据_MESWORK', + param: '工艺分类流水号=' + ProcessNum + } + }) +} +// 删除工艺分类 +export function delProcessClassification(ProcessClassificationNum) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_基础表_工艺分类名称_删除数据', + param: '工艺分类流水号=' + ProcessClassificationNum + } + }) +} +// 通过工艺分类流水号查工艺名称 +export function searchProcessNameOfProcessClassification(ProcessClassificationNum) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_基础表_工艺名称_查询数据_按工艺分类流水号查_MESWORK', + param: '工艺分类流水号=' + ProcessClassificationNum + } + }) +} +// 通过工艺编号查工艺要求 +export function searchTechnologicalRequirementsOfProcessNum(ProcessNum) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理_基础表_工艺要求_查询数据', + param: '工艺编号=' + ProcessNum + } + }) +} +// 增加工艺 +export function addProcess(ProcessClassificationNum, ProcessName, ShortName) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: 'dbo.车间生产管理工艺_基础表_工艺名称_增加数据', + param: '工艺分类流水号=' + ProcessClassificationNum + '&工艺名称=' + ProcessName + '&工艺名称简称=' + ShortName + } + }) +} +// 编辑工艺 +export function editProcess(ProcessClassificationNum, ProcessName, ShortName) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_基础表_工艺名称_修改名称及简称', + param: '工艺编号=' + ProcessClassificationNum + '&工艺名称=' + ProcessName + '&工艺名称简称=' + ShortName + } + }) +} +// 删除工艺 +export function delProcess(ProcessNum) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_基础表_工艺名称_删除数据', + param: '工艺编号=' + ProcessNum + } + }) +} +// 新增工艺要求 +export function addTechnologicalRequirements(ProcessClassificationNum, ProcessName) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理_基础表_工艺要求_增加数据', + param: '工艺编号=' + ProcessClassificationNum + '&工艺要求=' + ProcessName + } + }) +} +// 编辑工艺要求 +export function editTechnologicalRequirements(ProcessClassificationNum, ProcessName) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理_基础表_工艺要求_修改数据', + param: '工艺要求流水号=' + ProcessClassificationNum + '&工艺要求=' + ProcessName + } + }) +} +// 删除工艺要求 +export function delTechnologicalRequirements(ProcessClassificationNum) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理_基础表_工艺要求_删除数据', + param: '工艺要求流水号=' + ProcessClassificationNum + } + }) +} diff --git a/src/api/BasicData/maintenanceEquipmentPerson.js b/src/api/BasicData/maintenanceEquipmentPerson.js new file mode 100644 index 00000000..2b0af7d9 --- /dev/null +++ b/src/api/BasicData/maintenanceEquipmentPerson.js @@ -0,0 +1,97 @@ +import request from '@/utils/request' + +// 初始化设备名称 +export function getEquipment(id, equipmentNum) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '设备管理_设备名称与班次关系_查询数据', + param: `查询代码=${id}=int&设备流水号=${equipmentNum}` + } + }) +} + +export function getDepartment() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '设备管理_部门查询' + } + }) +} + +export function getTablePeople(number) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: `考核部门编号=${number}` + } + }) +} + +export function getTableData(equipmentCheck, equipmentNameValue, operatorCheck, operatorNumber, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '设备管理_设备名称_人员关系_查询数据', + param: `设备流水号_check=${equipmentCheck}&设备流水号=${equipmentNameValue}&操作者编号_check=${operatorCheck}&操作者编号=${operatorNumber}`, + pagination: pageCurrent + '&' + pageSize + } + }) +} + +export function deleteTable(number) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '设备管理_设备名称_人员关系_删除数据', + param: '设备人员关系流水号=' + number + '=int' + } + }) +} + +export function getStaff() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '设备管理_基础表_班次表_查询班次' + } + }) +} + +export function addTable(equipmentNumber, equipment, shift, operator, operatorNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '设备管理_设备名称_人员关系_增加数据', + param: '设备流水号=' + equipmentNumber + '=int&设备名称=' + equipment + '=string&班次代码=' + shift + '=int&操作者=' + operator + '=string&操作者编号=' + operatorNumber + '=int' + } + }) +} + +export function editTable(equipment, equipmentNumber, shift, operator, operatorNumber, Number) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '设备管理_设备名称_人员关系_修改数据', + param: '设备流水号=' + equipmentNumber + '=int&设备名称=' + equipment + '=string&班次代码=' + shift + '=int&操作者=' + operator + '=string&操作者编号=' + operatorNumber + '=int&设备人员关系流水号=' + Number + '=int' + } + }) +} diff --git a/src/api/Inventory/DirectPart.js b/src/api/Inventory/DirectPart.js index e5719d16..29b413fc 100644 --- a/src/api/Inventory/DirectPart.js +++ b/src/api/Inventory/DirectPart.js @@ -59,14 +59,14 @@ export function searchContractDetail(contractnumber) { }) } // 直达件查询 -export function searchDirectPart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group, contract) { +export function searchDirectPart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group, contract_check, contract) { return request({ url: '', method: 'post', data: { type: '1', name: '库存管理_直达件_零件查询', - param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group + '&合同流水号=' + contract, + param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group + '&合同流水号_check=' + contract_check + '&合同流水号=' + contract, Pagination: pageCurrent + '&' + pageSize } }) @@ -79,7 +79,7 @@ export function searchPeople() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=' + 18 + param: '考核部门编号=18' } }) } diff --git a/src/api/Inventory/ExchangeApproval.js b/src/api/Inventory/ExchangeApproval.js index 0f6f1d73..21c190be 100644 --- a/src/api/Inventory/ExchangeApproval.js +++ b/src/api/Inventory/ExchangeApproval.js @@ -13,14 +13,14 @@ export function searchExchangePart(pageCurrent, pageSize) { }) } // 通过交换件 -export function approvalExchangepart(data1, data2, data3, data4, data5, data6) { +export function approvalExchangepart(data1, data2, data22, data3, data33, data4, data5, data55, data6) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_交换件_交换件审批通过', - param: '交换单流水号=' + data1 + '&交换件物料流水号=' + data2 + '&交换件组件零件流水号=' + data3 + '&交换件采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + '&交换数量=' + data6 + param: '交换单流水号=' + data1 + '&交换件物料流水号=' + data2 + '&被交换件物料流水号=' + data22 + '&交换件组件零件流水号=' + data3 + '&被交换件组件零件流水号=' + data33 + '&交换件采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + '&被货位流水号=' + data55 + '&交换数量=' + data6 } }) } diff --git a/src/api/Inventory/ExchangePart.js b/src/api/Inventory/ExchangePart.js index 450b71ef..40037811 100644 --- a/src/api/Inventory/ExchangePart.js +++ b/src/api/Inventory/ExchangePart.js @@ -73,26 +73,26 @@ export function searchExchangePart(pageCurrent, pageSize) { }) } // 增加交换件 -export function addExchangepart(data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11) { +export function addExchangepart(data1, data2, data3, data4, data5, data6, data7, data8, data88, data9, data10, data11, data12, data13) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_交换件_交换件增加', - param: '交换单编号=' + data1 + '&交换件组件零件流水号=' + data2 + '&交换件物料流水号=' + data3 + '&交换件采购合同明细流水号=' + data4 + '&被交换件组件零件流水号=' + data5 + '&交换件名称=' + data6 + '&被交换件名称=' + data7 + '&货位流水号=' + data8 + '&交换数量=' + data9 + '&申请人=' + data10 + '&备注=' + data11 + param: '交换单编号=' + data1 + '&交换件组件零件流水号=' + data2 + '&交换件物料流水号=' + data3 + '&交换件采购合同明细流水号=' + data4 + '&被交换件组件零件流水号=' + data5 + '&交换件名称=' + data6 + '&被交换件名称=' + data7 + '&货位流水号=' + data8 + '&被交换货位流水号=' + data88 + '&交换数量=' + data9 + '&申请人=' + data10 + '&备注=' + data11 + '&领料单流水号=' + data12 + '&被交换件物料流水号=' + data13 } }) } // 删除交换单 -export function dropExchangeList(PickingListNumberx, data) { +export function dropExchangeList(PickingListNumberx) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_交换件_交换件删除', - param: '交换单流水号=' + PickingListNumberx + '&交换件组件零件流水号=' + data + param: '交换单流水号=' + PickingListNumberx } }) } @@ -108,3 +108,15 @@ export function editExchangeList(data1, data2, data3, data4) { } }) } +// 领料单查询 +export function searchList1(listNumber_check, listNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_领料单_领料单查询', + param: '领料单编号_check=' + 0 + '&领料单编号=' + listNumber + } + }) +} diff --git a/src/api/Inventory/GenneralPart.js b/src/api/Inventory/GenneralPart.js new file mode 100644 index 00000000..f60553b3 --- /dev/null +++ b/src/api/Inventory/GenneralPart.js @@ -0,0 +1,48 @@ +import request from '@/utils/request' +// 查询零件入库情况 +export function searchTable(partnumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'MES_机加工MES_库存管理_入库模块_零件基础信息查询_根据零件图号', + param: '零件图号=' + partnumber + '=string' + } + }) +} +// 仓库查询 +export function getinventory() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_货位主文件_仓库查询' + } + }) +} +// 货位查询 +export function getlocate(housenumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_货位主文件_查询数据', + param: '仓库流水号=' + housenumber + '=int' + } + }) +} +// 修改入库数量 +export function insertOne(num0, num1, people, num4, num5, num6, num7) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: 'MES_机加工MES_库存管理_入库模块_增加入库信息_修改入库数量', + param: '工艺计划流水号=' + num0 + '=int&入库数量=' + num1 + '=int&收件人员编号=' + people + '=int&送件人员编号=1001' + '&漆塑=' + num4 + '&仓库流水号=' + num5 + '&货位流水号=' + num6 + '&备注=' + num7 + } + }) +} diff --git a/src/api/Inventory/Inboundscanning.js b/src/api/Inventory/Inboundscanning.js index f60553b3..211ac2eb 100644 --- a/src/api/Inventory/Inboundscanning.js +++ b/src/api/Inventory/Inboundscanning.js @@ -7,7 +7,7 @@ export function searchTable(partnumber) { data: { type: '1', name: 'MES_机加工MES_库存管理_入库模块_零件基础信息查询_根据零件图号', - param: '零件图号=' + partnumber + '=string' + param: '工艺计划流水号=' + partnumber + '=string' } }) } diff --git a/src/api/Inventory/InventoryCheck.js b/src/api/Inventory/InventoryCheck.js index bee8c771..0fccc1e9 100644 --- a/src/api/Inventory/InventoryCheck.js +++ b/src/api/Inventory/InventoryCheck.js @@ -171,4 +171,29 @@ export function searchGeneralPart(pageCurrent, pageSize, project_check, project, } }) } - +// 车间采购基本件查询 +export function searchHourseBasicPart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_库存盘点_车间采购基本件查询', + param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 车间采购外购件查询 +export function searchHoursePurchasePart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_库存盘点_车间采购外购件查询', + param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/api/Inventory/InventoryManagement.js b/src/api/Inventory/InventoryManagement.js index 99fdef63..dda1f073 100644 --- a/src/api/Inventory/InventoryManagement.js +++ b/src/api/Inventory/InventoryManagement.js @@ -79,7 +79,7 @@ export function alterLocate(num, num0, num1, num2, num3, num4) { data: { type: '2', name: '库存管理_货位主文件_修改数据', - param: '货位流水号=' + num + '货位名称=' + num0 + '&工作中心=' + num1 + '&仓库流水号=' + num2 + '&永久=' + num3 + '&不可用量=' + num4 + param: '货位流水号=' + num + '&货位名称=' + num0 + '&工作中心=' + num1 + '&仓库流水号=' + num2 + '&永久=' + num3 + '&不可用量=' + num4 } }) } diff --git a/src/api/Inventory/PartOut.js b/src/api/Inventory/PartOut.js index ee193210..c92c3998 100644 --- a/src/api/Inventory/PartOut.js +++ b/src/api/Inventory/PartOut.js @@ -1,14 +1,14 @@ import request from '@/utils/request' // 领料单查询 -export function searchList(listNumber) { +export function searchList(listNumber_check, listNumber) { return request({ url: '', method: 'post', data: { type: '1', name: '车间装配管理_领料单_领料单查询', - param: '领料单编号=' + listNumber + param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber } }) } @@ -24,6 +24,18 @@ export function searchListDetail(listNumber) { } }) } +// 领料单明细出库 +export function ListDetailOut(listNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_领料单_领料单明细出库', + param: '领料单明细流水号=' + listNumber + } + }) +} // 外购件零件出库 export function PurchasePart(data1, data2, data3, data4, data5) { return request({ diff --git a/src/api/Inventory/PickingList.js b/src/api/Inventory/PickingList.js index dffc6797..9bc3eb10 100644 --- a/src/api/Inventory/PickingList.js +++ b/src/api/Inventory/PickingList.js @@ -75,18 +75,19 @@ export function searchHoursePart(pageCurrent, pageSize, project_check, project, }) } // 领料单查询 -export function searchList(pageCurrent, pageSize, listNumber) { +export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) { return request({ url: '', method: 'post', data: { type: '1', name: '车间装配管理_领料单_领料单查询', - param: '领料单编号=' + listNumber, + param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber, Pagination: pageCurrent + '&' + pageSize } }) } + // 领料单明细查询 export function searchListDetail(listNumber) { return request({ @@ -136,14 +137,14 @@ export function dropListDetail(DetailNumberx) { }) } // 增加领料单明细 -export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, project, machine, team, materialName, materialNumber, materialType, outNumber, partType, Note, data1, data2, data3, data4, data5, data6) { +export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, project, machine, team, materialName, materialNumber, materialType, outNumber, partType, Note, data1, data2, data3, data4, data5, data6, data7) { return request({ url: '', method: 'post', data: { type: '2', name: '车间装配管理_领料单_领料单明细增加', - param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&项目名称=' + project + '&机床图号=' + machine + '&组号=' + team + '&物料名称=' + materialName + '&物料型号=' + materialNumber + '&物料规格=' + materialType + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&组件零件流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + '&车间外购=' + data6 + param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&项目名称=' + project + '&机床图号=' + machine + '&组号=' + team + '&物料名称=' + materialName + '&物料型号=' + materialNumber + '&物料规格=' + materialType + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&组件零件流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + '&车间外购=' + data6 + '&物料与货位对照流水号=' + data7 } }) } diff --git a/src/api/Inventory/SubPartCome.js b/src/api/Inventory/SubPartCome.js index e208e039..b817862e 100644 --- a/src/api/Inventory/SubPartCome.js +++ b/src/api/Inventory/SubPartCome.js @@ -1,12 +1,13 @@ import request from '@/utils/request' // 替换单查询 -export function searchSubstitutedCard() { +export function searchSubstitutedCard(data1, data2, data3, data4) { return request({ url: '', method: 'post', data: { type: '1', - name: '库存管理_替换件_替换单查询' + name: '库存管理_替换件_替换单查询', + param: '替换单编号_check=' + data1 + '&替换单编号=' + data2 + '&替换件名称_check=' + data3 + '&替换件名称=' + data4 } }) } diff --git a/src/api/ManufacturingCenter/GroupMatching.js b/src/api/ManufacturingCenter/GroupMatching.js index a1a30ad5..a99a4220 100644 --- a/src/api/ManufacturingCenter/GroupMatching.js +++ b/src/api/ManufacturingCenter/GroupMatching.js @@ -56,3 +56,15 @@ export function searchPurchaseTable(check, entryNameValue, check1, machine, chec } }) } +export function searchTable1(check, entryNameValue, check1, machine, check2, groupNum, check3, year, check4, month, check5, time, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_车间采购出库_零件查询', + param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&年_check=' + check3 + '=int&年=' + year + '=string&月_check=' + check4 + '=int&月=' + month + '=int&入库时间_check=' + check5 + '=int&入库时间=' + time + '=string', + pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/api/ManufacturingCenter/InitialProduction.js b/src/api/ManufacturingCenter/InitialProduction.js index ceeba752..d9442abe 100644 --- a/src/api/ManufacturingCenter/InitialProduction.js +++ b/src/api/ManufacturingCenter/InitialProduction.js @@ -12,7 +12,7 @@ export function getEntryNameValue() { } }) } -// 项目名称 +// 机床名称 export function getToolNum(num) { return request({ url: '', diff --git a/src/api/ManufacturingCenter/PartAssignment.js b/src/api/ManufacturingCenter/PartAssignment.js index de76d929..bb552ce5 100644 --- a/src/api/ManufacturingCenter/PartAssignment.js +++ b/src/api/ManufacturingCenter/PartAssignment.js @@ -118,19 +118,30 @@ export function searchDetailed(num) { method: 'post', data: { type: '1', - name: '车间管理_基本件采购_请购单明细_查询数据', + name: '车间管理_基本件采购_请购单明细_查询数据_外购件', param: '请购单流水号=' + num } }) } -export function purchaseRequisition(RequisitionList, projectName, projectFloatValue, MachineToolNumber, machineFloatValue, groupName, groupFloatValue, BasicPartsNumber, MaterialName, NumberOfParts, PartType, time, MaterialNum) { +export function searchDetailed1(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间管理_基本件采购_请购单明细_查询数据_基本件', + param: '请购单流水号=' + num + } + }) +} +export function purchaseRequisition(RequisitionList, projectName, projectFloatValue, MachineToolNumber, machineFloatValue, groupName, groupFloatValue, BasicPartsNumber, MaterialName, PartToolNumber, Material, NumberOfParts, PartType, time, MaterialNum) { return request({ url: '', method: 'post', data: { type: '2', name: '车间管理_基本件采购_请购单明细_请购', - param: '请购单流水号=' + RequisitionList + '&项目名称=' + projectName + '&项目流水号=' + projectFloatValue + '&机床图号=' + MachineToolNumber + '&机床流水号=' + machineFloatValue + '&组号=' + groupName + '&组件流水号=' + groupFloatValue + '&基本件流水号=' + BasicPartsNumber + '&物料名称=' + MaterialName + '&零件数量=' + NumberOfParts + '&零件类型=' + PartType + '&物料计划到货时间=' + time + '&物料流水号=' + MaterialNum + param: '请购单流水号=' + RequisitionList + '&项目名称=' + projectName + '&项目流水号=' + projectFloatValue + '&机床图号=' + MachineToolNumber + '&机床流水号=' + machineFloatValue + '&组号=' + groupName + '&组件流水号=' + groupFloatValue + '&基本件流水号=' + BasicPartsNumber + '&物料名称=' + MaterialName + '&零件图号=' + PartToolNumber + '&材料=' + Material + '&零件数量=' + NumberOfParts + '&零件类型=' + PartType + '&物料计划到货时间=' + time + '&物料流水号=' + MaterialNum } }) } diff --git a/src/api/ManufacturingCenter/ProcessAdjustQuery.js b/src/api/ManufacturingCenter/ProcessAdjustQuery.js new file mode 100644 index 00000000..151b6d6d --- /dev/null +++ b/src/api/ManufacturingCenter/ProcessAdjustQuery.js @@ -0,0 +1,62 @@ +import request from '@/utils/request' + +// 初始化工艺员 +export function initCraftmen() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=17' + } + }) +} +// 根据工艺员查零件 +export function searchPart(person) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_在制零件工艺调整_被调整零件查询', + param: '工艺人员编号=' + person + } + }) +} +// 根据零件查工艺 旧 +export function searchProcessOld(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_在制零件工艺调整_查询工艺', + param: '工艺计划流水号=' + num + } + }) +} +// 根据零件查工艺 新 +export function searchProcessNew(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工序_查询工序信息', + param: '工艺计划流水号=' + num + } + }) +} +// 查询各工艺员调整工艺情况 +export function searchChart() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_在制零件工艺调整_被调整零件数量查询' + } + }) +} + diff --git a/src/api/ManufacturingCenter/ProcessingStatusEdit.js b/src/api/ManufacturingCenter/ProcessingStatusEdit.js new file mode 100644 index 00000000..ab5fd66c --- /dev/null +++ b/src/api/ManufacturingCenter/ProcessingStatusEdit.js @@ -0,0 +1,147 @@ +import request from '@/utils/request' + +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 getTable(stepNumber, a, b, c, d, e, f, g, pageCurrent, pageSize) { + 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', + Pagination: pageCurrent + '&' + pageSize + } + }) +} + +export function getTable2(stepNumber, a, b, c, d, e, 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=1=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=0' + } + }) +} + +export function handlechange(Number, code) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_修改数据_修改实际完成时间', + param: '工序流水号=' + Number + '&实际完成时间=' + code + } + }) +} + +export function handlechange2(Number, code) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_修改数据_工作者', + param: '工序流水号=' + Number + '&工作者考勤编号=' + code + } + }) +} + +export function handlechange3(Number, code) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_修改数据_工作者_MESWORK', + param: '工序流水号=' + Number + '&工作者考勤编号=' + code + } + }) +} +export function dialogtablevisible() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '人事档案管理_部门关系_查询节点', + param: '子节点=0' + } + }) +} +// 初始化人员信息 弹出框 +export function getTree() { + return request({ + url: '', + method: 'post', + data: { + type: 1, + name: '人事档案管理_部门关系_查询节点', + param: '子节点=0=int' + } + }) +} +export function fn(data, pid) { + const result = [] + let temp + for (let i = 0; i < data.length; i++) { + if (data[i].父节点 === pid) { + const obj = { label: data[i].节点名称, id: data[i].子节点 } + temp = fn(data, data[i].子节点) + if (temp.length > 0) { + obj.children = temp + } + result.push(obj) + } + } + return result +} + +export function getTable8(code) { + return request({ + url: '', + method: 'post', + data: { + type: 1, + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=' + code + '=int' + } + }) +} diff --git a/src/api/ManufacturingCenter/ProductionCapacityBalance.js b/src/api/ManufacturingCenter/ProductionCapacityBalance.js index 2b415313..560946b5 100644 --- a/src/api/ManufacturingCenter/ProductionCapacityBalance.js +++ b/src/api/ManufacturingCenter/ProductionCapacityBalance.js @@ -235,7 +235,7 @@ export function updateDate(num1, num2, date) { method: 'post', data: { type: '2', - name: '车间生产管理工艺_新排产算法_制定计划_调整计划_增加数据New', + name: '车间生产管理工艺_新排产算法_制定计划_调整计划_增加数据New1', param: '工序流水号=' + num1 + '&调整人编号=' + num2 + '&调整计划完成日期=' + date } }) diff --git a/src/api/ManufacturingCenter/TypicalProcessMaintenance.js b/src/api/ManufacturingCenter/TypicalProcessMaintenance.js index a40b448c..a7d5bb4f 100644 --- a/src/api/ManufacturingCenter/TypicalProcessMaintenance.js +++ b/src/api/ManufacturingCenter/TypicalProcessMaintenance.js @@ -23,14 +23,15 @@ export function getPartsName(num) { }) } -export function getTableData(partsCategoriesCheck, partsCategories, partsNameCheck, partsName) { +export function getTableData(pageCurrent, pageSize, partsCategoriesCheck, partsCategories, partsNameCheck, partsName) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理工艺_基础表_典型工艺名称_查询数据_综合查询', - param: `典型工艺名称分类流水号_check=${partsCategoriesCheck}&典型工艺名称分类流水号=${partsCategories}&典型工艺流水号_check=${partsNameCheck}&典型工艺流水号=${partsName}&典型工艺流水号1_check=0` + param: `典型工艺名称分类流水号_check=${partsCategoriesCheck}&典型工艺名称分类流水号=${partsCategories}&典型工艺流水号_check=${partsNameCheck}&典型工艺流水号=${partsName}&典型工艺流水号1_check=0`, + Pagination: pageCurrent + '&' + pageSize } }) } diff --git a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js b/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js index 3d4cfda6..d24ecf3d 100644 --- a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js +++ b/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js @@ -6,7 +6,7 @@ export function getData(check, equipmentName, pageCurrent, pageSize) { method: 'post', data: { type: '1', - name: '设备管理_设备加工能力_查询数据_设备维护', + name: '设备管理_设备加工能力_查询数据_设备维护NEW', param: '设备名称_check=' + check + '=int&设备名称=' + equipmentName, pagination: pageCurrent + '&' + pageSize } diff --git a/src/api/Outsourcing/InterBudgetaryBudgets.js b/src/api/Outsourcing/InterBudgetaryBudgets.js index 69e43574..50046a4e 100644 --- a/src/api/Outsourcing/InterBudgetaryBudgets.js +++ b/src/api/Outsourcing/InterBudgetaryBudgets.js @@ -1,27 +1,47 @@ import request from '@/utils/request' -// 查询（未编制） -export function searchPartNum1(num1, start, end, pageCurrent, pageSize) { +export function machine() { return request({ url: '', method: 'post', data: { type: '1', - name: '车间生产管理工艺_零件工艺计划_查询序间外协零件_价格预算', - param: '定额人员编号=0&零件图号=' + num1 + '&开始时间=' + start + '&结束时间=' + end + '&预算状态=0', - Pagination: pageCurrent + '&' + pageSize + name: '车间生产管理工艺_序间外协_项目查询' } }) } -// 查询零件号（已编制） -export function searchPartNum2(num, start, end, pageCurrent, pageSize) { +export function getToolNum(num) { return request({ url: '', method: 'post', data: { type: '1', - name: '车间生产管理工艺_零件工艺计划_查询序间外协零件_价格预算', - param: '定额人员编号=0&零件图号=' + num + '&开始时间=' + start + '&结束时间=' + end + '&预算状态=1', + name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床', + param: '项目流水号=' + num + } + }) +} +// 组号 +export function getNum(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组', + param: '机床流水号=' + num + } + }) +} +// 查询（未编制） +export function searchPartNum1(num1, num2, num3, num4, num5, num6, num7, num8, num9, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工艺计划_查询序间外协零件_价格预算_new', + param: '项目流水号_check=' + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&机床流水号=' + num4 + '&组件流水号_check=' + num5 + '&组件流水号=' + num6 + '&零件图号_check=' + num7 + '&零件图号=' + num8 + '&预算状态=' + num9, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/Outsourcing/OutsourcingTaskQuery.js b/src/api/Outsourcing/OutsourcingTaskQuery.js new file mode 100644 index 00000000..044651fc --- /dev/null +++ b/src/api/Outsourcing/OutsourcingTaskQuery.js @@ -0,0 +1,206 @@ +import request from '@/utils/request' + +// 单据状态： 1 未成交 2 成交 3 作废 +export function shouhuo(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理_外协加工任务单_修改数据_作废', + param: '外协加工任务单流水号=' + num + '&单据状态=3' + } + }) +} +// 初始化获取已生成的外协加工任务单初始化获取已生成的外协加工任务单 +export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理_外协加工任务单_查询数据_查询页', + param: '外协加工任务单_check=0&外协加工任务单流水号=null&表单号_check=' + checked + '&表单号=' + contractNumber + '&外协厂家_check=' + checked1 + '&外协厂家=' + manufacturers + '&任务下达日期_时间段=' + checked2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&单据状态_check=0&单据状态=1&外协员编号_check=0&外协员编号=' + num, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 初始化获取外协厂家数据 +export function getData1() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_基础表_外协厂家_查询数据' + } + }) +} +// 初始化获取已预算价格，未选入到外协加工任务单的零件 +export function getTable1(check, partNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工艺计划_查询数据_外协_新', + param: '零件图号_check=' + check + '=int&零件图号=' + partNumber + '=string' + } + }) +} +// 获取零件工序信息（零件号表中） +export function getprocedure(processPlan, single) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_工艺名称简称_新', + param: '工艺计划流水号=' + processPlan + '=int&单件是否外协=' + single + '=int' + } + }) +} +// 外协厂家查询 +export function searchManufactor(name) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_基础表_外协厂家_查询数据_ 根据条件', + param: '序号_check=0=bit&序号=' + ' ' + '=string&外协厂家名称_check=1=bit&外协厂家名称=' + name + '=string&外协厂家简称_check=0=bit&外协厂家简称=' + ' ' + '=string&地址_check=0=bit&地址=' + ' ' + '=string&联系人_check=0=bit&联系人=' + ' ' + '=string&电话_check=0=bit&电话=' + ' ' + '=string&传真_check=0=bit&传真=' + ' ' + '=string&备注_check=0=bit&备注=' + ' ' + '=string&类别_check=0=bit&类别=' + ' ' + '=string&关注_check=0=bit&关注=' + ' ' + '=string&设备情况_check=0=bit&设备情况=' + ' ' + '=string' + } + }) +} +// 确定价格 +export function spareParts(processNum, single) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_全部_新', + param: '工艺计划流水号=' + processNum + '=int&工序数量=21=int&单件是否外协=' + single + '=int' + } + }) +} +// 暂未启用 +export function spareParts1(processNum, single) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_全部_新', + param: '工艺计划流水号=' + processNum + '=int&工序数量=31=int&单件是否外协=' + single + '=int' + } + }) +} +// 新建外协加工任务单 +export function addTable(contractNumber, personNum, manufacturers, time, freight) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理_外协加工任务单_增加数据', + param: '表单号=' + contractNumber + '=string&外协计划员编号=' + personNum + '&外协厂家=' + manufacturers + '=int&任务下达日期=' + time + '=string&运费=' + freight + '=int' + } + }) +} +// 外协加工任务单修改 +export function editData(Number, manufacturers, freight, documentStatus, sign, Explain) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理_外协加工任务单_修改数据', + param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&单据状态=' + documentStatus + '=int&入库标志=' + sign + '=int&扣款说明=' + Explain + } + }) +} +// 成交 +export function editData1(Number, manufacturers, freight, documentStatus, sign, Explain) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理_外协加工任务单_修改数据', + param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&单据状态=' + documentStatus + '=int&入库标志=' + sign + '=int&扣款说明=' + Explain + '&扣款_质量=0&扣款_计划=0&扣款_其他=0' + } + }) +} +// 删除外协加工任务单 +export function deleteData(Number) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理_外协加工任务单_删除数据', + param: '外协加工任务单流水号=' + Number + '=int' + } + }) +} +// 移除零件 +export function deleteData1(Number) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理_外协加工任务单_修改数据_作废', + param: '外协加工任务单明细流水号=' + Number + '&单据状态=4' + } + }) +} +// 选入零件 +export function insertParts(processNum, Number) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理_外协加工任务单明细_增加数据', + param: '外协加工任务单流水号=' + Number + '=int&工艺计划流水号=' + processNum + '=int' + } + }) +} +// 查询任务单明细 +export function getParts(Number) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理_外协加工任务单明细_查询数据', + param: '外协加工任务单流水号=' + Number + '=int' + } + }) +} +// 数据库生产表单号 +export function getNumber(time) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理_外协加工任务单_查询数据_单据编号', + param: '任务下达日期=' + time + '=string&表单号=1=string=output' + } + }) +} +// 计算价格 +export function getPrice(Number, money, money1, money2, money3) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理_外协加工任务单明细_修改数据', + param: '外协加工任务单明细流水号=' + Number + '=int&加工价格_预算=' + money + '&加工价格_成交=' + money1 + '&材料价格_价格=' + money2 + '&其他价格=' + money3 + '&入库标志=1=int&交检数量=0=int&合格数量=0=int&回用数量=0=int&废品数量=0=int' + } + }) +} diff --git a/src/api/Outsourcing/PreorderAssociation.js b/src/api/Outsourcing/PreorderAssociation.js index 47747967..f421df05 100644 --- a/src/api/Outsourcing/PreorderAssociation.js +++ b/src/api/Outsourcing/PreorderAssociation.js @@ -1,14 +1,47 @@ import request from '@/utils/request' +export function machine() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_序间外协_项目查询' + } + }) +} +export function getToolNum(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床', + param: '项目流水号=' + num + } + }) +} +// 组号 +export function getNum(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组', + param: '机床流水号=' + num + } + }) +} // 查询表1 -export function searchTable(check, num1, pageCurrent, pageSize) { +export function searchTable(num1, num2, num3, num4, num5, num6, check, num7, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新', - param: '项目流水号_check=0&项目流水号=0&机床流水号_check=0&机床流水号=0&组件流水号_check=0&组件流水号=0&零件图号_check=' + check + '&零件图号=' + num1 + '&考核状态_check=0&考核状态=0&单件是否外协_check=1&单件是否外协=1&时间=0&机加工开始时间=0&机加工结束时间=0&零件类型=0', + param: '项目流水号_check=' + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&机床流水号=' + num4 + '&组件流水号_check=' + num5 + '&组件流水号=' + num6 + '&零件图号_check=' + check + '&零件图号=' + num7 + '&考核状态_check=0&考核状态=0&单件是否外协_check=1&单件是否外协=1&时间=0&机加工开始时间=0&机加工结束时间=0&零件类型=0', Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/PurchasingCenter/MaterialManagement.js b/src/api/PurchasingCenter/MaterialManagement.js new file mode 100644 index 00000000..ab4513ce --- /dev/null +++ b/src/api/PurchasingCenter/MaterialManagement.js @@ -0,0 +1,197 @@ +import request from '@/utils/request' + +export function initDepartmentName() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_物料主文件_基本_物料部门_查询数据' + } + }) +} +export function initMaterialCategory(check, DepartmentValue) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_物料类别编号_查询数据_根据物料部门编号', + param: '物料部门流水号_check=' + check + '=int&物料部门流水号=' + DepartmentValue + } + }) +} +export function initMaterialVariety(MaterialCategoryValue) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_物料品种编号_查询数据', + param: '物料类别流水号=' + MaterialCategoryValue + } + }) +} +export function initMeasurementUnit() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_计量单位主文件_查询数据' + } + }) +} +export function initMaterialSource() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_物料来源_查询数据' + } + }) +} +export function searchmaterial(check1, MaterialName, check2, FullNameOfMaterial, check3, MaterialSpecification, check4, MaterialModel, pageCurrent, pageSize, check5, MaterialCategoryValue, check6, MaterialVarietyValue, check7, MeasurementUnitValue, check8, MaterialSourceValue, check9, supplierValue) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_物料主文件_基本_查询数据_分页', + param: '物料流水号_check=0&物料代码_check=0&物料名称_check=' + check1 + '=int&物料名称=' + MaterialName + '&物料全名_check=' + check2 + '=int&物料全名=' + FullNameOfMaterial + '&物料规格_check=' + check3 + '=int&物料规格=' + MaterialSpecification + '&物料型号_check=' + check4 + '=int&物料型号=' + MaterialModel + '&物料类别流水号_check=' + check5 + '=int&物料类别流水号=' + MaterialCategoryValue + '&物料品种流水号_check=' + check6 + '=int&物料品种流水号=' + MaterialVarietyValue + '&供货商流水号_check=' + check9 + '&供货商流水号=' + supplierValue + '&计量单位流水号_check=' + check7 + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号_check=' + check8 + '&物料来源流水号=' + MaterialSourceValue + '&PageCurrent=' + pageCurrent + '=int&PageSize=' + pageSize + '=int&PageCount=1=int=output&ItemCount=1=int=output' + } + }) +} +export function getSupplier(check, num, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_供货商_查询数据_根据条件', + param: '供货商_check=' + check + '=int&供货商=' + num, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +export function addData(MaterialVariety, MaterialName, FullNameOfMaterial, MaterialSpecification, MaterialModel, MeasurementUnitValue, MaterialSourceValue, supplierValue1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_物料主文件_基本_增加数据', + param: '物料品种流水号=' + MaterialVariety + '&物料名称=' + MaterialName + '&物料全名=' + FullNameOfMaterial + '&物料规格=' + MaterialSpecification + '&物料型号=' + MaterialModel + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号=' + MaterialSourceValue + '&供货商流水号=' + supplierValue1 + } + }) +} +export function editData(MaterialValue, MaterialVariety, MaterialName, FullNameOfMaterial, MaterialSpecification, MaterialModel, MeasurementUnitValue, MaterialSourceValue, supplierValue1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_物料主文件_基本_修改数据', + param: '物料流水号=' + MaterialValue + '&物料品种流水号=' + MaterialVariety + '&物料名称=' + MaterialName + '&物料全名=' + FullNameOfMaterial + '&物料规格=' + MaterialSpecification + '&物料型号=' + MaterialModel + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号=' + MaterialSourceValue + '&供货商流水号=' + supplierValue1 + } + }) +} +export function deleteData(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_物料主文件_基本_删除数据', + param: '物料流水号=' + num + } + }) +} +export function searchCategory() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_物料类别编号_查询数据_根据物料部门编号' + } + }) +} +export function searchVarieties(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_物料品种编号_查询数据', + param: '物料类别流水号=' + num + } + }) +} +export function editCategory(MaterialCategoryNum, MaterialCategory2, CategoryNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_物料类别编号_修改数据', + param: '物料类别流水号=' + MaterialCategoryNum + '&物料类别=' + MaterialCategory2 + '&类别编号=' + CategoryNumber + } + }) +} +export function addCategory(MaterialCategory2, CategoryNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_物料类别编号_增加数据', + param: '物料类别=' + MaterialCategory2 + '&类别编号=' + CategoryNumber + } + }) +} +export function deleteCategory(MaterialCategoryNum) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_物料类别编号_删除数据', + param: '物料类别流水号=' + MaterialCategoryNum + } + }) +} +export function editVariety(MaterialVarietyNum, MaterialCategoryNum, MaterialVariety2, VarietyNumber, Specifications1, Specifications2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_物料品种编号_修改数据', + param: '物料品种流水号=' + MaterialVarietyNum + '&物料类别流水号=' + MaterialCategoryNum + '&物料品种=' + MaterialVariety2 + '&品种编号=' + VarietyNumber + '&规格1=' + Specifications1 + '&规格2=' + Specifications2 + } + }) +} +export function addVariety(MaterialCategoryNum, MaterialVariety2, VarietyNumber, Specifications1, Specifications2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_物料品种编号_增加数据', + param: '物料类别流水号=' + MaterialCategoryNum + '&物料品种=' + MaterialVariety2 + '&品种编号=' + VarietyNumber + '&规格1=' + Specifications1 + '&规格2=' + Specifications2 + } + }) +} +export function deleteVariety(MaterialVarietyNum) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_物料品种编号_删除数据', + param: '物料品种流水号=' + MaterialVarietyNum + } + }) +} diff --git a/src/api/PurchasingCenter/PurchaseTaskAllocate.js b/src/api/PurchasingCenter/PurchaseTaskAllocate.js index f9a5dd9c..a3ff15f7 100644 --- a/src/api/PurchasingCenter/PurchaseTaskAllocate.js +++ b/src/api/PurchasingCenter/PurchaseTaskAllocate.js @@ -47,4 +47,15 @@ export function allocateTask(group, person) { param: `标准件和外购件流水号组=${group}&人员编号=${person}` } }) +}// 执行退回 +export function executeReturn(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购部采购_退回物料', + param: `标准件和外购件流水号组=${params[0]}&组件零件流水号组=${params[1]}` + } + }) } diff --git a/src/api/PurchasingCenter/ReceiptConnectionSheet.js b/src/api/PurchasingCenter/ReceiptConnectionSheet.js index e916b988..24c00416 100644 --- a/src/api/PurchasingCenter/ReceiptConnectionSheet.js +++ b/src/api/PurchasingCenter/ReceiptConnectionSheet.js @@ -49,8 +49,8 @@ export function deleteInvoice(num1) { } }) } -// 传送人接收人初始化 采购科改16 -export function initPerson() { +// 传送人初始化 采购科改16 +export function initSender() { return request({ url: '', method: 'post', @@ -61,6 +61,18 @@ export function initPerson() { } }) } +// 接收人初始化 财务部7 +export function initReceiver() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=7' + } + }) +} // 初始化合同号 export function initContract() { return request({ diff --git a/src/api/PurchasingCenter/ReceiveCheck.js b/src/api/PurchasingCenter/ReceiveCheck.js index 8fe18b05..7491a60d 100644 --- a/src/api/PurchasingCenter/ReceiveCheck.js +++ b/src/api/PurchasingCenter/ReceiveCheck.js @@ -12,15 +12,14 @@ export function initProject() { }) } // 初始化项目金额统计表 -export function searchReceiveCheck(pageCurrent, pageSize, check, num) { +export function searchReceiveCheck(check, num) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_领用核算_查询数据', - param: `项目流水号_check=${check}&项目流水号=${num}`, - Pagination: pageCurrent + '&' + pageSize + param: `项目流水号_check=${check}&项目流水号=${num}` } }) } diff --git a/src/api/PurchasingCenter/qrcodeGeneration.js b/src/api/PurchasingCenter/qrcodeGeneration.js deleted file mode 100644 index e69de29b..00000000 diff --git a/src/api/TechnologyCenter/CreatePackingList.js b/src/api/TechnologyCenter/CreatePackingList.js index 82c9e20b..6080da49 100644 --- a/src/api/TechnologyCenter/CreatePackingList.js +++ b/src/api/TechnologyCenter/CreatePackingList.js @@ -148,7 +148,7 @@ export function deleteFileData(num) { data: { type: '2', name: 'PDM_装箱单_随机技术文件_删除数据', - param: `序号=${num}` + param: `文件编号=${num}` } }) } @@ -160,7 +160,7 @@ export function editFileData(name, number, remark, num) { data: { type: '2', name: 'PDM_装箱单_随机技术文件_修改数据', - param: `名称=${name}&数量=${number}&备注=${remark}&序号=${num}` + param: `名称=${name}&数量=${number}&备注=${remark}&文件编号=${num}` } }) } @@ -196,24 +196,24 @@ export function deleteSpareData(num) { data: { type: '2', name: 'PDM_装箱单_备件_删除数据', - param: `序号=${num}` + param: `备件编号=${num}` } }) } -export function editSpareData(name, specification, number, unit, remark, num) { +export function editSpareData(name, specification, unit, number, remark, num) { return request({ url: '', method: 'post', data: { type: '2', name: 'PDM_装箱单_备件_修改数据', - param: `名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&序号=${num}` + param: `名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&备件编号=${num}` } }) } -export function addSpareData(name, specification, number, unit, remark, num) { +export function addSpareData(name, specification, unit, number, remark, num) { return request({ url: '', method: 'post', diff --git a/src/api/WorkshopProcurement/ArrivalStateSearch.js b/src/api/WorkshopProcurement/ArrivalStateSearch.js index d0801afc..9e9ac3c6 100644 --- a/src/api/WorkshopProcurement/ArrivalStateSearch.js +++ b/src/api/WorkshopProcurement/ArrivalStateSearch.js @@ -31,7 +31,19 @@ export function searchArrivalNum(num) { method: 'post', data: { type: '1', - name: '车间管理_合同物料到货情况_查询数据', + name: '车间管理_合同物料到货情况_查询数据_外购件', + param: `采购合同流水号=${num}` + } + }) +} +// 查询到货情况 +export function searchArrivalNum1(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间管理_合同物料到货情况_查询数据_基本件', param: `采购合同流水号=${num}` } }) diff --git a/src/api/WorkshopProcurement/CreatingProcurementContracts.js b/src/api/WorkshopProcurement/CreatingProcurementContracts.js index 16135d69..ab7507e1 100644 --- a/src/api/WorkshopProcurement/CreatingProcurementContracts.js +++ b/src/api/WorkshopProcurement/CreatingProcurementContracts.js @@ -44,6 +44,28 @@ export function searchData(num) { } }) } +export function searchData1(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间管理_基本件采购_请购单明细_查询数据_外购件', + param: '请购单流水号=' + num + } + }) +} +export function searchData2(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间管理_基本件采购_请购单明细_查询数据_基本件', + param: '请购单流水号=' + num + } + }) +} // 初始化付款时间节点 export function initPayTimeNode() { return request({ @@ -116,14 +138,14 @@ export function searchSheetContract(num1) { }) } // 生成采购合同 -export function doneContract(num1, RequisitionNumber, name1, time1, time2, method, num2, text, freight, num3, partsNum, priceGroup, dayGroup, payGroup, planGroup, taxGroup, currency, num4, id) { +export function doneContract(num1, RequisitionNumber, name1, time1, time2, method, num2, text, freight, num3, partsNum, priceGroup, payGroup, planGroup, taxGroup, currency, num4, id) { return request({ url: '', method: 'post', data: { type: '2', name: '车间管理_基本件采购_请购单和请购单明细_增加数据', - param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&付款方式=${method}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&发货天数组=${dayGroup}&付款比例组=${payGroup}&计划付款时间组=${planGroup}&税率组=${taxGroup}&币种流水号组=${currency}` + param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&付款方式=${method}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&付款比例组=${payGroup}&计划付款时间组=${planGroup}&税率组=${taxGroup}&币种流水号组=${currency}` } }) } diff --git a/src/api/WorkshopProcurement/DepartmentBuyerRequestFund.js b/src/api/WorkshopProcurement/DepartmentBuyerRequestFund.js index bae165af..a72528d8 100644 --- a/src/api/WorkshopProcurement/DepartmentBuyerRequestFund.js +++ b/src/api/WorkshopProcurement/DepartmentBuyerRequestFund.js @@ -8,7 +8,7 @@ export function searchTable1(pageCurrent, pageSize, check1, start, end, check2, data: { type: '1', name: '车间采购管理_请款表_查询数据', - param: '时间段_check=' + check1 + '&开始时间=' + start + '&结束时间=' + end + '&合同号_check=' + check2 + '&采购合同编号=' + num1 + '&采购员_check=' + check3 + '&采购员姓名=' + name1 + '&供应商_check=' + check4 + '&供应商名称=' + name2, + param: '时间段_check=' + check1 + '&开始时间=' + start + '&结束时间=' + end + '&合同号_check=' + check2 + '&采购合同编号=' + num1 + '&采购员_check=' + check3 + '&采购员流水号=' + name1 + '&供应商_check=' + check4 + '&供应商名称=' + name2, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/WorkshopProcurement/ProcurementContractApproval.js b/src/api/WorkshopProcurement/ProcurementContractApproval.js index 93ed84ff..85945460 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: '车间采购管理_采购合同_查询_cjn' } }) } @@ -43,7 +43,19 @@ export function searchTable2(num) { method: 'post', data: { type: '1', - name: '车间采购管理_采购合同明细_查询数据', + name: '车间采购管理_采购合同_查询数据_外购件', + param: '采购合同流水号=' + num + } + }) +} +// 采购合同明细查询 +export function searchTable3(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购合同_查询数据_基本件', param: '采购合同流水号=' + num } }) diff --git a/src/api/WorkshopProcurement/ProcurementContractEnquiry.js b/src/api/WorkshopProcurement/ProcurementContractEnquiry.js index f27db9ed..b0ca1546 100644 --- a/src/api/WorkshopProcurement/ProcurementContractEnquiry.js +++ b/src/api/WorkshopProcurement/ProcurementContractEnquiry.js @@ -7,7 +7,7 @@ export function initContract() { method: 'post', data: { type: '1', - name: '采购管理_采购合同_查询_cjn' + name: '车间采购管理_采购合同_查询_cjn' } }) } @@ -43,7 +43,19 @@ export function searchTable2(num) { method: 'post', data: { type: '1', - name: '车间采购管理_采购合同明细_查询数据', + name: '车间采购管理_采购合同_查询数据_外购件', + param: '采购合同流水号=' + num + } + }) +} +// 采购合同明细查询 +export function searchTable3(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购合同_查询数据_基本件', param: '采购合同流水号=' + num } }) diff --git a/src/api/WorkshopProcurement/ProjectTotalSearch.js b/src/api/WorkshopProcurement/ProjectTotalSearch.js index 3a5a46d3..dcc933bc 100644 --- a/src/api/WorkshopProcurement/ProjectTotalSearch.js +++ b/src/api/WorkshopProcurement/ProjectTotalSearch.js @@ -30,7 +30,19 @@ export function searchProjectTotal1(num) { method: 'post', data: { type: '1', - name: '车间采购管理_项目总价_明细_查询数据', + name: '车间采购管理_项目总价_明细_查询数据_外购件', + param: `项目流水号=${num}` + } + }) +} +// 初始化项目金额统计表 +export function searchProjectTotal2(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_项目总价_明细_查询数据_基本件', param: `项目流水号=${num}` } }) diff --git a/src/api/WorkshopProcurement/PurchaseContractChange.js b/src/api/WorkshopProcurement/PurchaseContractChange.js index 05bf1b08..bc8cae34 100644 --- a/src/api/WorkshopProcurement/PurchaseContractChange.js +++ b/src/api/WorkshopProcurement/PurchaseContractChange.js @@ -11,6 +11,17 @@ export function initContract() { } }) } +// 初始化合同号 +export function initContract1() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购合同变更_合同初始化' + } + }) +} // 初始化采购员(考核部门编号：采购部：2) export function initBuyer() { return request({ @@ -43,7 +54,19 @@ export function searchTable2(num) { method: 'post', data: { type: '1', - name: '车间采购管理_采购合同明细_查询数据', + name: '车间采购管理_采购合同_查询数据_外购件', + param: '采购合同流水号=' + num + } + }) +} +// 采购合同明细查询 +export function searchTable5(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购合同_查询数据_基本件', param: '采购合同流水号=' + num } }) @@ -56,7 +79,7 @@ export function searchTable3(pageCurrent, pageSize, check1, start, end, check2, data: { type: '1', name: '车间采购管理_采购合同变更_查询数据_根据条件_cjn', - param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier, + param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同变更流水号_check=' + check2 + '&采购合同变更流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier, Pagination: pageCurrent + '&' + pageSize } }) @@ -68,7 +91,18 @@ export function searchTable4(num) { method: 'post', data: { type: '1', - name: '车间采购管理_采购合同明细变更_查询数据', + name: '车间采购管理_采购合同明细变更_查询数据_外购件', + param: '采购合同变更流水号=' + num + } + }) +} +export function searchTable6(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购合同明细变更_查询数据_基本件', param: '采购合同变更流水号=' + num } }) diff --git a/src/icons/svg/EquipmentCapabilitySetting.svg b/src/icons/svg/EquipmentCapabilitySetting.svg new file mode 100644 index 00000000..f265e976 --- /dev/null +++ b/src/icons/svg/EquipmentCapabilitySetting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/InterBudgetaryBudgets.svg b/src/icons/svg/InterBudgetaryBudgets.svg new file mode 100644 index 00000000..3b6092af --- /dev/null +++ b/src/icons/svg/InterBudgetaryBudgets.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MaintenanceEquipmentPerson.svg b/src/icons/svg/MaintenanceEquipmentPerson.svg new file mode 100644 index 00000000..61e37ab8 --- /dev/null +++ b/src/icons/svg/MaintenanceEquipmentPerson.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MaterialMaintenance.svg b/src/icons/svg/MaterialMaintenance.svg new file mode 100644 index 00000000..1e96b8ca --- /dev/null +++ b/src/icons/svg/MaterialMaintenance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MaterialManagement.svg b/src/icons/svg/MaterialManagement.svg new file mode 100644 index 00000000..04d16d08 --- /dev/null +++ b/src/icons/svg/MaterialManagement.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutFactoryMaintenance.svg b/src/icons/svg/OutFactoryMaintenance.svg new file mode 100644 index 00000000..232d82de --- /dev/null +++ b/src/icons/svg/OutFactoryMaintenance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutsourcingDataMaintenance.svg b/src/icons/svg/OutsourcingDataMaintenance.svg new file mode 100644 index 00000000..c0666d55 --- /dev/null +++ b/src/icons/svg/OutsourcingDataMaintenance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutsourcingInspectionEntry.svg b/src/icons/svg/OutsourcingInspectionEntry.svg new file mode 100644 index 00000000..3db054d4 --- /dev/null +++ b/src/icons/svg/OutsourcingInspectionEntry.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutsourcingPaymentPlanManagement.svg b/src/icons/svg/OutsourcingPaymentPlanManagement.svg new file mode 100644 index 00000000..3644bfe7 --- /dev/null +++ b/src/icons/svg/OutsourcingPaymentPlanManagement.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutsourcingTaskExecution.svg b/src/icons/svg/OutsourcingTaskExecution.svg new file mode 100644 index 00000000..0ac127f6 --- /dev/null +++ b/src/icons/svg/OutsourcingTaskExecution.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutsourcingTaskQuery.svg b/src/icons/svg/OutsourcingTaskQuery.svg new file mode 100644 index 00000000..fc3107f5 --- /dev/null +++ b/src/icons/svg/OutsourcingTaskQuery.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/PreorderAssociation.svg b/src/icons/svg/PreorderAssociation.svg new file mode 100644 index 00000000..422943c0 --- /dev/null +++ b/src/icons/svg/PreorderAssociation.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ProcessingStatusEdit.svg b/src/icons/svg/ProcessingStatusEdit.svg new file mode 100644 index 00000000..4a78ad01 --- /dev/null +++ b/src/icons/svg/ProcessingStatusEdit.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/SystemRrolemaintenance.svg b/src/icons/svg/SystemRrolemaintenance.svg new file mode 100644 index 00000000..f8b61ee9 --- /dev/null +++ b/src/icons/svg/SystemRrolemaintenance.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.sfont.cn + + \ No newline at end of file diff --git a/src/icons/svg/UnqualifiedTreatment.svg b/src/icons/svg/UnqualifiedTreatment.svg new file mode 100644 index 00000000..bd787aef --- /dev/null +++ b/src/icons/svg/UnqualifiedTreatment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/WorkshopPersonnelRoleMana.svg b/src/icons/svg/WorkshopPersonnelRoleMana.svg new file mode 100644 index 00000000..ebb30837 --- /dev/null +++ b/src/icons/svg/WorkshopPersonnelRoleMana.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.sfont.cn + + \ No newline at end of file diff --git a/src/icons/svg/WorkshopProcessMaintenance.svg b/src/icons/svg/WorkshopProcessMaintenance.svg new file mode 100644 index 00000000..48ec54db --- /dev/null +++ b/src/icons/svg/WorkshopProcessMaintenance.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.sfont.cn + + \ No newline at end of file diff --git a/src/utils/curd.js b/src/utils/curd.js index 3cca2d30..d1374579 100644 --- a/src/utils/curd.js +++ b/src/utils/curd.js @@ -79,9 +79,6 @@ export default { }) } } - if (this[carrier].length !== 0) { - this[carrier] = response.data[0][select[0]] - } }) } else { requestData(param).then(response => { // 这个方法没什么难度，不注释了 @@ -139,7 +136,7 @@ export default { // 3）接受值，数组，一般是['table','total','loading']顺序不能变 Vue.prototype.getTable = function(requestData, param, e) { requestData(...param).then(response => { - const data = response.data.rows ? response.data.rows : response.data + const data = response.data.rows this[e[0]] = [] this[e[1]] = 0 if (data && data.length > 0) { @@ -159,9 +156,7 @@ export default { // console.log('暂无数据') } }).then(() => { - if (this[e[2]]) { - this[e[2]] = false - } + this[e[2]] = false }) } // 添加表格数据 @@ -172,6 +167,7 @@ export default { // 4) 回调函数，必须 Vue.prototype.addTable = function(requestData, param, form, callback) { if (type(callback) === 'function' && type(requestData) === 'function' && type(form) === 'string') { + console.log(this.$refs[form]) this.$refs[form].validate((valid) => { if (valid) { requestData(...param).then(response => { diff --git a/src/utils/request.js b/src/utils/request.js index 590710b7..2c735cb7 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,15 +3,29 @@ import axios from 'axios' // import store from '../store' // import { getToken } from '@/utils/auth' -export const wsuri = `ws://192.168.1.128:61101//WebMoudule//websocket` +export const wsuri = `ws://192.168.1.149:61101//WebMoudule//websocket` export const name = `OP8888` // 创建axios实例 export const upload = `http://localhost:8411/submit/uploadFile.ashx` export const download = `http://localhost:8411/submit/downloadFile.ashx` const service = axios.create({ +<<<<<<< HEAD baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, +======= + + // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, + // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, +>>>>>>> 7cdb10d153358b72f95165dd7f3a12ad7675f14d // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, + + baseURL: `http://192.168.0.105:8411/submit/MESCommonBase.ashx`, + // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, + + // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, + // baseURL: `http://192.168.137.85:8411/submit/MESCommonBase.ashx`, // 李鑫 + + // baseURL: `http://192.168.1.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/vendor/Export2Excelcjn.js b/src/vendor/Export2Excelcjn.js new file mode 100644 index 00000000..64952a91 --- /dev/null +++ b/src/vendor/Export2Excelcjn.js @@ -0,0 +1,206 @@ +/* eslint-disable */ +require('script-loader!file-saver'); +import XLSX from 'xlsx' + +function generateArray(table) { + var out = []; + var rows = table.querySelectorAll('tr'); + var ranges = []; + for (var R = 0; R < rows.length; ++R) { + var outRow = []; + var row = rows[R]; + var columns = row.querySelectorAll('td'); + for (var C = 0; C < columns.length; ++C) { + var cell = columns[C]; + var colspan = cell.getAttribute('colspan'); + var rowspan = cell.getAttribute('rowspan'); + var cellValue = cell.innerText; + if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue; + + //Skip ranges + ranges.forEach(function (range) { + if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) { + for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null); + } + }); + + //Handle Row Span + if (rowspan || colspan) { + rowspan = rowspan || 1; + colspan = colspan || 1; + ranges.push({ + s: { + r: R, + c: outRow.length + }, + e: { + r: R + rowspan - 1, + c: outRow.length + colspan - 1 + } + }); + }; + + //Handle Value + outRow.push(cellValue !== "" ? cellValue : null); + + //Handle Colspan + if (colspan) + for (var k = 0; k < colspan - 1; ++k) outRow.push(null); + } + out.push(outRow); + } + return [out, ranges]; +}; + +function datenum(v, date1904) { + if (date1904) v += 1462; + var epoch = Date.parse(v); + return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000); +} + +function sheet_from_array_of_arrays(data, opts) { + var ws = {}; + var range = { + s: { + c: 10000000, + r: 10000000 + }, + e: { + c: 0, + r: 0 + } + }; + for (var R = 0; R != data.length; ++R) { + for (var C = 0; C != data[R].length; ++C) { + if (range.s.r > R) range.s.r = R; + if (range.s.c > C) range.s.c = C; + if (range.e.r < R) range.e.r = R; + if (range.e.c < C) range.e.c = C; + var cell = { + v: data[R][C] + }; + if (cell.v == null) continue; + var cell_ref = XLSX.utils.encode_cell({ + c: C, + r: R + }); + + if (typeof cell.v === 'number') cell.t = 'n'; + else if (typeof cell.v === 'boolean') cell.t = 'b'; + else if (cell.v instanceof Date) { + cell.t = 'n'; + cell.z = XLSX.SSF._table[14]; + cell.v = datenum(cell.v); + } else cell.t = 's'; + + ws[cell_ref] = cell; + } + } + if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range); + return ws; +} + +function Workbook() { + if (!(this instanceof Workbook)) return new Workbook(); + this.SheetNames = []; + this.Sheets = {}; +} + +function s2ab(s) { + var buf = new ArrayBuffer(s.length); + var view = new Uint8Array(buf); + for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF; + return buf; +} + +export function export_table_to_excel(id) { + var theTable = document.getElementById(id); + var oo = generateArray(theTable); + var ranges = oo[1]; + + /* original data */ + var data = oo[0]; + var ws_name = "SheetJS"; + + var wb = new Workbook(), + ws = sheet_from_array_of_arrays(data); + + /* add ranges to worksheet */ + // ws['!cols'] = ['apple', 'banan']; + ws['!merges'] = ranges; + + /* add worksheet to workbook */ + wb.SheetNames.push(ws_name); + wb.Sheets[ws_name] = ws; + + var wbout = XLSX.write(wb, { + bookType: 'xlsx', + bookSST: false, + type: 'binary' + }); + + saveAs(new Blob([s2ab(wbout)], { + type: "application/octet-stream" + }), "test.xlsx") +} + +export function export_json_to_excel({ + header, + data, + filename, + autoWidth = true, + bookType= 'xlsx' +} = {}) { + /* original data */ + filename = filename || 'excel-list' + data = [...data] + data.unshift(header); + var ws_name = filename || 'excel-list'; + var wb = new Workbook(), + ws = sheet_from_array_of_arrays(data); + + if (autoWidth) { + /*设置worksheet每列的最大宽度*/ + const colWidth = data.map(row => row.map(val => { + /*先判断是否为null/undefined*/ + if (val == null) { + return { + 'wch': 10 + }; + } + /*再判断是否为中文*/ + else if (val.toString().charCodeAt(0) > 255) { + return { + 'wch': val.toString().length * 2 + }; + } else { + return { + 'wch': val.toString().length + }; + } + })) + /*以第一行为初始值*/ + let result = colWidth[0]; + for (let i = 1; i < colWidth.length; i++) { + for (let j = 0; j < colWidth[i].length; j++) { + if (result[j]['wch'] < colWidth[i][j]['wch']) { + result[j]['wch'] = colWidth[i][j]['wch']; + } + } + } + ws['!cols'] = result; + } + + /* add worksheet to workbook */ + wb.SheetNames.push(ws_name); + wb.Sheets[ws_name] = ws; + + var wbout = XLSX.write(wb, { + bookType: bookType, + bookSST: false, + type: 'binary' + }); + saveAs(new Blob([s2ab(wbout)], { + type: "application/octet-stream" + }), `${filename}.${bookType}`); +} diff --git a/src/views/Assembly/AssemblyInformationInput/index.vue b/src/views/Assembly/AssemblyInformationInput/index.vue index 4f0d9cf5..3d00b82c 100644 --- a/src/views/Assembly/AssemblyInformationInput/index.vue +++ b/src/views/Assembly/AssemblyInformationInput/index.vue @@ -137,7 +137,7 @@ 取消 - 确认 + 确认 diff --git a/src/views/Assembly/AssemblyPlan/index.vue b/src/views/Assembly/AssemblyPlan/index.vue index 4b70def5..696552ad 100644 --- a/src/views/Assembly/AssemblyPlan/index.vue +++ b/src/views/Assembly/AssemblyPlan/index.vue @@ -62,7 +62,7 @@ @@ -144,9 +144,9 @@ export default { this.machineNumberValue ? this.check1 = 1 : this.check1 = 0 searchTable(this.check, this.projectValue, this.check1, this.machineNumberValue, this.check2, this.startEndDate[0], this.startEndDate[1], this.pageCurrent, this.pageSize).then(response => { for (let i = 0; i < response.data.rows.length; i++) { - console.log(response.data.rows[i].项目计划完成时间) - if (response.data.rows[i].项目计划完成时间 !== '') { - response.data.rows[i].项目计划完成时间 = (response.data.rows[i].项目计划完成时间).split(' ')[0] + console.log(response.data.rows[i].发货节点) + if (response.data.rows[i].发货节点 !== '') { + response.data.rows[i].发货节点 = (response.data.rows[i].发货节点).split(' ')[0] } } this.tableData = response.data.rows diff --git a/src/views/Assembly/AssemblyProcessPlanning/index.vue b/src/views/Assembly/AssemblyProcessPlanning/index.vue index 643b9306..92e53c03 100644 --- a/src/views/Assembly/AssemblyProcessPlanning/index.vue +++ b/src/views/Assembly/AssemblyProcessPlanning/index.vue @@ -206,7 +206,7 @@ - + {{ list.工艺内容及装配具体要求 }} {{ list.质检 }} {{ list.工时 }} - {{ list.装配员 }} - {{ list.检验员 }} - {{ list.备注 }} + + + diff --git a/src/views/BasicData/EquipmentCapabilitySetting/index.vue b/src/views/BasicData/EquipmentCapabilitySetting/index.vue new file mode 100644 index 00000000..aaf9fe2d --- /dev/null +++ b/src/views/BasicData/EquipmentCapabilitySetting/index.vue @@ -0,0 +1,305 @@ + + + + + diff --git a/src/views/BasicData/MaintenanceEquipmentPerson/index.vue b/src/views/BasicData/MaintenanceEquipmentPerson/index.vue new file mode 100644 index 00000000..bf91fc18 --- /dev/null +++ b/src/views/BasicData/MaintenanceEquipmentPerson/index.vue @@ -0,0 +1,251 @@ + + + + + diff --git a/src/views/BasicData/MaterialMaintenance/index.vue b/src/views/BasicData/MaterialMaintenance/index.vue new file mode 100644 index 00000000..afd74ae3 --- /dev/null +++ b/src/views/BasicData/MaterialMaintenance/index.vue @@ -0,0 +1,199 @@ + + + + + diff --git a/src/views/BasicData/PersonnelManagement/index.vue b/src/views/BasicData/PersonnelManagement/index.vue index e8d75235..56a3237e 100644 --- a/src/views/BasicData/PersonnelManagement/index.vue +++ b/src/views/BasicData/PersonnelManagement/index.vue @@ -537,13 +537,8 @@ export default { } }, addPeople() { - this.people_title = '新增人员' - this.people_DFV = true - this.addForm('people_form') - }, - submitAddPeople() { - this.people_DFV = false if (this.id) { +<<<<<<< HEAD addPeople(this.id, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => { if (response.data[0].result === '1') { this.i = 1 @@ -553,10 +548,27 @@ export default { this.$message.error('添加失败') } }) +======= + this.people_title = '新增人员' + this.people_DFV = true + this.addForm('people_form') +>>>>>>> 7cdb10d153358b72f95165dd7f3a12ad7675f14d } else { this.$message.warning(`请选择部门名称`) } }, + submitAddPeople() { + this.people_DFV = false + addPeople(this.id, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => { + if (response.data[0].result === '1') { + this.i = 1 + this.handleNodeClick() + this.$message.success('添加成功') + } else { + this.$message.error('添加失败') + } + }) + }, handleEditPeople(row) { this.people_title = '编辑人员' this.people_DFV = true diff --git a/src/views/BasicData/SystemRrolemaintenance/index.vue b/src/views/BasicData/SystemRrolemaintenance/index.vue new file mode 100644 index 00000000..d43cd398 --- /dev/null +++ b/src/views/BasicData/SystemRrolemaintenance/index.vue @@ -0,0 +1,218 @@ + + + + + diff --git a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue new file mode 100644 index 00000000..627dcda8 --- /dev/null +++ b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue @@ -0,0 +1,399 @@ + + + + + diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue new file mode 100644 index 00000000..8d45eb2c --- /dev/null +++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue @@ -0,0 +1,567 @@ + + + + + diff --git a/src/views/Inventory/DirectPart/index.vue b/src/views/Inventory/DirectPart/index.vue index 22dcde9c..efda0f78 100644 --- a/src/views/Inventory/DirectPart/index.vue +++ b/src/views/Inventory/DirectPart/index.vue @@ -268,9 +268,8 @@ export default { this.PeopleNumber = this.id }, searchMachine() { // 查询机床 - if (this.ProjectValue === '') { - this.ProjectValue_check = 0 - } + this.Machine = [] + this.ProjectValue ? this.ProjectValue_check = 1 : this.ProjectValue_check = 0 searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => { for (let i = 0; i < response.data.length; i++) { this.Machine.push({ @@ -281,6 +280,7 @@ export default { }) }, searchGroupList() { // 查询组号 + this.GroupNum = [] searchTeam(this.MachineValue).then(response => { for (let i = 0; i < response.data.length; i++) { this.GroupNum.push({ @@ -291,16 +291,19 @@ export default { }) }, searchPeopleData() { // 查询人员 + this.People = [] searchPeople().then(response => { for (let i = 0; i < response.data.length; i++) { this.People.push({ label: response.data[i].姓名, - value: response.data[i].考勤编号 + value: parseInt(response.data[i].考勤编号) }) } + console.log(this.People) }) }, searchContractData() { // 查询合同 + this.Contract = [] searchContract().then(response => { for (let i = 0; i < response.data.length; i++) { this.Contract.push({ @@ -312,18 +315,10 @@ export default { }, searchPartinfo() { this.tableDataPurchase = [] - if (this.ProjectValue === '') { - this.ProjectValue_check = 0 - } - if (this.MachineValue === '') { - this.MachineValue_check = 0 - } - if (this.GroupNumValue === '') { - this.GroupNumValue_check = 0 - } - if (this.ContractValue === '') { - this.ContractValue_check = 0 - } + this.ProjectValue ? this.ProjectValue_check = 1 : this.ProjectValue_check = 0 + this.MachineValue ? this.MachineValue_check = 1 : this.MachineValue_check = 0 + this.GroupNumValue ? this.GroupNumValue_check = 1 : this.GroupNumValue_check = 0 + this.ContractValue ? this.ContractValue_check = 1 : this.ContractValue_check = 0 this.listLoading = true searchDirectPart(this.PageCurrent, this.PageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue, this.ContractValue_check, this.ContractValue).then(response => { this.tableDataPurchase = response.data.rows @@ -349,8 +344,7 @@ export default { // 打开直达件表单 addDirect(row) { this.PeopleValue = '' - this.form = [] - console.log(row) + this.form = {} this.dialogFormVisible = true this.materialNum = row.物料流水号 this.purchaseContractNumber = row.采购合同明细流水号 @@ -367,7 +361,7 @@ export default { this.dialogFormVisible1 = true this.directPartNumber = row.直达件流水号 this.form.DirectNumber = row.到货数量 - this.PeopleValue = row.领用人员流水号 + this.PeopleValue = parseInt(row.领用人员流水号) this.form.DirectNote = row.备注 }, // 修改直达件 diff --git a/src/views/Inventory/ExchangeApproval/index.vue b/src/views/Inventory/ExchangeApproval/index.vue index 44b806c0..fd9d97ae 100644 --- a/src/views/Inventory/ExchangeApproval/index.vue +++ b/src/views/Inventory/ExchangeApproval/index.vue @@ -129,7 +129,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - approvalExchangepart(row.交换单流水号, row.交换件物料流水号, row.交换件组件零件流水号, row.交换件采购合同明细流水号, row.货位流水号, row.交换数量).then(response => { + approvalExchangepart(row.交换单流水号, row.交换件物料流水号, row.被交换件物料流水号, row.交换件组件零件流水号, row.被交换件组件零件流水号, row.交换件采购合同明细流水号, row.货位流水号, row.被交换货位流水号, row.交换数量).then(response => { if (response.data[0].result === '1') { this.$message.success('执行成功') this.searchTable1() diff --git a/src/views/Inventory/ExchangePart/index.vue b/src/views/Inventory/ExchangePart/index.vue index 064a5477..7bbb1661 100644 --- a/src/views/Inventory/ExchangePart/index.vue +++ b/src/views/Inventory/ExchangePart/index.vue @@ -71,22 +71,22 @@ +
+ +
-
- -
@@ -109,12 +109,12 @@ @@ -127,7 +127,7 @@
- 交换 + 交换
@@ -149,12 +149,12 @@ @@ -166,25 +166,7 @@ - - - - - - - - - - - - - -
- 取消 - 确 定 - 确定 -
- + +
+ +
-
- -
+ + + + + + + + + + + + + + + + + +
+ 取消 + 确 定 + 确定 +
+ diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue index fb8e7574..23bc5bb1 100644 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ b/src/views/Inventory/OfflinePartOut/index.vue @@ -93,7 +93,7 @@
取消 - 确 定 + 确定
@@ -102,7 +102,7 @@ :data="tableDataOut" border style="width: 100%;" - height="200"> + height="350"> { - if (response.data[0].result === '1') { - this.$notify({ - title: '成功', - message: '信息添加成功', - type: 'success' - }) - this.dialogFormVisible = false - this.searchDirect() - } else { - this.$message.error('信息添加失败') - } - }) - this.dialogFormVisible = false + if (this.partnumber < this.form.DirectNumber) { + this.$message.error('请正确输入数量') + } else { + outlinePartOut(this.contractNumber, this.PeopleValue, this.form.DirectNumber, this.locateNumber, this.form.DirectNote, this.form.ProjectValue, this.MachineValue, this.GroupNumValue, this.materialNumber, this.PeopleNumber).then(response => { + if (response.data[0].result === '1') { + this.$notify({ + title: '成功', + message: '信息添加成功', + type: 'success' + }) + this.dialogFormVisible = false + this.searchDirect() + } else { + this.$message.error('信息添加失败') + } + }) + this.dialogFormVisible = false + } } } } diff --git a/src/views/Inventory/PartOut/index.vue b/src/views/Inventory/PartOut/index.vue index f5a151bb..71b8ed1f 100644 --- a/src/views/Inventory/PartOut/index.vue +++ b/src/views/Inventory/PartOut/index.vue @@ -9,7 +9,7 @@ :data="tableData1" border style="width: 100%;" - height="200"> + height="300"> + height="400"> @@ -93,7 +93,7 @@ + + + + diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue index 3c8d9abe..89d9bb97 100644 --- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue @@ -10,8 +10,8 @@ partNumValue = '';typeValue = '';partName = ''; material = '';materialName = '';spec = '';batchNum = ''; searchParts()"> - 未编制 - 已编制 + 未编制 + 已编制 工艺员:
- 提交 + 提交
@@ -616,7 +616,9 @@ export default { result: 0, oldNum: '', newNum: '', - tableRecord: [] + tableRecord: [], + materialName2: '', + material2: '' } }, created() { @@ -635,15 +637,6 @@ export default { this.spec = '' this.batchNum = '' }, - // tableRowClassName({ row }) { - // for (let i = 0; i < this.tableRecord.length; i++) { - // if (this.tableRecord[i].工序流水号 === row.工序流水号 && this.radio === 2 && this.tableRecord[i].工艺编号 !== null) { // && this.tableRecord[i].工艺难度等级 !== null && this.tableRecord[i].工艺要求 !== null - // if (this.tableRecord[i].工艺编号 !== row.工艺编号 || this.tableRecord[i].工艺要求 !== row.工艺要求 || this.tableRecord[i].工艺难度等级 !== row.工艺难度等级 || this.tableRecord[i].工序顺序 !== row.工序顺序) { - // return 'change' - // } - // } - // } - // }, returnEdit() { // 在制零件工艺修改 if (this.partNumValue === '' || this.partNumValue === null) { this.$message.error('请选择零件') @@ -688,10 +681,17 @@ export default { } }, selectMaterial(row) { // 选择材质 + this.materialName2 = '' + this.material2 = '' + this.materialName2 = row.材料 + this.material2 = row.材料流水号 + }, + selectMaterial2() { this.materialName = '' this.material = '' - this.materialName = row.材料 - this.material = row.材料流水号 + this.materialName = this.materialName2 + this.material = this.material2 + this.dialogMaterial = false }, fetchData() { this.materialClass = [] @@ -923,10 +923,8 @@ export default { this.tableData[i].工艺难度等级 = this.tableData2[i].工艺难度等级 this.tableData[i].工艺要求 = this.tableData2[i].工艺要求 selectRequest(this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号, this.tableData2[i].工艺编号, this.tableData2[i].工艺序号, this.tableData2[i].工艺要求).then(response => { - console.log('该工艺保存成功', 501) }) hardEdit(this.tableData[i].工序流水号, this.tableData2[i].工艺难度等级).then(response => { - console.log(response.data, '难度等级修改成功', 502) }) this.dialogFormVisible = false } @@ -970,7 +968,6 @@ export default { this.$message.error('请在主界面选择一个零件作为被拷贝对象') } else { gongyiCopy(this.num, this.partNumValue).then(() => { // 工艺计划流水号_完成工艺, 工艺计划流水号_被拷工艺 - console.log('已拷贝到主表', 503) this.searchDetail() }) } @@ -985,18 +982,15 @@ export default { } } gongyiYQ(this.num).then(response => { - console.log(response.data, 119) this.tableData4 = response.data }) }, hardEdit(row) { // 修改难度等级 hardEdit(row.工序流水号, row.工艺难度等级).then(response => { - console.log(response.data, '难度等级修改成功', 504) }) }, requestEdit(row) { // 修改工艺要求 requestEdit(row.工序流水号, row.工艺要求).then(response => { - console.log(response.data, '工艺要求修改成功', 505) }) }, tableSearch(index) { // 主界面工艺名称分类、工艺名称及工艺要求后续查询 @@ -1027,7 +1021,10 @@ export default { } }, cChange() { // 工艺名称分类改变 + this.processNameValue = '' this.processName = [] + this.processRequestValue = '' + this.processRequest = [] for (let i = 0; i < this.processNameClass.length; i++) { if (this.processNameClassValue === this.processNameClass[i].value) { processNameSelect(this.processSelect[i].value).then(response => { // 查询工艺名称 @@ -1042,6 +1039,7 @@ export default { } }, nChange() { // 工艺名称改变 + this.processRequestValue = '' this.processRequest = [] for (let i = 0; i < this.processName.length; i++) { if (this.processNameValue === this.processName[i].value) { @@ -1063,7 +1061,6 @@ export default { this.tableData[this.index].工艺要求 = this.str this.dialogFormVisible2 = false selectRequest(this.tableData[this.index].工序流水号, this.tableData[this.index].工艺计划流水号, this.tableData[this.index].工艺编号, this.tableData[this.index].工序顺序, this.tableData[this.index].工艺要求).then(response => { - console.log('该工艺保存成功', 506) }) }, calTol() { // 计算公差 @@ -1114,7 +1111,6 @@ export default { this.$message.error('请先选择一个零件') } else { insertOne(this.partNumValue, row.工序流水号).then(response => { - console.log(response.data, '插入成功', 507) this.searchDetail() }) } @@ -1145,7 +1141,6 @@ export default { this.$message.error('请先选择一个零件') } else { upOne(this.partNumValue, row.工序流水号).then(response => { - console.log(response.data, '上移成功', 508) this.searchDetail() }) } @@ -1155,7 +1150,6 @@ export default { this.$message.error('请先选择一个零件') } else { downOne(this.partNumValue, row.工序流水号).then(response => { - console.log(response.data, '下移成功', 509) this.searchDetail() }) } @@ -1198,7 +1192,6 @@ export default { }).then(() => { for (let i = 0; i < 30; i++) { hardEdit(this.tableData[i].工序流水号, '').then(response => { - console.log(response.data, '清空难度等级', 510) }) } deleteTable(this.newNum).then(response => { diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue index 33fe4419..87f6c63d 100644 --- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue @@ -40,11 +40,11 @@ 查询 进度颜色： - 拖期 即将拖期 如期 工序外协 + 报废 @@ -396,7 +396,6 @@ export default { this.Groups = [] if (this.project !== '') { getMachines(this.project).then(response => { - console.log(response.data) for (let i = 0; i < response.data.length; i++) { this.Machines.push({ label: response.data[i].机床图号, diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue new file mode 100644 index 00000000..5133f0e9 --- /dev/null +++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue @@ -0,0 +1,733 @@ + + + + + diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue index eaac00f1..c526014d 100644 --- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue +++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue @@ -73,12 +73,12 @@ type="selection" align="center" width="35"/> - + - + @@ -103,42 +103,42 @@ {{ scope.row.工序数量 }} - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -1206,6 +1206,7 @@ export default { if (this.零件图号.length !== 0) { for (let i = 0; i < this.零件图号.length; i++) { selection2(this.工艺计划流水号[i]).then(response => { + console.log(response.data, 2) for (let k = 0; k < response.data.length; k++) { this.process[i][k] = response.data[k].工艺名称简称 this.planDate[i][k] = response.data[k].计划日期_短 @@ -1472,7 +1473,6 @@ export default { }).then(() => { plan(this.tableData1[i].工艺计划流水号).then(response => { if (this.tableData1[i].平衡次数 !== 0 || this.tableData1[i].是否焊接 !== 1) { - console.log(this.tableData1[i].平衡次数, 111) this.result1 += parseInt(response.data[0].result) if (this.result1 === this.length) { this.$message.success('零件计划制定成功') diff --git a/src/views/ManufacturingCenter/QuotaFormulation/index.vue b/src/views/ManufacturingCenter/QuotaFormulation/index.vue index e893d321..63d20dc6 100644 --- a/src/views/ManufacturingCenter/QuotaFormulation/index.vue +++ b/src/views/ManufacturingCenter/QuotaFormulation/index.vue @@ -308,6 +308,7 @@ export default { this.result += parseInt(response.data[0].result) if (this.result === this.tableData.length) { this.$message.success('保存成功') + this.typeChange() } else if (response.data[0].result === '0') { this.$message.error('第' + (i + 1) + '行保存失败') } diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue index d82822f5..114b821e 100644 --- a/src/views/ManufacturingCenter/StatusQuery/index.vue +++ b/src/views/ManufacturingCenter/StatusQuery/index.vue @@ -122,10 +122,10 @@
- - - - + + + +
- 取消 - 确定 + 取消 + 确定
@@ -267,6 +267,7 @@ export default { groupNum: null, // 组件流水号 partNumber: '', // 零件号 partStateValue: null, // 零件状态 + partStateValue1: null, partState: [], // 零件状态数组 partTypeValue: null, // 零件类型 num: null, @@ -300,15 +301,7 @@ export default { }, { value: 2, label: '外协生产' - }], - form: { - 零件状态: null - }, - rules: { - 零件状态: [ - { required: true, message: '请选择零件状态', trigger: 'change' } - ] - } + }] } }, created() { @@ -442,34 +435,24 @@ export default { this.dialogFormVisible3 = false }, handleEdit(row) { - if (this.$refs['form'] !== undefined) { - this.$refs['form'].resetFields() - } - this.form = {} + console.log(row) this.title = '编辑' + this.partStateValue1 = parseInt(row.考核状态) + 2 this.dialogFormVisible4 = true this.num = row.工艺计划流水号 }, - submitEdit(formName) { // 提交编辑 - this.$refs[formName].validate((valid) => { - if (valid) { - editData(this.num, this.form.零件状态).then(response => { - if (response.data[0].result === '1') { - this.$message.success('编辑成功') - this.dialogFormVisible4 = false - this.pageCurrent = 1 - this.searchData() - } else { this.$message.error('编辑失败') } - }) - } else { - return false - } + submitEdit() { // 提交编辑 + editData(this.num, this.partStateValue1).then(response => { + if (response.data[0].result === '1') { + this.$message.success('编辑成功') + this.dialogFormVisible4 = false + this.pageCurrent = 1 + this.searchData() + } else { this.$message.error('编辑失败') } }) }, - cancel(formName) { // 取消 - this.form = {} + cancel() { // 取消 this.dialogFormVisible4 = false - this.$refs[formName].resetFields() }, handleSizeChange(val) { this.pageSize = val diff --git a/src/views/ManufacturingCenter/TypicalProcessMaintenance/index.vue b/src/views/ManufacturingCenter/TypicalProcessMaintenance/index.vue index c95d5e7f..6553cfbd 100644 --- a/src/views/ManufacturingCenter/TypicalProcessMaintenance/index.vue +++ b/src/views/ManufacturingCenter/TypicalProcessMaintenance/index.vue @@ -2,38 +2,36 @@