diff --git a/components/SearchBox.vue b/components/SearchBox.vue
index 71fa162..29ac87e 100644
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -44,6 +44,7 @@
},
toDel () {
this.$emit('input', '')
+ this.$emit('handleDel')
},
handleSend (e) {
this.$emit('input', e.target.value)
diff --git a/manifest.json b/manifest.json
index 420ecd7..946383a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "恒森",
"appid" : "__UNI__8D175E0",
"description" : "恒森WMS手持系统",
- "versionName" : "1.1.5",
- "versionCode" : 115,
+ "versionName" : "1.1.6",
+ "versionCode" : 116,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/entry/mater-group-to-store.vue b/pages/entry/mater-group-to-store.vue
index 607cd38..eb73625 100644
--- a/pages/entry/mater-group-to-store.vue
+++ b/pages/entry/mater-group-to-store.vue
@@ -65,7 +65,7 @@
载具编码
-
+
@@ -117,6 +117,12 @@
this.index = el.value
}
})
+ } else {
+ if (this.currentData.vehicle_code.charAt(0).toUpperCase() === 'T') {
+ this.index ='FStockPallet'
+ } else {
+ this.index ='FStockId'
+ }
}
this.$store.dispatch('setPublicObj', '')
}
@@ -140,10 +146,17 @@
})
},
handleChange (e) {
- if (e && e.charAt(0).toUpperCase() === 'T') {
- this.index ='FStockPallet'
+ if (e) {
+ if (e.charAt(0).toUpperCase() === 'T') {
+ this.index ='FStockPallet'
+ } else {
+ this.index ='FStockId'
+ }
}
},
+ handleDel () {
+ this.index = ''
+ },
toEmpty () {
this.currentData = {}
this.index = ''
diff --git a/pages/entry/qualified-to-store.vue b/pages/entry/qualified-to-store.vue
index 1485a30..55e6537 100644
--- a/pages/entry/qualified-to-store.vue
+++ b/pages/entry/qualified-to-store.vue
@@ -23,6 +23,7 @@
@@ -131,10 +132,17 @@
}
},
handleChange2 (e) {
- if (e && e.charAt(0).toUpperCase() === 'T') {
- this.index ='FStockPallet'
+ if (e) {
+ if (e.charAt(0).toUpperCase() === 'T') {
+ this.index ='FStockPallet'
+ } else {
+ this.index ='FStockId'
+ }
}
},
+ handleDel2 () {
+ this.index = ''
+ },
toEmpty () {
this.val1 = ''
this.val2 = ''
diff --git a/utils/getData2.js b/utils/getData2.js
index c1bd8e3..981d02d 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -31,7 +31,7 @@ export const storList = () => request({
// export const storList = () => {
// let res = {
// code: '200',
-// content: [{value: '1', label: 'aaaa'}]
+// content: [{value: 'FicStockId', label: '虚拟库编码'}, {value: 'FStockId', label: '料箱编码'}, {value: 'FStockPallet', label: '托盘库编码'}]
// }
// return res
// }