diff --git a/pages.json b/pages.json index d9346fb..59a7586 100644 --- a/pages.json +++ b/pages.json @@ -72,6 +72,22 @@ } } + ,{ + "path" : "pages/manage/hnlgbd", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/manage/hnlgcx", + "style" : + { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/home/home.vue b/pages/home/home.vue index bb80cab..c7679ec 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -15,7 +15,7 @@ - + {{e.title}} @@ -32,12 +32,14 @@ return { userName: '', menuList: [ - {id: 5, title: '任务管理', icon: 'RF05', path: '/pages/manage/task-manage'}, - {id: 6, title: '指令管理', icon: 'RF06', path: '/pages/manage/inst-manage'}, - {id: 4, title: '混碾搬运', icon: 'RF01', path: '/pages/manage/hnby'}, - {id: 3, title: '扫码出库', icon: 'RF07', path: '/pages/manage/smck'}, - {id: 7, title: '压制满料搬运', icon: 'RF02', path: '/pages/manage/yzmlby'}, - {id: 8, title: '半成品解绑', icon: 'RF08', path: '/pages/manage/bcpjb'} + {title: '任务管理', icon: 'RF06', path: '/pages/manage/task-manage'}, + {title: '指令管理', icon: 'RF05', path: '/pages/manage/inst-manage'}, + {title: '混碾搬运', icon: 'RF01', path: '/pages/manage/hnby'}, + {title: '扫码出入库', icon: 'RF11', path: '/pages/manage/smck'}, + {title: '压制满料搬运', icon: 'RF02', path: '/pages/manage/yzmlby'}, + {title: '半成品解绑', icon: 'RF08', path: '/pages/manage/bcpjb'}, + {title: '混碾料罐绑定', icon: 'RF10', path: '/pages/manage/hnlgbd'}, + {title: '料罐物料查询', icon: 'RF09', path: '/pages/manage/hnlgcx'} ], show: false, secM: [] diff --git a/pages/manage/hnby.vue b/pages/manage/hnby.vue index 56e9af3..6696272 100644 --- a/pages/manage/hnby.vue +++ b/pages/manage/hnby.vue @@ -21,27 +21,31 @@ - 重量 + 条码 - + - + + + diff --git a/pages/manage/hnlgcx.vue b/pages/manage/hnlgcx.vue new file mode 100644 index 0000000..79492cb --- /dev/null +++ b/pages/manage/hnlgcx.vue @@ -0,0 +1,86 @@ + + + + + diff --git a/pages/manage/smck.vue b/pages/manage/smck.vue index e30dc6e..ab28cdc 100644 --- a/pages/manage/smck.vue +++ b/pages/manage/smck.vue @@ -4,10 +4,10 @@ - - 扫码出库 + + 木托盘编码 - + @@ -16,8 +16,9 @@ - - + + + @@ -35,7 +36,8 @@ return { title: '', val1: '', - disabled: false + disabled1: false, + disabled2: false }; }, onLoad (options) { @@ -44,20 +46,38 @@ methods: { clearUp () { this.val1 = null - this.disabled = false + this.disabled1 = false + this.disabled2 = false }, - async _pdaSmck () { - this.disabled = true + toSure1 () { + this.disabled1 = true + if (!this.val1) { + this.disabled1 = false + return + } + this._pdaSmck('1') + }, + toSure2 () { + this.disabled2 = true + if (!this.val1) { + this.disabled2 = false + return + } + this._pdaSmck('2') + }, + async _pdaSmck (type) { try { - let res = await pdaSmck(this.val1) - this.disabled = false + let res = await pdaSmck(this.val1, type) + this.disabled1 = false + this.disabled2 = false this.val1 = '' uni.showToast({ title: res.message, icon: 'none' }) } catch (e) { - this.disabled = false + this.disabled1 = false + this.disabled2 = false } } } diff --git a/static/image/menu/RF10.png b/static/image/menu/RF10.png new file mode 100644 index 0000000..df4e2f4 Binary files /dev/null and b/static/image/menu/RF10.png differ diff --git a/static/image/menu/RF11.png b/static/image/menu/RF11.png new file mode 100644 index 0000000..1bc47ed Binary files /dev/null and b/static/image/menu/RF11.png differ diff --git a/utils/getData2.js b/utils/getData2.js index 1f3dfdd..f5e2c52 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -24,21 +24,22 @@ export const handLogin = (user, password) => request({ /** * 混碾搬运 */ -export const pdaHnby = (sp, ep, weight) => request({ +export const pdaHnby = (sp, ep, code) => request({ url:'api/pda/hnby', data: { startPoint: sp, endPoint: ep, - weight: weight + barCode: code } }) /** - * 扫码出库 + * 扫码出入库 */ -export const pdaSmck = (code) => request({ +export const pdaSmck = (code, type) => request({ url:'api/pda/smck', data: { - barCode: code + barCode: code, + type: type } }) /** @@ -100,3 +101,23 @@ export const handInst = (type, id) => request({ inst_uuid: id } }) +/** + * 混碾料罐绑定 + */ +export const hnlgbd = (code, vcode, weight) => request({ + url:'api/pda/hnlgbd', + data: { + deviceCode: code, + barCode: vcode, + weight: weight + } +}) +/** + * 料罐物料查询 + */ +export const hnlgcx = (vcode) => request({ + url:'api/pda/hnlgcx', + data: { + barCode: vcode + } +}) \ No newline at end of file