From 537b349a9fc0f1b281c5b23a67f24501445d585c Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 13 Apr 2023 18:56:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/management/DeliveryConfirm.vue |  9 ++++++++-
 pages/management/FinishedInStore.vue | 13 ++++++++-----
 utils/getData2.js                    |  8 ++++++++
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/pages/management/DeliveryConfirm.vue b/pages/management/DeliveryConfirm.vue
index 1752fd9..60fd279 100644
--- a/pages/management/DeliveryConfirm.vue
+++ b/pages/management/DeliveryConfirm.vue
@@ -31,7 +31,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getCacheLine, releasepoint} from '@/utils/getData2.js'
+	import {finishproductPoint, releasepoint} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -47,11 +47,18 @@
 				disabled2: false
 			};
 		},
+		created () {
+			this._finishproductPoint()
+		},
 		methods: {
 			/** 选择器1 */
 			selectChange1(e) {
 				this.index1 = e
 			},
+			async _finishproductPoint () {
+				let res = await finishproductPoint('2')
+				this.options1 = [...res]
+			},
 			toSure1 () {
 				this.disabled1 = true
 				if (!this.index1 || !this.val1) {
diff --git a/pages/management/FinishedInStore.vue b/pages/management/FinishedInStore.vue
index 5727951..e82b6d4 100644
--- a/pages/management/FinishedInStore.vue
+++ b/pages/management/FinishedInStore.vue
@@ -52,7 +52,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getCacheLine, InstoreOrder} from '@/utils/getData2.js'
+	import {finishproductPoint, InstoreOrder} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -60,7 +60,7 @@
 		},
 		data() {
 			return {
-				options1: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}],
+				options1: [],
 				index1: 'A1',
 				val1: '',
 				dataList: [],
@@ -76,6 +76,9 @@
 		destroyed () {
 			this.$store.dispatch('setPublicArr', '')
 		},
+		created () {
+			this._finishproductPoint()
+		},
 		methods: {
 			/** 选择器1 */
 			selectChange1(e) {
@@ -86,9 +89,9 @@
 			  this.pkId = ''
 			  this.$store.dispatch('setPublicArr', '')
 			},
-			async _inOutExceptionInstQuery () {
-				let res = await inOutExceptionInstQuery(this.index2)
-				this.dataList = [...res]
+			async _finishproductPoint () {
+				let res = await finishproductPoint('1')
+				this.options1 = [...res]
 			},
 			async toSure () {
 			  this.disabled = true
diff --git a/utils/getData2.js b/utils/getData2.js
index 1bfc1bd..518783f 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -192,3 +192,11 @@ export const semiProductInFromPda = (id, mid, qty, code) => request({
 	}
 })
 
+// 入库点/放货点获取
+export const finishproductPoint = (type) => request({
+	url:'api/pda/finishproduct/point',
+	data: {
+		type: type
+	}
+})
+