diff --git a/src/api/ManufacturingCenter/SparePartsForScrap.js b/src/api/ManufacturingCenter/SparePartsForScrap.js index 9736b9a3..459ceaef 100644 --- a/src/api/ManufacturingCenter/SparePartsForScrap.js +++ b/src/api/ManufacturingCenter/SparePartsForScrap.js @@ -64,7 +64,7 @@ export function editTime(CutCode, StartTime, FinishTime) { } }) } -export function editSpare(CutCode, number, reason, time) { +export function editSpare(CutCode, number, reason, time, id) { return request({ url: '', method: 'post', @@ -73,7 +73,7 @@ export function editSpare(CutCode, number, reason, time) { ModularID: router.currentRoute.path, type: '2', name: '车间生产管理工艺_零件工艺计划_报废零件_增加数据', - param: '工艺计划流水号=' + CutCode + '&报废数量=' + number + '&报废原因=' + reason + '&报废时间=' + time + param: '工艺计划流水号=' + CutCode + '&报废数量=' + number + '&报废原因=' + reason + '&报废时间=' + time + '&报废人=' + id } }) } diff --git a/src/utils/tool.js b/src/utils/tool.js index a1f1afe9..9aa12052 100644 --- a/src/utils/tool.js +++ b/src/utils/tool.js @@ -71,6 +71,51 @@ export function getNowTime1() { const time = date.getFullYear() + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second return time } +// 工时统计上个月26-本月25 +export function getTime26() { + const date = new Date() + const day = date.getDate() + if (day >= 25) { + var month = zeroFill(date.getMonth() + 1) + if (month === 0) { + month = 12 + const day = 26 + const time = date.getFullYear() - 1 + '-' + month + '-' + day + return time + } else { + const day = 26 + const time = date.getFullYear() + '-' + month + '-' + day + return time + } + } else { + var month2 = zeroFill(date.getMonth() + 1) - 1 + if (month2 === 0) { + month2 = 12 + const day = 26 + const time = date.getFullYear() - 1 + '-' + month2 + '-' + day + return time + } else { + const day = 26 + const time = date.getFullYear() + '-' + month2 + '-' + day + return time + } + } +} +export function getTime25() { + const date = new Date() + const day = date.getDate() + if (day >= 25) { + const month = zeroFill(date.getMonth() + 2) + const day2 = 25 + const time = date.getFullYear() + '-' + month + '-' + day2 + return time + } else { + const month = zeroFill(date.getMonth() + 1) + const day2 = 25 + const time = date.getFullYear() + '-' + month + '-' + day2 + return time + } +} // 判断类型 export function type(target) { const ret = typeof (target) diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index 8df72284..ceee3692 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -8,10 +8,10 @@ 查询 - 外购备料 + 外购备料 - 自家备料 + 自家备料 查询全部 @@ -42,11 +42,7 @@ @sort-change="sortChange" @selection-change="handleSelectionChange"> - +