diff --git a/manifest.json b/manifest.json
index d978be5..f3cf7ab 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "欧伦",
"appid" : "__UNI__DE2F207",
"description" : "欧伦WMS手持系统",
- "versionName" : "1.1.0",
- "versionCode" : 110,
+ "versionName" : "1.1.1",
+ "versionCode" : 111,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/outbound/quhuo-confirm.vue b/pages/outbound/quhuo-confirm.vue
index b2a0d03..98b011b 100644
--- a/pages/outbound/quhuo-confirm.vue
+++ b/pages/outbound/quhuo-confirm.vue
@@ -74,7 +74,18 @@
- 回空载具点位
+ 回空载具起点
+
+
+
+
+
+
+
+ 回空载具终点
@@ -84,7 +95,7 @@
-
+
@@ -101,6 +112,7 @@
data() {
return {
val1: '',
+ val2: '',
options: [],
index: '',
currentData: {},
@@ -171,7 +183,7 @@
// this.disabled = false
// return
// }
- if (this.val1 && this.currentData.group_id && (this.isChecked || (!this.isChecked && this.index))) {
+ if (this.val1 && this.currentData.group_id && (this.isChecked || (!this.isChecked && this.val2 && this.index))) {
// console.log(1)
} else {
this.disabled = false
@@ -179,7 +191,7 @@
}
let checkflag = this.isChecked === false ? '0' : '1'
try {
- let res = await confirm(this.currentData.group_id, this.val1, type, checkflag, this.index)
+ let res = await confirm(this.currentData.group_id, this.val1, this.val2, type, checkflag, this.index)
if (res.code === '200') {
uni.showToast({
title: res.message,
diff --git a/utils/getData3.js b/utils/getData3.js
index a4466b8..db26efc 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -107,9 +107,9 @@ export const iosOutgetVehicleMaterial = (search) => request({
data: {search: search}
})
// 出库确认
-export const confirm = (gid, scode, type, isAutoReturn, siteCode) => request({
+export const confirm = (gid, scode, startCode, type, isAutoReturn, siteCode) => request({
url:'api/pda/iosOut/confirm',
- data: {group_id: gid, storagevehicle_code: scode, type: type, isAutoReturn: isAutoReturn, siteCode: siteCode}
+ data: {group_id: gid, storagevehicle_code: scode, startCode: startCode, type: type, isAutoReturn: isAutoReturn, siteCode: siteCode}
})
// 货架绑定/解绑
export const bindOrUnbind = (siteCode, shelfCode, mode) => request({