From 8bb90531db61fb1a01a07669d6060967918ef8e2 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Thu, 29 Jun 2023 15:26:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/getData2.js | 29 +++++++ src/pages/modules/semifinished/index.vue | 2 +- .../modules/semifinished/mater-search.vue | 82 +++++++++++++++++++ .../semifinished/semi-finished-instore.vue | 36 ++++++-- src/router/index.js | 5 ++ src/style/layout.styl | 2 +- src/style/reset.css | 4 + 7 files changed, 150 insertions(+), 10 deletions(-) create mode 100644 src/pages/modules/semifinished/mater-search.vue diff --git a/src/config/getData2.js b/src/config/getData2.js index f6c8b76..a335da0 100644 --- a/src/config/getData2.js +++ b/src/config/getData2.js @@ -113,3 +113,32 @@ export const unqualReport = (id, nqty, rqty) => post('api/produceshiftorder/unqu // 状态查询 export const orderStatus = () => get('api/produceshiftorder/orderStatus', '') + +/** + * 半成品入库 + */ + +// 1.1仓库下拉框 +export const getBcpStor = () => post('api/pda/bcp/in/getBcpStor', {}) +// 1.2单据类型下拉框 +export const getBillType = () => post('api/pda/bcp/in/getBillType', {}) +// 1.3物料选择页面 +export const getMaterial = (code) => post('api/pda/bcp/in/getMaterial', { + material_code: code +}) +// 1.4入库点下拉框 +export const getPoint = () => post('api/pda/bcp/in/getPoint', {}) +// 1.5呼叫空载具(按钮) +export const callVehicle = () => post('api/pda/bcp/in/callVehicle', {}) +// 1.6确认入库(按钮) +export const createIn = (from) => post('api/pda/bcp/in/createIn', { + from: from +}) + +/** + * 半成品入库管理查询 + */ +// 2.1半成品入库查询 +export const getAll = () => post('api/pda/bcp/in/getAll', {}) +// 2.2强制确认(按钮) +export const bcpInConfirm = () => post('api/pda/bcp/in/confirm', {}) diff --git a/src/pages/modules/semifinished/index.vue b/src/pages/modules/semifinished/index.vue index 9db507a..1120cda 100644 --- a/src/pages/modules/semifinished/index.vue +++ b/src/pages/modules/semifinished/index.vue @@ -23,7 +23,7 @@ export default { }, computed: { title () { - let res = ['半成品入库', '半成品入库查询', '半成品出库', '半成品出库查询', '半成品盘点', '半成品盘点查询', '半成品拼盘', '半成品拼盘查询'][Number(this.$route.meta.guidePath) - 1] + let res = ['半成品入库', '半成品入库查询', '半成品出库', '半成品出库查询', '半成品盘点', '半成品盘点查询', '半成品拼盘查询', '物料查询'][Number(this.$route.meta.guidePath) - 1] return res } }, diff --git a/src/pages/modules/semifinished/mater-search.vue b/src/pages/modules/semifinished/mater-search.vue new file mode 100644 index 0000000..eefd3e2 --- /dev/null +++ b/src/pages/modules/semifinished/mater-search.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/src/pages/modules/semifinished/semi-finished-instore.vue b/src/pages/modules/semifinished/semi-finished-instore.vue index d6609db..06bc185 100644 --- a/src/pages/modules/semifinished/semi-finished-instore.vue +++ b/src/pages/modules/semifinished/semi-finished-instore.vue @@ -8,9 +8,9 @@ + :key="item.stor_id" + :label="item.stor_name" + :value="item.stor_id"> @@ -21,17 +21,17 @@ + :key="item.value" + :label="item.label" + :value="item.value">
物料
-
- +
+
@@ -96,6 +96,7 @@ diff --git a/src/router/index.js b/src/router/index.js index 4af042d..c80bc65 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -19,6 +19,7 @@ const semiFinishedOutstoreSearch = r => require.ensure([], () => r(require('@pag const semiFinishedCheck = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-check')), 'semifinished') const semiFinishedCheckSearch = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-check-search')), 'semifinished') const semiFinishedComposeSearch = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-compose-search')), 'semifinished') +const materSearch = r => require.ensure([], () => r(require('@page/modules/semifinished/mater-search')), 'semifinished') const Homeset = r => require.ensure([], () => r(require('@page/homeset/index')), 'Homeset') const Home = r => require.ensure([], () => r(require('@page/homeset/HomePage')), 'HomePage') @@ -105,6 +106,10 @@ export default new Router({ }, { path: '/semifinishedcomposesearch', component: semiFinishedComposeSearch, + meta: {guidePath: '7'} + }, { + path: '/matersearch', + component: materSearch, meta: {guidePath: '8'} }] }, diff --git a/src/style/layout.styl b/src/style/layout.styl index 3f37699..5aaf723 100644 --- a/src/style/layout.styl +++ b/src/style/layout.styl @@ -217,7 +217,7 @@ header border-radius 4px background-color #fff .grid_wraper - _wh(100%, calc(100% - 45px)) + _wh(100%, calc(100% - 55px)) border-radius 5px overflow-y auto .filter-table diff --git a/src/style/reset.css b/src/style/reset.css index 9e0312a..c1cd98a 100644 --- a/src/style/reset.css +++ b/src/style/reset.css @@ -124,6 +124,10 @@ div, input, button { float: right !important; } +.pointer { + cursor: pointer; +} + .mgb40 { margin-bottom: .4rem !important; }