diff --git a/pages.json b/pages.json
index e7fd091..04d7bf4 100644
--- a/pages.json
+++ b/pages.json
@@ -514,7 +514,7 @@
}
}
,{
- "path" : "pages/zw/ltzp",
+ "path" : "pages/zw/wlrk",
"style" :
{
"navigationStyle": "custom"
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 32a5a52..890f741 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -43,7 +43,7 @@
menuList: [
{title: '原料管理', path: 'RF04', sonTree: [{title: '来料入库', path: '/pages/zw/ll-instore'}, {title: '空载具入库', path: '/pages/zw/kzj-instore'}, {title: '空载具出库', path: '/pages/zw/kzj-outstore'}, {title: '点位属性设置', path: '/pages/zw/point-attrset'}, {title: '物料组盘', path: '/pages/zw/wl-groupplate'}, {title: '点位更新', path: '/pages/zw/confirm-quhuo'}]},
{title: '解包管理', path: 'RF03', sonTree: [{title: '解包上料', path: '/pages/zw/jb-up-mater'}, {title: '解包出桶', path: '/pages/zw/jb-lower-mater'}, {title: '解包退料', path: '/pages/zw/jb-return-mater'}, {title: '人车安全', path: '/pages/zw/mancar-safe'}]},
- {title: '缓存管理', path: 'RF06', sonTree: [{title: '料桶盘点', path: '/pages/zw/materbox-instore'}, {title: '物料入库', path: '/pages/zw/ltzp'}]},
+ {title: '缓存管理', path: 'RF06', sonTree: [{title: '料桶盘点', path: '/pages/zw/materbox-instore'}, {title: '物料入库', path: '/pages/zw/wlrk'}]},
{title: '产线管理', path: 'RF02', sonTree: [{title: '手工叫料', path: '/pages/zw/manual-callmater'}, {title: '手工退料', path: '/pages/zw/manual-returnmater'}]},
{title: '作业管理', path: 'RF07', sonTree: [{title: '作业管理', path: '/pages/zw/zygl'}]},
// {title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '合格证入库', path: '/pages/entry/qualified-to-store'}, {title: '单据入库', path: '/pages/entry/bill-to-store'}, {title: '盘点入库', path: '/pages/entry/check-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]},
diff --git a/pages/zw/ltzp.vue b/pages/zw/wlrk.vue
similarity index 85%
rename from pages/zw/ltzp.vue
rename to pages/zw/wlrk.vue
index 8ecfefc..7515685 100644
--- a/pages/zw/ltzp.vue
+++ b/pages/zw/wlrk.vue
@@ -9,7 +9,7 @@
物料编码
-
+
@@ -17,7 +17,7 @@
物料名称
-
+
@@ -25,7 +25,7 @@
物料规格
-
+
@@ -33,7 +33,7 @@
物料单重
-
+
KG
@@ -42,7 +42,7 @@
物料批次
-
+
@@ -53,14 +53,6 @@
-
料桶编码
@@ -124,6 +116,12 @@
return {
title: '',
currentData: {},
+ materId: '',
+ materCode: '',
+ materName: '',
+ materSpec: '',
+ singleWeight: '',
+ materPcsn: '',
options: [],
index: '',
options2: [],
@@ -155,6 +153,13 @@
onShow () {
if (this.$store.getters.publicObj !== '') {
this.currentData = this.$store.getters.publicObj
+ // 赋值
+ this.materCode = this.currentData.material_code
+ this.materName = this.currentData.material_name
+ this.materSpec = this.currentData.material_spec
+ this.singleWeight = this.currentData.single_weight
+ this.materPcsn = this.currentData.pcsn
+ this.materId = this.currentData.material_id
this.$store.dispatch('setPublicObj', '')
}
},
@@ -218,19 +223,13 @@
url: '/pages/common/mater-list?title=查询物料'
})
},
- handleChange (e) {
- if (e) {
- if (e.charAt(0).toUpperCase() === 'T') {
- this.index ='FStockPallet'
- } else {
- this.index ='FStockId'
- }
- }
- },
- handleDel () {
- this.index = ''
- },
toEmpty () {
+ this.materCode = ''
+ this.materName = ''
+ this.materSpec = ''
+ this.singleWeight = ''
+ this.materPcsn = ''
+ this.materId = ''
this.currentData = {}
this.index = ''
this.vehicleCode = ''
@@ -245,10 +244,10 @@
this.disabled = false
return
}
- if (Number(this.currentData.single_weight) > 2000) {
+ if (Number(this.singleWeight) > 2000) {
uni.showModal({
title: '提示',
- content: '输入的重量'+ Number(this.currentData.single_weight) +'过大，是否继续？',
+ content: '输入的重量'+ Number(this.singleWeight) +'过大，是否继续？',
confirmColor: '#ff6a00',
success: (res) => {
if (res.confirm) {
@@ -265,7 +264,7 @@
async _combination () {
try {
let selobj = this.options.find(item => item.value === this.index)
- let res = await combination(this.vehicleCode, this.currentData.pcsn, this.currentData.material_id, selobj.value, selobj.text, this.currentData.single_weight)
+ let res = await combination(this.vehicleCode, this.materPcsn, this.materId, selobj.value, selobj.text, this.singleWeight)
uni.showToast({
title: res.message,
icon: 'none'
@@ -282,10 +281,10 @@
this.disabled = false
return
}
- if (Number(this.currentData.single_weight) > 2000) {
+ if (Number(this.singleWeight) > 2000) {
uni.showModal({
title: '提示',
- content: '输入的重量'+ Number(this.currentData.single_weight) +'过大，是否继续？',
+ content: '输入的重量'+ Number(this.singleWeight) +'过大，是否继续？',
confirmColor: '#ff6a00',
success: (res) => {
if (res.confirm) {
@@ -302,7 +301,7 @@
async _groupAndBind () {
try {
let selobj = this.options.find(item => item.value === this.index)
- let res = await groupAndBind(this.vehicleCode, this.currentData.pcsn, this.currentData.material_id, selobj.value, selobj.text, this.currentData.single_weight, this.index2)
+ let res = await groupAndBind(this.vehicleCode, this.materPcsn, this.materId, selobj.value, selobj.text, this.singleWeight, this.index2)
uni.showToast({
title: res.message,
icon: 'none'