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 @@
-
+
+
+
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 @@
+
+
+
+
+
+
+
+ 料罐条码
+
+
+
+
+
+
+
+ 物料编码
+
+
+ {{code}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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