diff --git a/src/api/erp/stock/in/index.ts b/src/api/erp/stock/in/index.ts index 5148d521..4d173055 100644 --- a/src/api/erp/stock/in/index.ts +++ b/src/api/erp/stock/in/index.ts @@ -61,11 +61,11 @@ export const StockInApi = { return await request.download({ url: `/erp/stock-in/export-excel`, params }) }, - // 查询其它入库单分页 + // 查询生产入库单分页 getMesStockInPage: async (params: any) => { return await request.get({ url: `/erp/stock-in/pageMesStockIn`, params }) }, - // 新增其它入库单 + // 新增生产入库单 createMesStockIn: async (data: StockInVO) => { return await request.post({ url: `/erp/stock-in/createMesStockIn`, data }) }, diff --git a/src/api/mes/stockindetail/index.ts b/src/api/mes/stockindetail/index.ts index ec20a7f1..8f646563 100644 --- a/src/api/mes/stockindetail/index.ts +++ b/src/api/mes/stockindetail/index.ts @@ -41,5 +41,15 @@ export const StockInDetailApi = { // 导出生产入库分配明细 Excel exportStockInDetail: async (params) => { return await request.download({ url: `/mes/stock-in-detail/export-excel`, params }) - } -} \ No newline at end of file + }, + // 更新生产入库状态(审核、反审核) + updateMesStockInStatus: async (id: number, status: number) => { + return await request.put({ + url: `/mes/stock-in-detail/updateStockInStatus`, + params: { + id, + status + } + }) + }, +} diff --git a/src/views/mes/plan/index.vue b/src/views/mes/plan/index.vue index 26ad7efd..ec9c0df5 100644 --- a/src/views/mes/plan/index.vue +++ b/src/views/mes/plan/index.vue @@ -206,7 +206,7 @@ type="primary" @click="handleStatus(scope.row.code, scope.row.id, 'start',2,'开工')" v-hasPermi="['mes:plan:update']" - v-if="scope.row.status === 1 || scope.row.status ===3" + v-if="scope.row.status === 1 || scope.row.status ===3 || scope.row.status ===4" > 开工 diff --git a/src/views/mes/stockin/index.vue b/src/views/mes/stockin/index.vue index e7c50e77..a86f5bcf 100644 --- a/src/views/mes/stockin/index.vue +++ b/src/views/mes/stockin/index.vue @@ -115,9 +115,8 @@ @selection-change="handleSelectionChange" > - + - { // 审批的二次确认 await message.confirm(`确定${status === 20 ? '审批' : '反审批'}该入库单吗?`) // 发起审批 - await StockInApi.updateStockInStatus(id, status) + await StockInDetailApi.updateMesStockInStatus(id, status) message.success(`${status === 20 ? '审批' : '反审批'}成功`) // 刷新列表 await getList()