diff --git a/src/config/getData2.js b/src/config/getData2.js index 643448f..cb84892 100644 --- a/src/config/getData2.js +++ b/src/config/getData2.js @@ -192,3 +192,17 @@ export const createP2PTask = (scode, ecode) => post('api/pda/createP2PTask', { start_point_code: scode, end_point_code: ecode }) + +/** + * 人工组盘 + */ +// 点位下拉框 +export const getAllYZList = () => post('api/pda/getAllYZList', {}) +// 人工组盘 +export const pdaToGroup = (code, vcode, qty, weight, is) => post('api/pda/pdaToGroup', { + point_code: code, + vehicle_code: vcode, + qty: qty, + weight: weight, + is_full: is +}) diff --git a/src/images/xinrui/menu/FR13.png b/src/images/xinrui/menu/FR13.png new file mode 100644 index 0000000..972a492 Binary files /dev/null and b/src/images/xinrui/menu/FR13.png differ diff --git a/src/main.js b/src/main.js index 46d8f57..0fb4fbf 100644 --- a/src/main.js +++ b/src/main.js @@ -14,7 +14,7 @@ import { Dialog, toast } from '@config/mUtils.js' import filter from '@config/filter.js' import { baseUrl } from '@config/env.js' // import Vconsole from 'vconsole' -import { Select, Option, RadioGroup, Radio } from 'element-ui' +import { Select, Option, RadioGroup, Radio, Switch } from 'element-ui' import JSEncrypt from 'jsencrypt' Vue.prototype._ = _ @@ -34,6 +34,7 @@ Vue.use(Select) Vue.use(Option) Vue.use(RadioGroup) Vue.use(Radio) +Vue.use(Switch) // let VConsole = new Vconsole() // Vue.use(VConsole) Vue.config.productionTip = false diff --git a/src/pages/login/Home.vue b/src/pages/login/Home.vue index c72be07..f49a92f 100644 --- a/src/pages/login/Home.vue +++ b/src/pages/login/Home.vue @@ -69,7 +69,8 @@ export default { {sec_menu_id: 2, path: '/PointManage', title: '窑前货架', query: 'YQHJ'}, {sec_menu_id: 3, path: '/PointManage', title: '窑后货架', query: 'YHHJ'} ]}, - {menu_id: 12, path: '/CallCarry', title: '呼叫搬运', icon: 'FR12', sonTree: []} + {menu_id: 12, path: '/CallCarry', title: '呼叫搬运', icon: 'FR12', sonTree: []}, + {menu_id: 13, path: '/ManualGroup', title: '人工组盘', icon: 'FR13', sonTree: []} ], show: false, secM: [] diff --git a/src/pages/proj/ManualGroup.vue b/src/pages/proj/ManualGroup.vue new file mode 100644 index 0000000..de126ef --- /dev/null +++ b/src/pages/proj/ManualGroup.vue @@ -0,0 +1,136 @@ + + + diff --git a/src/router/index.js b/src/router/index.js index 2b1f3ec..43953f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -21,6 +21,7 @@ const CreateChargingTask = r => require.ensure([], () => r(require('../pages/pro const ManualUnstack = r => require.ensure([], () => r(require('../pages/proj/ManualUnstack')), 'ManualUnstack') const PointManage = r => require.ensure([], () => r(require('../pages/proj/PointManage')), 'PointManage') const CallCarry = r => require.ensure([], () => r(require('../pages/proj/CallCarry')), 'CallCarry') +const ManualGroup = r => require.ensure([], () => r(require('../pages/proj/ManualGroup')), 'ManualGroup') Vue.use(Router) @@ -112,6 +113,10 @@ export default new Router({ { path: '/CallCarry', // 呼叫搬运 component: CallCarry + }, + { + path: '/ManualGroup', // 人工组盘 + component: ManualGroup } ], scrollBehavior (to, from, savedPosition) {