From 69e5f4f1163a242cddcb96e37690579c1146a4c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Wed, 4 Dec 2024 13:09:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=87=BA=E5=BA=93=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/outbound/bill-list.vue      | 32 ++++++++-----------------------
 pages/outbound/bill-out-store.vue | 27 ++++++++++++++++++++++++--
 utils/getData2.js                 |  4 ++--
 3 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/pages/outbound/bill-list.vue b/pages/outbound/bill-list.vue
index fc9dd46..b926f2b 100644
--- a/pages/outbound/bill-list.vue
+++ b/pages/outbound/bill-list.vue
@@ -56,7 +56,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-primary" @tap="seachList">查询</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_outStorageOrderConfirm">确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !pkId}" @tap="toSure">确认</button>
 		</view>
 	</view>
 </template>
@@ -64,7 +64,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {outStorageOrderList, outStorageOrderConfirm} from '@/utils/getData2.js'
+	import {outStorageOrderList} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -77,6 +77,7 @@
 				code: '',
 				dataList: [],
 				pkId: '',
+				pkObj: {},
 				disabled: false,
 				reload: false,
 				status: 'more',
@@ -140,29 +141,12 @@
 			},
 			toChek (e) {
 				this.pkId = this.pkId === e.code ? '' : e.code
+				this.pkObj = this.pkId === e.code ? e : {}
 			},
-			async _outStorageOrderConfirm () {
-				this.disabled = true
-				if (!this.pkId) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await outStorageOrderConfirm(this.pkId)
-					if (res.code === '200') {
-						if (res.content.length > 0) {
-							this.$store.dispatch('setPublicObj', res.content[0])
-							uni.navigateBack()
-						}
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
-					}
-					this.disabled = false
-				} catch (e) {
-					this.disabled = false
+			toSure () {
+				if (this.pkId) {
+					this.$store.dispatch('setPublicObj', this.pkObj)
+					uni.navigateBack()
 				}
 			}
 		}
diff --git a/pages/outbound/bill-out-store.vue b/pages/outbound/bill-out-store.vue
index a1823ba..d97b71e 100644
--- a/pages/outbound/bill-out-store.vue
+++ b/pages/outbound/bill-out-store.vue
@@ -35,7 +35,7 @@
 				<view class="zd-row">
 					<view class="zd-col-6"><span class="filter_label">仓库</span></view>
 					<view class="zd-col-6 filter_select">
-						<uni-data-select v-model="currentData.stor_code" :localdata="options1"></uni-data-select>
+						<uni-data-select v-model="currentData.stor_code" :localdata="options1" @change="selectChange1"></uni-data-select>
 					</view>
 					<view class="zd-col-6"><span class="filter_label">车间</span></view>
 					<view class="zd-col-6 filter_select">
@@ -90,7 +90,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {outStorageOrder, outStorageOrderList, outStorageConfirm} from '@/utils/getData2.js'
+	import {outStorageOrder, outStorageOrderList, outStorageConfirm, outStorageOrderConfirm} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -140,6 +140,29 @@
 					})
 				}
 			},
+			selectChange1 (e) {
+				this.currentData.stor_code = e
+				if (e) {
+					this._outStorageOrderConfirm(e)
+				}
+			},
+			async _outStorageOrderConfirm (e) {
+				try {
+					let res = await outStorageOrderConfirm(this.currentData.code, e)
+					if (res.code === '200') {
+						if (res.content.length > 0) {
+							this.currentData = res.content[0]
+						}
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				} catch (e) {
+					console.log(e)
+				}
+			},
 			handleBlur (e) {
 				if (e.now_assign_qty < 0 || e.now_assign_qty > e.qty) {
 					e.now_assign_qty = e.qty
diff --git a/utils/getData2.js b/utils/getData2.js
index 73674ea..fb0706f 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -154,9 +154,9 @@ export const outStorageOrderList = (page, size, type, code) => request({
 	method: 'GET',
 	url:'api/pda/outStorage/orderList?page=' + page + '&size=' + size + '&form_type=' + type + '&code=' + code
 })
-export const outStorageOrderConfirm = (code) => request({
+export const outStorageOrderConfirm = (code, scode) => request({
 	url:'api/pda/outStorage/orderConfirm',
-	data: {code: code}
+	data: {code: code, stor_code: scode}
 })
 export const outStorageConfirm = (obj) => request({
 	url:'api/pda/outStorage/confirm',