From 66c37bcd25c2962f16d0b64a33f8aa82ad215a90 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Fri, 15 Sep 2023 16:38:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=A1=86=E5=87=BA=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/warehouse/EmptyOutStore.vue        | 37 +++++++++++++++++++----
 pages/warehouse/SemifinishedOutStore.vue | 37 +++++++++++++++++++----
 utils/getData1.js                        | 38 +++++++++++++++++-------
 3 files changed, 90 insertions(+), 22 deletions(-)

diff --git a/pages/warehouse/EmptyOutStore.vue b/pages/warehouse/EmptyOutStore.vue
index 5746579..39a5d4d 100644
--- a/pages/warehouse/EmptyOutStore.vue
+++ b/pages/warehouse/EmptyOutStore.vue
@@ -14,6 +14,12 @@
 						/>
 					</view>
 				</view>
+				<view class="filter_item">
+					<view class="filter_label">点位</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -39,7 +45,7 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val1}" :disabled="disabled" @tap="toSure">出库确认</button>
+			<button class="submit-button" :class="{'btn-disabled': !index && !checkArr.length}" :disabled="disabled" @tap="toSure">出库确认</button>
 			<button class="submit-button" @tap="_empOutgetIvt(val1)">查询</button>
 		</view>
 	</view>
@@ -48,7 +54,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {empOutgetIvt, empOutconfirm} from '@/utils/getData1.js'
+	import {empOutgetIvt, empOutgetPoint, empOutconfirm} from '@/utils/getData1.js'
 	export default {
 		components: {
 			NavBar,
@@ -56,19 +62,37 @@
 		},
 		data() {
 			return {
+				options: [],
+				index: '',
 				val1: '',
 				dataList: [],
 				checkArr: [],
 				disabled: false
 			};
 		},
+		created () {
+			this._empOutgetIvt()
+		},
 		methods: {
 			handleChange (e) {
 				this._empOutgetIvt(e)
 			},
+			/** 选择器 */
+			selectChange(e) {
+				this.index = e
+			},
+			/** 点位下拉框查询 */
+			async _empOutgetPoint () {
+				let res = await empOutgetPoint()
+				res.data.map(el => {
+					this.$set(el, 'value', el.point_code)
+					this.$set(el, 'text', el.point_name)
+				})
+				this.options = [...res.data]
+			},
 			/** grid查询 */
 			async _empOutgetIvt (e) {
-				let res = await empOutgetIvt(e)
+				let res = await empOutgetIvt(e, this.index)
 				res.data.map(el => {
 					this.$set(el, 'checked', false)
 				})
@@ -81,14 +105,15 @@
 			/** 确认 */
 			async toSure () {
 				this.disabled = true
-				if (!this.val1) {
+				if (!this.index || !this.checkArr.length) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await empOutconfirm(this.checkArr)
+					let res = await empOutconfirm(this.checkArr, this.index)
 					this.disabled = false
-					this.val1 = ''
+					this.dataList = []
+					this._empOutgetIvt()
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
diff --git a/pages/warehouse/SemifinishedOutStore.vue b/pages/warehouse/SemifinishedOutStore.vue
index a839292..9f0433e 100644
--- a/pages/warehouse/SemifinishedOutStore.vue
+++ b/pages/warehouse/SemifinishedOutStore.vue
@@ -14,6 +14,12 @@
 						/>
 					</view>
 				</view>
+				<view class="filter_item">
+					<view class="filter_label">点位</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -49,7 +55,7 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val1}" :disabled="disabled" @tap="toSure">出库确认</button>
+			<button class="submit-button" :class="{'btn-disabled': !index && !checkArr.length}" :disabled="disabled" @tap="toSure">出库确认</button>
 			<button class="submit-button" @tap="_iosOutgetIvt(val1)">查询</button>
 		</view>
 	</view>
@@ -58,7 +64,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {iosOutgetIvt, iosOutconfirm} from '@/utils/getData1.js'
+	import {iosOutgetIvt, iosOutgetPoint, iosOutconfirm} from '@/utils/getData1.js'
 	export default {
 		components: {
 			NavBar,
@@ -66,19 +72,37 @@
 		},
 		data() {
 			return {
+				options: [],
+				index: '',
 				val1: '',
 				dataList: [],
 				checkArr: [],
 				disabled: false
 			};
 		},
+		created () {
+			this._iosOutgetPoint()
+		},
 		methods: {
 			handleChange (e) {
 				this._iosOutgetIvt(e)
 			},
+			/** 选择器 */
+			selectChange(e) {
+				this.index = e
+			},
+			/** 点位下拉框查询 */
+			async _iosOutgetPoint () {
+				let res = await iosOutgetPoint()
+				res.data.map(el => {
+					this.$set(el, 'value', el.point_code)
+					this.$set(el, 'text', el.point_name)
+				})
+				this.options = [...res.data]
+			},
 			/** grid查询 */
 			async _iosOutgetIvt (e) {
-				let res = await iosOutgetIvt(e)
+				let res = await iosOutgetIvt(e, this.index)
 				res.data.map(el => {
 					this.$set(el, 'checked', false)
 				})
@@ -91,14 +115,15 @@
 			/** 确认 */
 			async toSure () {
 				this.disabled = true
-				if (!this.val1) {
+				if (!this.index || !this.checkArr.length) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await iosOutconfirm(this.checkArr)
+					let res = await iosOutconfirm(this.checkArr, this.index)
 					this.disabled = false
-					this.val1 = ''
+					this.dataList = []
+					this._iosOutgetPoint()
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
diff --git a/utils/getData1.js b/utils/getData1.js
index d57a5fc..dff5f8d 100644
--- a/utils/getData1.js
+++ b/utils/getData1.js
@@ -4,32 +4,50 @@ import request from './request.js'
  * 半成品出库
  */
 // 1.1半成品出库页面
-export const iosOutgetIvt = (mspec) => request({
+export const iosOutgetIvt = (mspec, pcode) => request({
 	url:'api/pda/hrBcp/iosOut/getIvt',
 	data: {
-		material_spec: mspec
+		material_spec: mspec,
+		point_code: pcode
 	}
 })
-// 1.5出库确认（按钮） -- 多选
-export const iosOutconfirm = (rows) => request({
+// 1.2点位下拉框
+export const iosOutgetPoint = () => request({
+	url:'api/pda/hrBcp/iosOut/getPoint',
+	data: {}
+})
+// 1.3出库确认（按钮） -- 多选
+export const iosOutconfirm = (rows, pcode) => request({
 	url:'api/pda/hrBcp/iosOut/confirm',
-	rows: rows
+	data: {
+		rows: rows,
+		point_code: pcode
+	}
 })
 
 /**
  * 空箱出库
  */
 // 1.1空箱出库页面
-export const empOutgetIvt = (scode) => request({
+export const empOutgetIvt = (scode, pcode) => request({
 	url:'api/pda/hrBcp/empOut/getIvt',
 	data: {
-		storagevehicle_code: scode
+		storagevehicle_code: scode,
+		point_code: pcode
 	}
 })
-// 1.5出库确认（按钮） -- 多选
-export const empOutconfirm = (rows) => request({
+// 1.2出库确认（按钮） -- 多选
+export const empOutconfirm = (rows, pcode) => request({
 	url:'api/pda/hrBcp/empOut/confirm',
-	rows: rows
+	data: {
+		rows: rows,
+		point_code: pcode
+	}
+})
+// 1.3点位下拉框
+export const empOutgetPoint = () => request({
+	url:'api/pda/hrBcp/empOut/getPoint',
+	data: {}
 })
 
 /**