lilei преди 3 години
родител
ревизия
5922d3fae2
променени са 2 файла, в които са добавени 21 реда и са изтрити 3 реда
  1. 7 0
      api/shelf.js
  2. 14 3
      pages/digitalShelf/choosePartResult.vue

+ 7 - 0
api/shelf.js

@@ -75,6 +75,13 @@ export const outShelfOrder = (params) => {
     method: 'get'
     method: 'get'
   })
   })
 }
 }
+// 一键取货
+export const takeGoods = (params) => {
+  return request({
+    url: `shelfOrder/takeGoods/${params.sn}`,
+    method: 'get'
+  })
+}
 // 扫码确认
 // 扫码确认
 export const scanConfirmShelfOrder = (params) => {
 export const scanConfirmShelfOrder = (params) => {
   return request({
   return request({

+ 14 - 3
pages/digitalShelf/choosePartResult.vue

@@ -11,7 +11,7 @@
 					<view class="messageText" v-html="info&&info.remindMessage||''"></view>
 					<view class="messageText" v-html="info&&info.remindMessage||''"></view>
 					<view class="button-group">
 					<view class="button-group">
 						<button :hover-stop-propagation="true" @click="toScan" v-if="state == 1&&partList.length" class="back" size="mini">扫码取货</button>
 						<button :hover-stop-propagation="true" @click="toScan" v-if="state == 1&&partList.length" class="back" size="mini">扫码取货</button>
-						<button :hover-stop-propagation="true" @click="onceQh" v-if="state == 1&&partList.length" class="action" size="mini">一键取货</button>
+						<button :hover-stop-propagation="true" :loading="loading" @click="onceQh" v-if="state == 1&&partList.length" class="action" size="mini">一键取货</button>
 						<button :hover-stop-propagation="true" @click="toSettle" v-if="state == 0" class="actionFail" size="mini">去结算</button>
 						<button :hover-stop-propagation="true" @click="toSettle" v-if="state == 0" class="actionFail" size="mini">去结算</button>
 					</view>
 					</view>
 				</view>
 				</view>
@@ -102,7 +102,7 @@
 <script>
 <script>
 	import uniIcons from "@/components/uni-icons/uni-icons.vue"
 	import uniIcons from "@/components/uni-icons/uni-icons.vue"
 	import moment from 'moment'
 	import moment from 'moment'
-	import { findBySnShelfOrder } from '@/api/shelf'
+	import { findBySnShelfOrder, takeGoods } from '@/api/shelf'
 	import { clzConfirm } from '@/libs/tools.js'
 	import { clzConfirm } from '@/libs/tools.js'
 	export default {
 	export default {
 	   name: 'choosePartResult',
 	   name: 'choosePartResult',
@@ -111,6 +111,7 @@
 	   },
 	   },
 	   data() {
 	   data() {
 		   return {
 		   return {
+			   loading: false,
 			   info: null,
 			   info: null,
 			   statusText: '',
 			   statusText: '',
 			   statusIcon: '', // 结算状态icon
 			   statusIcon: '', // 结算状态icon
@@ -178,7 +179,17 @@
 		 },
 		 },
 		 // 一键取货
 		 // 一键取货
 		 onceQh(){
 		 onceQh(){
-			 
+			 this.loading = true
+			 takeGoods({sn:this.shelfOrderSn}).then(res => {
+				 if(res.status == 200){
+					 uni.navigateBack()
+				 }
+				 uni.showToast({
+				 	title: res.message,
+				 	icon:"none"
+				 })
+				 this.loading = false
+			 })
 		 },
 		 },
 		 // 去结算
 		 // 去结算
 		 toSettle(){
 		 toSettle(){