From 1665ee1f7603e5b59f7320c7d006e19572913818 Mon Sep 17 00:00:00 2001 From: shilixia <2309368887@qq.com> Date: Wed, 10 Nov 2021 09:07:35 +0800 Subject: [PATCH] chejiancaozuo --- hb_client/.env.development | 4 +- hb_client/src/api/inm.js | 10 + hb_client/src/api/qm.js | 8 + hb_client/src/api/wpm.js | 27 +- hb_client/src/views/inm/fifo.vue | 441 ++++++----- hb_client/src/views/inm/fifodetail.vue | 296 ++++++-- hb_client/src/views/inm/materialbatch.vue | 111 ++- hb_client/src/views/inm/warehouse.vue | 126 ++-- hb_client/src/views/mtm/materialdo.vue | 19 +- hb_client/src/views/mtm/step.vue | 35 + hb_client/src/views/pm/work.vue | 12 +- hb_client/src/views/wpm/need.vue | 139 ++-- hb_client/src/views/wpm/worktask.vue | 882 ++++++++++++++++------ 13 files changed, 1419 insertions(+), 691 deletions(-) diff --git a/hb_client/.env.development b/hb_client/.env.development index ef83e12..003a43c 100644 --- a/hb_client/.env.development +++ b/hb_client/.env.development @@ -2,8 +2,8 @@ ENV = 'development' # base api -VUE_APP_BASE_API = 'http://127.0.0.1:8000/api' -#VUE_APP_BASE_API = 'http://47.95.0.242:2222/api' +#VUE_APP_BASE_API = 'http://127.0.0.1:8000/api' +VUE_APP_BASE_API = 'http://47.95.0.242:2222/api' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, diff --git a/hb_client/src/api/inm.js b/hb_client/src/api/inm.js index 54cb63f..6c95d11 100644 --- a/hb_client/src/api/inm.js +++ b/hb_client/src/api/inm.js @@ -69,3 +69,13 @@ export function getmaterialbatchList(query) { params: query }) } + + +//库存审核 +export function audit(id, data) { + return request({ + url: `/inm/fifo/${id}/audit/`, + method: 'post', + data + }) +} diff --git a/hb_client/src/api/qm.js b/hb_client/src/api/qm.js index b362dce..1e87b95 100644 --- a/hb_client/src/api/qm.js +++ b/hb_client/src/api/qm.js @@ -57,3 +57,11 @@ export function deleteTestitem(id, data) { data }) } +//提交物料检查项目 +export function createTestrecord(data) { + return request({ + url: '/qm/testrecord/', + method: 'post', + data + }) +} diff --git a/hb_client/src/api/wpm.js b/hb_client/src/api/wpm.js index 6fae6a3..fc7eac0 100644 --- a/hb_client/src/api/wpm.js +++ b/hb_client/src/api/wpm.js @@ -14,4 +14,29 @@ export function getwmaterialList(query) { method: 'get', params: query }) -} \ No newline at end of file +} +//车间操作 +export function createWork(data) { + return request({ + url: '/wpm/do/init/', + method: 'post', + data + }) +} +//提交 +export function submitWork(data) { + return request({ + url: '/wpm/do/submit/', + method: 'post', + data + }) +} +//子工序半成品 +export function getwproductList(query) { + return request({ + url: '/wpm/wproduct/', + method: 'get', + params: query + }) +} + diff --git a/hb_client/src/views/inm/fifo.vue b/hb_client/src/views/inm/fifo.vue index 7f26080..711a5f9 100644 --- a/hb_client/src/views/inm/fifo.vue +++ b/hb_client/src/views/inm/fifo.vue @@ -2,35 +2,35 @@
- - 搜索 - 重置 -
+ + 搜索 + 重置 +
-
- 新增物料 -
+
+ 新增物料 +
- - - + - + - + - + - + - - + + + + + diff --git a/hb_client/src/views/inm/fifodetail.vue b/hb_client/src/views/inm/fifodetail.vue index ba70e95..b58ddf9 100644 --- a/hb_client/src/views/inm/fifodetail.vue +++ b/hb_client/src/views/inm/fifodetail.vue @@ -1,32 +1,6 @@ diff --git a/hb_client/src/views/inm/materialbatch.vue b/hb_client/src/views/inm/materialbatch.vue index 46a2058..8f14fe6 100644 --- a/hb_client/src/views/inm/materialbatch.vue +++ b/hb_client/src/views/inm/materialbatch.vue @@ -2,31 +2,30 @@
- - 搜索 - 重置 -
+ + 搜索 + 重置 +
- - - - + - + - + - - + + - - + + - - - - - diff --git a/hb_client/src/views/inm/warehouse.vue b/hb_client/src/views/inm/warehouse.vue index 2a5a649..0644dac 100644 --- a/hb_client/src/views/inm/warehouse.vue +++ b/hb_client/src/views/inm/warehouse.vue @@ -2,33 +2,33 @@
- - 搜索 - 重置 -
-
- 新增仓库 -
+ + 搜索 + 重置 +
+
+ 新增仓库 +
- + - + - - + + - + \ No newline at end of file + \ No newline at end of file