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/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/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..39cd829b 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(...params) { return request({ url: '', method: 'post', data: { type: '1', - name: '库存管理_替换件_替换单查询' + name: '库存管理_替换件_替换单查询', + param: `替换单编号_check=${params[0]}&替换单编号=${params[1]}&替换件名称_check=${params[2]}&替换件名称=${params[3]}` } }) } 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/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/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/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/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/request.js b/src/utils/request.js index 78c32f0b..5351b088 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -11,8 +11,12 @@ export const upload = `http://123.56.95.229:8411/submit/uploadFile.ashx` export const download = `http://123.56.95.229:8411/submit/downloadFile.ashx` const service = axios.create({ - 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`, + // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, + // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, + // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,git + // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) 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..3b86d47d --- /dev/null +++ b/src/views/BasicData/MaintenanceEquipmentPerson/index.vue @@ -0,0 +1,250 @@ + + + + + diff --git a/src/views/BasicData/MaterialMaintenance/index.vue b/src/views/BasicData/MaterialMaintenance/index.vue new file mode 100644 index 00000000..0bd061bd --- /dev/null +++ b/src/views/BasicData/MaterialMaintenance/index.vue @@ -0,0 +1,206 @@ + + + + + diff --git a/src/views/BasicData/SystemRrolemaintenance/index.vue b/src/views/BasicData/SystemRrolemaintenance/index.vue new file mode 100644 index 00000000..c7cfe2bd --- /dev/null +++ b/src/views/BasicData/SystemRrolemaintenance/index.vue @@ -0,0 +1,219 @@ + + + + + diff --git a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue new file mode 100644 index 00000000..739da3b8 --- /dev/null +++ b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue @@ -0,0 +1,383 @@ + + + + + diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue new file mode 100644 index 00000000..80c402b5 --- /dev/null +++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue @@ -0,0 +1,542 @@ + + + + + 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/ExchangePart/index.vue b/src/views/Inventory/ExchangePart/index.vue index 064a5477..a7b7500a 100644 --- a/src/views/Inventory/ExchangePart/index.vue +++ b/src/views/Inventory/ExchangePart/index.vue @@ -76,17 +76,17 @@ +
+ +
-
- -
@@ -127,7 +127,7 @@
- 交换 + 交换
@@ -167,24 +167,6 @@ - - - - - - - - - - - - -
- 取消 - 确 定 - 确定 -
- +
+ +
-
- -
+ + + + + + + + + + + + +
+ 取消 + 确 定 + 确定 +
+ @@ -265,13 +265,15 @@ import { mapGetters } from 'vuex' export default { data() { return { - ProjectValue: ' ', + count1: 0, + count2: 0, // 清表单验证计数器 + ProjectValue: '', Project: [], - ProjectValue_check: 1, - MachineValue: ' ', + ProjectValue_check: 0, + MachineValue: '', Machine: [], MachineValue_check: 1, - GroupNumValue: ' ', + GroupNumValue: '', GroupNumValue_check: 1, GroupNum: [], tableDataBasic: [], @@ -302,7 +304,7 @@ export default { rules: { // 表单验证规则 ExchangeNumber: [{ required: true, message: '请输入交换件编号', trigger: 'blur' }], ExchangeNumberx: [{ required: true, message: '请输入交换件数量', trigger: 'blur' }], - ExchangeNote: [{ required: true, message: '请输入交换件备注', trigger: 'change' }] + ExchangeNote: [{ required: true, message: '请输入交换件备注', trigger: 'blur' }] }, PageCurrent: 1, PageSize: 10, @@ -334,26 +336,33 @@ export default { // 获取人员编号 getpeopleid() { this.picikingPeople = this.id - console.log(this.picikingPeople) }, - searchMachine() { // 查询机床 - if (this.ProjectValue === '') { + searchMachine() { + this.MachineValue = '' + this.Machine = [] + this.GroupNumValue = '' + this.GroupNum = [] + if (this.ProjectValue !== '') { + this.ProjectValue_check = 1 + searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => { + for (let i = 0; i < response.data.length; i++) { + this.Machine.push({ + label: response.data[i].机床图号, + value: response.data[i].机床流水号 + }) + } + }) + } else { this.ProjectValue_check = 0 } - searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => { - for (let i = 0; i < response.data.length; i++) { - this.Machine.push({ - label: response.data[i].机床图号, - value: response.data[i].机床流水号 - }) - } - }) }, - searchGroupList() { // 查询组号 + searchGroupList() { + this.GroupNumValue = '' + this.GroupNum = [] searchTeam(this.MachineValue).then(response => { for (let i = 0; i < response.data.length; i++) { this.GroupNum.push({ - label: response.data[i].组件名称, + label: response.data[i].组号, value: response.data[i].组件流水号 }) } @@ -362,19 +371,18 @@ export default { searchPartinfo() { this.tableDataPurchase = [] this.tableDataBasic = [] - if (this.ProjectValue === ' ') { + if (this.ProjectValue === '') { this.ProjectValue_check = 0 } - if (this.MachineValue === ' ') { + if (this.MachineValue === '') { this.MachineValue_check = 0 } - if (this.GroupNumValue === ' ') { + if (this.GroupNumValue === '') { this.GroupNumValue_check = 0 } this.listLoading = true searchPurchasePart(this.PageCurrent, this.PageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => { this.tableDataPurchase = response.data.rows - console.log(this.tableDataPurchase) this.total = response.data.total }) this.listLoading = false @@ -392,44 +400,76 @@ export default { getExchangeTable() { this.listLoading1 = true searchExchangePart(this.PageCurrent1, this.PageSize1).then(response => { - this.tableDataExchange = response.data.rows + const data = response.data.rows + console.log(data) + for (let i = 0; i < data.length; i++) { + data[i].审批通过 === '1' ? data[i].是否禁用 = true : data[i].是否禁用 = false + } + this.tableDataExchange = data this.total1 = response.data.total this.listLoading1 = false }) }, + handleSizeChange1(val) { + this.PageCurrent1 = 1 + this.PageSize1 = val + this.getExchangeTable() + }, + handleCurrentChange1(val) { + this.PageCurrent1 = val + this.getExchangeTable() + }, // 选择领料单 chooseListinfor(row) { this.pickingListNumberx = row.领料单流水号 - console.log(this.pickingListNumberx) this.searchListDetailt() }, // 增加交换件 - addListDetailinfor() { - addExchangepart(this.form.ExchangeNumber, this.tableData1[0].组件零件流水号, this.tableData1[0].物料流水号, this.tableData1[0].采购合同明细流水号, this.tableData2[0].组件零件流水号, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.tableData2[0].货位流水号, this.form.ExchangeNumberx, this.picikingPeople, this.form.ExchangeNote).then(response => { - if (response.data[0].result === '1') { - this.$message.success('增加成功') - } else { this.$message.error('增加失败') } + addListDetailinfor(form) { + this.$refs[form].validate((valid) => { + if (valid) { + addExchangepart(this.form.ExchangeNumber, this.tableData1[0].组件零件流水号, this.tableData1[0].物料流水号, this.tableData1[0].采购合同明细流水号, this.tableData2[0].组件零件流水号, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.tableData2[0].货位流水号, this.form.ExchangeNumberx, this.picikingPeople, this.form.ExchangeNote).then(response => { + if (response.data[0].result === '1') { + this.$message.success('增加成功') + } else { this.$message.error('增加失败') } + }).then(() => { + this.dialogFormVisible = false + this.PageCurrent1 = 1 + this.getExchangeTable() + }) + } }) - this.dialogFormVisible = false - this.getExchangeTable() }, // 打开交换表单 - exchange() { - this.title = '交换' - this.dialogFormVisible = true + exchange(form) { + if (this.tableData1.length === 0) { + this.$message.error('请选择交换件') + } else if (this.tableData2.length === 0) { + this.$message.error('请选择交换件') + } else { + this.count1 = this.count1 + 1 + if (this.count1 !== 1) { + this.$refs[form].resetFields() + } + this.title = '交换' + this.form.ExchangeNumber = '' + this.form.ExchangeNumberx = '' + this.form.ExchangeNote = '' + this.dialogFormVisible = true + } }, // 重置表单 - callOff() { + callOff(formName) { this.form.ExchangeNumber = '' this.form.ExchangeNumberx = '' this.form.ExchangeNote = '' this.dialogFormVisible = false + this.$refs[formName].resetFields() }, // 选中零件交换 selecting(row) { const arr = new Array(row) this.tableData1 = arr - console.log(this.tableData1) }, // 选中被零件交换 selected(row) { @@ -448,8 +488,9 @@ export default { dropExchangeList(this.exchangeListNumber, this.eTeamPartNumber).then(response => { if (response.data[0].result === '1') { this.$message.success('删除成功') - this.getExchangeTable().then(response => { - }) + this.dialogFormVisible = false + this.PageCurrent1 = 1 + this.getExchangeTable() } else { this.$message.error('删除失败') } diff --git a/src/views/Inventory/genneralPart/index.vue b/src/views/Inventory/GenneralPart/index.vue similarity index 98% rename from src/views/Inventory/genneralPart/index.vue rename to src/views/Inventory/GenneralPart/index.vue index facdccf5..bbd1b774 100644 --- a/src/views/Inventory/genneralPart/index.vue +++ b/src/views/Inventory/GenneralPart/index.vue @@ -90,7 +90,7 @@ + + + + diff --git a/src/views/ManufacturingCenter/TypicalProcessMaintenance/index.vue b/src/views/ManufacturingCenter/TypicalProcessMaintenance/index.vue index c95d5e7f..184229d4 100644 --- a/src/views/ManufacturingCenter/TypicalProcessMaintenance/index.vue +++ b/src/views/ManufacturingCenter/TypicalProcessMaintenance/index.vue @@ -66,12 +66,12 @@