diff --git a/dist.zip b/dist.zip new file mode 100644 index 00000000..aa5e6749 Binary files /dev/null and b/dist.zip differ diff --git a/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js b/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js new file mode 100644 index 00000000..d8b37053 --- /dev/null +++ b/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js @@ -0,0 +1,27 @@ +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' + } + }) +} + diff --git a/src/icons/svg/ScheduleCompletionDetails.svg b/src/icons/svg/ScheduleCompletionDetails.svg new file mode 100644 index 00000000..0ac127f6 --- /dev/null +++ b/src/icons/svg/ScheduleCompletionDetails.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index 596cc146..8e4a2f20 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -26,8 +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.1.231:8411/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 d6bb50a1..0c01ca04 100644 --- a/src/utils/tool.js +++ b/src/utils/tool.js @@ -52,6 +52,17 @@ export function getNowTime() { const time = date.getFullYear() + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second return time } +// 获取当前0晨 +export function getNowTime1() { + const date = new Date() + const month = zeroFill(date.getMonth() + 1) + const day = zeroFill(date.getDate()) + const hour = '00' + const minute = '00' + const second = '00' + 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/CompletionOfWorkshopComponents/index.vue b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue new file mode 100644 index 00000000..b8d23cdc --- /dev/null +++ b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue @@ -0,0 +1,205 @@ + + + + + diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue index d864b901..225aa1ca 100644 --- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue +++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue @@ -66,10 +66,10 @@ - + - + @@ -79,7 +79,7 @@ {{ scope.row.零件名称 }} - + @@ -133,11 +133,11 @@