diff --git a/src/api/ManufacturingCenter/AddingOrder.js b/src/api/ManufacturingCenter/AddingOrder.js new file mode 100644 index 00000000..10e24f63 --- /dev/null +++ b/src/api/ManufacturingCenter/AddingOrder.js @@ -0,0 +1,135 @@ +import request from '@/utils/request' + +// 机床名称 +export function getMachines() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_机床名称_根据机床查询', + param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int' + } + }) +} +// 获取组号 +export function getGroups(stepNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组', + param: '机床流水号=' + stepNumber + '=int' + } + }) +} +// 获取工艺 +export function initProcessNumber() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间管理_工艺_查询数据' + } + }) +} +// 获取组号 +export function addProcess(NUM, NUM1, NUM2, NUM3) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间管理_自制件插序_增加数据', + param: '工艺计划流水号=' + NUM + '&工序顺序=' + NUM1 + '&工艺编号=' + NUM2 + '&操作工=' + NUM3 + } + }) +} +export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程_新', + param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 获取组号 +export function gettabledata1(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_加工进度查询_查询_New_加序', + param: '工艺计划流水号=' + num + '=int' + } + }) +} +// 补录加工完成日期 +export function editdata(processSerialNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_加工进度查询_查询_New', + param: '工艺计划流水号=' + processSerialNumber + '=int' + } + }) +} +// 初始化人员信息 弹出框 +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 submitEdit(Number1, completetime, processSerialNumber) { + return request({ + url: '', + method: 'post', + data: { + type: 2, + name: '车间生产管理工艺_零件工序_修改数据_工作者_根据人员编号和完成日期', + param: '人员编号=' + Number1 + '=string&完成日期=' + completetime + '=string&工序流水号=' + processSerialNumber + '=string' + } + }) +} diff --git a/src/api/ManufacturingCenter/Enter0therData.js b/src/api/ManufacturingCenter/Enter0therData.js new file mode 100644 index 00000000..9f328a07 --- /dev/null +++ b/src/api/ManufacturingCenter/Enter0therData.js @@ -0,0 +1,56 @@ +import request from '@/utils/request' + +export function searchPerson() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间管理_其他数据_查询数据_人员' + } + }) +} +export function fetchDate(month) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间管理_其他数据_查询数据', + param: '月份=' + month + } + }) +} +export function saveDate(time, num, partNum, partName, procedure, num1, num2, num3, number, time1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间管理_其他数据_增加数据', + param: '加工日期=' + time + '&操作工流水号=' + num + '&零件图号=' + partNum + '&名称=' + partName + '&工序=' + procedure + '&责任人流水号=' + num1 + '&确认人流水号=' + num2 + '&录入人流水号=' + num3 + '&数量=' + number + '&单件工时=' + time1 + } + }) +} +export function editDate(ID, time, num, partNum, partName, procedure, num1, num2, num3, number, time1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间管理_其他数据_编辑数据', + param: 'ID=' + ID + '&加工日期=' + time + '&操作工流水号=' + num + '&零件图号=' + partNum + '&名称=' + partName + '&工序=' + procedure + '&责任人流水号=' + num1 + '&确认人流水号=' + num2 + '&录入人流水号=' + num3 + '&数量=' + number + '&单件工时=' + time1 + } + }) +} +export function deleteDate(ID) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间管理_其他数据_删除数据', + param: 'ID=' + ID + } + }) +} diff --git a/src/views/ManufacturingCenter/AddingOrder/index.vue b/src/views/ManufacturingCenter/AddingOrder/index.vue new file mode 100644 index 00000000..419a4637 --- /dev/null +++ b/src/views/ManufacturingCenter/AddingOrder/index.vue @@ -0,0 +1,560 @@ + + + + + diff --git a/src/views/ManufacturingCenter/Enter0therData/index.vue b/src/views/ManufacturingCenter/Enter0therData/index.vue index e69de29b..d810ddd5 100644 --- a/src/views/ManufacturingCenter/Enter0therData/index.vue +++ b/src/views/ManufacturingCenter/Enter0therData/index.vue @@ -0,0 +1,245 @@ + + + diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue index e0d450cc..71a1f1b3 100644 --- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue +++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue @@ -643,12 +643,7 @@ export default { getOP_state() { getOP_state().then(response => { for (let i = 0; i < response.data.length; i++) { - if (response.data[i].状态代码 === '1') { - $('#' + response.data[i].工位号 + '_circle').removeClass('circle3') - $('#' + response.data[i].工位号 + '_circle').removeClass('circle1') - $('#' + response.data[i].工位号 + '_circle').removeClass('circle') - $('#' + response.data[i].工位号 + '_circle').addClass('circle2') - } else if (response.data[i].状态代码 === '2') { + if (response.data[i].状态代码 === '2') { $('#' + response.data[i].工位号 + '_circle').removeClass('circle') $('#' + response.data[i].工位号 + '_circle').removeClass('circle3') $('#' + response.data[i].工位号 + '_circle').removeClass('circle2') @@ -663,6 +658,11 @@ export default { $('#' + response.data[i].工位号 + '_circle').removeClass('circle1') $('#' + response.data[i].工位号 + '_circle').removeClass('circle2') $('#' + response.data[i].工位号 + '_circle').addClass('circle3') + } else { + $('#' + response.data[i].工位号 + '_circle').removeClass('circle3') + $('#' + response.data[i].工位号 + '_circle').removeClass('circle1') + $('#' + response.data[i].工位号 + '_circle').removeClass('circle') + $('#' + response.data[i].工位号 + '_circle').addClass('circle2') } } }) diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue index 1145927f..18bd4904 100644 --- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue +++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue @@ -144,7 +144,7 @@ @@ -204,7 +204,7 @@ @@ -232,7 +232,7 @@