From 8375698ffe335cc8fc5ce457ca9d375e196e4685 Mon Sep 17 00:00:00 2001 From: shilixia <2309368887@qq.com> Date: Fri, 12 Nov 2021 08:36:38 +0800 Subject: [PATCH] jie,iamtiaozheng --- hb_client/src/api/inm.js | 18 ++- hb_client/src/api/qm.js | 9 +- hb_client/src/views/em/detection.vue | 5 +- hb_client/src/views/em/equipment.vue | 30 +++-- hb_client/src/views/inm/fifo.vue | 94 +++++++------ hb_client/src/views/inm/fifodetail.vue | 2 +- hb_client/src/views/mtm/productprocess.vue | 7 +- hb_client/src/views/pm/plan.vue | 45 ++++--- hb_client/src/views/pm/resources.vue | 45 ++++--- hb_client/src/views/pm/work.vue | 6 +- hb_client/src/views/sam/contract.vue | 21 +-- hb_client/src/views/sam/customer.vue | 17 +-- hb_client/src/views/sam/order.vue | 22 +-- hb_client/src/views/wpm/worktask.vue | 148 +++++++++------------ 14 files changed, 235 insertions(+), 234 deletions(-) diff --git a/hb_client/src/api/inm.js b/hb_client/src/api/inm.js index 6c95d11..f4437c9 100644 --- a/hb_client/src/api/inm.js +++ b/hb_client/src/api/inm.js @@ -46,7 +46,7 @@ export function createInventory(data) { //仓库对应的物料 export function getfifodetailList(query) { return request({ - url: '/inm/fifodetail/', + url: '/inm/fifoitem/', method: 'get', params: query }) @@ -60,6 +60,14 @@ export function getfifoList(query) { params: query }) } +//出入库记录删除 +export function deleteFifoitem(id, data) { + return request({ + url: `/inm/fifoitem/${id}/`, + method: 'delete', + data + }) +} //物料批次 export function getmaterialbatchList(query) { @@ -79,3 +87,11 @@ export function audit(id, data) { data }) } +//出入库检测 +export function createTestrecord(data) { + return request({ + url: '/inm/fifoitem/test/', + method: 'post', + data + }) +} \ No newline at end of file diff --git a/hb_client/src/api/qm.js b/hb_client/src/api/qm.js index 1e87b95..be4d101 100644 --- a/hb_client/src/api/qm.js +++ b/hb_client/src/api/qm.js @@ -57,11 +57,4 @@ export function deleteTestitem(id, data) { data }) } -//提交物料检查项目 -export function createTestrecord(data) { - return request({ - url: '/qm/testrecord/', - method: 'post', - data - }) -} + diff --git a/hb_client/src/views/em/detection.vue b/hb_client/src/views/em/detection.vue index 4238688..3838c41 100644 --- a/hb_client/src/views/em/detection.vue +++ b/hb_client/src/views/em/detection.vue @@ -34,11 +34,12 @@ diff --git a/hb_client/src/views/em/equipment.vue b/hb_client/src/views/em/equipment.vue index e31e26d..e2b7104 100644 --- a/hb_client/src/views/em/equipment.vue +++ b/hb_client/src/views/em/equipment.vue @@ -38,32 +38,33 @@ fit stripe highlight-current-row - max-height="600" + height="100" + v-el-height-adaptive-table="{bottomOffset: 50}" > - + - + - + - + - + - + - + - + - + - + - + - +