change

manifest.json

@@ -2,8 +2,8 @@
     "name" : "欧伦",
     "appid" : "__UNI__DE2F207",
     "description" : "欧伦WMS手持系统",
-    "versionName" : "1.1.5",
-    "versionCode" : 115,
+    "versionName" : "1.1.6",
+    "versionCode" : 116,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/outbound/out-store-confirm.vue

@@ -67,8 +67,8 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !this.currentData.group_id}" :disabled="disabled" @tap="_confirm('2')">强制确认</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !this.currentData.group_id}" :disabled="disabled" @tap="_confirm('1')">出库确认</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !this.currentData.group_id}" :disabled="disabled" @tap="_outstoreconfirm('2')">强制确认</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !this.currentData.group_id}" :disabled="disabled" @tap="_outstoreconfirm('1')">出库确认</button>
 		</view>
 	</view>
 </template>
@@ -76,7 +76,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {iosOutgetVehicleMaterial, confirm} from '@/utils/getData3.js'
+	import {iosOutgetVehicleMaterial, outstoreconfirm} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -117,14 +117,14 @@
 					this.currentData = {}
 				}
 			},
-			async _confirm (type) {
+			async _outstoreconfirm (type) {
 				this.disabled = true
 				if (!this.val1 || !this.currentData.group_id) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await confirm(this.currentData.group_id, this.val1, type)
+					let res = await outstoreconfirm(this.currentData.group_id, this.val1, type)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.message,

utils/getData3.js

@@ -111,6 +111,10 @@ export const confirm = (gid, scode, startCode, type, isAutoReturn, siteCode) =>
 	url:'api/pda/iosOut/confirm',
 	data: {group_id: gid, storagevehicle_code: scode, startCode: startCode, type: type, isAutoReturn: isAutoReturn, siteCode: siteCode}
 })
+export const outstoreconfirm = (gid, scode, type) => request({
+	url:'api/pda/iosOut/confirm',
+	data: {group_id: gid, storagevehicle_code: scode, type: type}
+})
 // 货架绑定/解绑
 export const bindOrUnbind = (siteCode, shelfCode, mode) => request({
 	url:'api/pda/iosOut/bindOrUnbind',