diff --git a/dist.zip b/dist.zip index aa5e6749..840880f4 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js b/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js index d8b37053..f6d31018 100644 --- a/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js +++ b/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js @@ -7,8 +7,7 @@ export function getMachines() { method: 'post', data: { type: '1', - name: '车间生产管理工艺_传递后_机床名称_根据机床查询', - param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int' + name: 'PDM_机床名称_全部_查询数据' } }) } diff --git a/src/api/ManufacturingCenter/MachiningParts.js b/src/api/ManufacturingCenter/MachiningParts.js new file mode 100644 index 00000000..0770e231 --- /dev/null +++ b/src/api/ManufacturingCenter/MachiningParts.js @@ -0,0 +1,33 @@ +import request from '@/utils/request' + +export function searchData() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_加工顺序调整_查询正在加工零件工序_NEW' + } + }) +} +export function processingStatus(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理_成组配套加工进度_查询数据', + param: '工艺计划流水号=' + num + } + }) +} +export function searchData1() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'MES_机加工MES_记录零件待加工显示_NEW' + } + }) +} diff --git a/src/api/ManufacturingCenter/ProcessingStatusNew.js b/src/api/ManufacturingCenter/ProcessingStatusNew.js index 4f33aa89..bd1818e1 100644 --- a/src/api/ManufacturingCenter/ProcessingStatusNew.js +++ b/src/api/ManufacturingCenter/ProcessingStatusNew.js @@ -48,4 +48,65 @@ export function gettabledata1(num) { } }) } +// 补录加工完成日期 +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/utils/tool.js b/src/utils/tool.js index 44b2c5bf..b2e909dc 100644 --- a/src/utils/tool.js +++ b/src/utils/tool.js @@ -52,6 +52,14 @@ export function getNowTime() { const time = date.getFullYear() + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second return time } +// 获取当前时间(yyyy-mm-dd) +export function getNowShotTime() { + const date = new Date() + const month = zeroFill(date.getMonth() + 1) + const day = zeroFill(date.getDate()) + const time = date.getFullYear() + '-' + month + '-' + day + return time +} // 获取当前0晨 export function getNowTime1() { const date = new Date() diff --git a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue index fe0bbb90..ae8aa405 100644 --- a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue +++ b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue @@ -18,8 +18,8 @@ - - + +