diff --git a/pages/home/home.vue b/pages/home/home.vue index 1ecc8b6..57a5823 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -55,14 +55,10 @@ }, toPage1 (e) { - let url = e.path - uni.redirectTo({ - url: url - }) - // if (e.sonTree.length > 0) { - // this.show = true - // this.secM = e.sonTree - // } + if (e.sonTree.length > 0) { + this.show = true + this.secM = e.sonTree + } }, toPage2 (e) { let url = e.path diff --git a/pages/modules/SemifinishedInStore.vue b/pages/modules/SemifinishedInStore.vue index 239d03a..fcb540a 100644 --- a/pages/modules/SemifinishedInStore.vue +++ b/pages/modules/SemifinishedInStore.vue @@ -1,19 +1,160 @@ diff --git a/pages/modules/SemifinishedMaterSearch.vue b/pages/modules/SemifinishedMaterSearch.vue index 239d03a..64d3596 100644 --- a/pages/modules/SemifinishedMaterSearch.vue +++ b/pages/modules/SemifinishedMaterSearch.vue @@ -1,19 +1,99 @@ diff --git a/utils/getData2.js b/utils/getData2.js index 4d08a6c..6f7a867 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -63,46 +63,31 @@ export const handRequest = () => request({ export const authority = () => { let res = { sonTree: [ - {menu_id: '1', icon: 'RF08', name: '入库搬运', path: '', sonTree: [ - {menu_id: '1', name: '生箔生产进度', path: '/pages/ProductManage/SboProdProgress'} - ]}, - {menu_id: '2', icon: 'RF02', name: '叫料出库', path: '', sonTree: []}, - {menu_id: '3', icon: 'RF03', name: '任务管理', path: '', sonTree: []}, - {menu_id: '4', icon: 'RF07', name: '指令管理', path: '', sonTree: []}, - {menu_id: '5', icon: 'RF04', name: '设备点检', path: '/pages/modules/equip-inspection', sonTree: []}, - {menu_id: '6', icon: 'RF10', name: '设备操作', path: '', sonTree: []} + {menu_id: '1', icon: 'RF08', name: '半成品管理', path: '', sonTree: [ + {menu_id: '1', name: '半成品入库', path: '/pages/modules/SemifinishedInStore'} + ]} ] } return res } /** - * 设备点检 + * 半成品入库 */ -// 获取设备下拉框 -export const deviceInfo = () => request({ - url:'api/pda/deviceCheck/deviceInfo', - data: {} -}) -// 获取设备状态下拉框 -export const deviceStatus = () => request({ - url:'api/pda/deviceCheck/deviceStatus', - data: {} -}) -// 设备点检 -export const deviceCheckVerify = (code, user, remark, status) => request({ - url:'api/pda/deviceCheck/verify', +// 1.1物料选择页面 -- 单选 +export const getMaterial = (sp) => request({ + url:'api/pda/hrBcp/iosIn/getMaterial', data: { - device_code: code, - username: user, - remark: remark, - check_status: status + material_spec: sp } }) - - -// 1.3打印机类型 -export const virtualprintType = (url) => request1({ - url: `${url}/` + 'api/pda/virtual/printType', +// 1.2工序下拉框 +export const getWork = (sp) => request({ + url:'api/pda/hrBcp/iosIn/getWork', data: {} }) +// 1.3确认入库(按钮) +export const BcpConfirm = (from) => request({ + url:'api/pda/hrBcp/iosIn/confirm', + data: from +}) diff --git a/vuex/modules/data.js b/vuex/modules/data.js new file mode 100644 index 0000000..e2914f9 --- /dev/null +++ b/vuex/modules/data.js @@ -0,0 +1,31 @@ +import * as types from '../types' +const state = { + publicObj: '', + publicArr: '' +} +const getters = { + publicObj: state => state.publicObj, + publicArr: state => state.publicArr +} +const actions = { + setPublicObj ({commit}, res) { + commit(types.PUBLIC_OBJ, res) + }, + setPublicArr ({commit}, res) { + commit(types.PUBLIC_ARR, res) + } +} +const mutations = { + [types.PUBLIC_OBJ] (state, res) { + state.publicObj = res + }, + [types.PUBLIC_ARR] (state, res) { + state.publicArr = res + } +} +export default { + state, + getters, + actions, + mutations +} \ No newline at end of file diff --git a/vuex/types.js b/vuex/types.js index 4668940..ee8a8f3 100644 --- a/vuex/types.js +++ b/vuex/types.js @@ -6,4 +6,10 @@ export const DEL_LOGIN_NAME = 'DEL_LOGIN_NAME' export const COM_CONFIG = 'COM_CONFIG' export const SAVE_USER_INFO = 'SAVE_USER_INFO' export const DEL_USER_INFO = 'DEL_USER_INFO' -export const SAVE_TOKEN = 'SAVE_TOKEN' \ No newline at end of file +export const SAVE_TOKEN = 'SAVE_TOKEN' + +/** + * data + */ +export const PUBLIC_OBJ = 'PUBLIC_OBJ' +export const PUBLIC_ARR = 'PUBLIC_ARR' \ No newline at end of file