diff --git a/src/api/ManufacturingCenter/ScheduleCompletionDetails.js b/src/api/ManufacturingCenter/ScheduleCompletionDetails.js new file mode 100644 index 00000000..c06d4713 --- /dev/null +++ b/src/api/ManufacturingCenter/ScheduleCompletionDetails.js @@ -0,0 +1,28 @@ +import request from '@/utils/request' + +// 查询人员总工工时 +export function searchtable(num2, num3, num4, num5, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_工时统计_查询数据2_新', + param: '操作者_check=0&姓名=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询人员具体工序 +export function searchtable2(num1, num2, num3, num4, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_工时统计按人员查询_查询数据2_新', + param: '工作者编号=' + num1 + '&时间_check=' + num2 + '&开始时间=' + num3 + '&结束时间=' + num4, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index 7218f9b2..596cc146 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -26,7 +26,8 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, + // baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/utils/tool.js b/src/utils/tool.js index ba0f89ff..d6bb50a1 100644 --- a/src/utils/tool.js +++ b/src/utils/tool.js @@ -52,7 +52,6 @@ export function getNowTime() { const time = date.getFullYear() + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second return time } - // 判断类型 export function type(target) { const ret = typeof (target) diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue index 490c044a..7fb8cb49 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue @@ -50,7 +50,7 @@ {{ scope.row.不合格数量 }} - + @@ -292,7 +292,7 @@ export default { this.tableData1.push({ 工艺名称: response.data[i].工艺名称, 序间质检: response.data[i].质检结果, - 排产日期: response.data[i].计划日期 ? response.data[i].计划日期.split(' ')[0] : '', + 排产日期: response.data[i].排产时间 ? response.data[i].排产时间.split(' ')[0] : '', // 排产日期: response.data[i].计划日期, 完成日期: response.data[i].工序完成日期 ? response.data[i].工序完成日期.split(' ')[0] : '', 操作者: response.data[i].操作者, diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue new file mode 100644 index 00000000..d864b901 --- /dev/null +++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue @@ -0,0 +1,223 @@ + + + + +