From a2f7cedc053d06c4e744610377fab41eecabf9bd Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Mon, 14 Jul 2025 09:46:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/entry/empty-vehicle-instore.vue |  2 +-
 pages/outbound/line-callmater.vue     | 12 ++++++------
 pages/outbound/mater-outstore.vue     |  6 +++---
 utils/getData3.js                     |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pages/entry/empty-vehicle-instore.vue b/pages/entry/empty-vehicle-instore.vue
index f8e534c..42b9a2f 100644
--- a/pages/entry/empty-vehicle-instore.vue
+++ b/pages/entry/empty-vehicle-instore.vue
@@ -65,7 +65,7 @@
 				title: '',
 				val1: '',
 				val2: '',
-				options: [{text:'托盘', value:'1'},{text:'料箱',value: '2'}],
+				options: [{text:'托盘', value:'1'},{text:'料箱',value: '2'},{text:'货架',value: '3'}],
 				index: '',
 				// options2: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
 				options2: [],
diff --git a/pages/outbound/line-callmater.vue b/pages/outbound/line-callmater.vue
index 7854345..e3e1bd7 100644
--- a/pages/outbound/line-callmater.vue
+++ b/pages/outbound/line-callmater.vue
@@ -57,7 +57,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}" @tap="_materialConfirm">确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !dataList.length}" @tap="_callMaterialConfirm">确认</button>
 		</view>
 	</view>
 </template>
@@ -65,7 +65,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getRegion, linegetMaterialDtl, materialConfirm} from '@/utils/getData3.js'
+	import {getRegion, linegetMaterialDtl, callMaterialConfirm} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -106,7 +106,7 @@
 		methods: {
 			async _getRegion () {
 				try {
-					let res = await getRegion()
+					let res = await getRegion('YZHJ')
 					if (res) {
 						this.options = res
 					} else {
@@ -166,14 +166,14 @@
 				this.pkId = this.pkId === e.group_id ? '' : e.group_id
 				this.pkObj = this.pkId === e.group_id ? e : {}
 			},
-			async _materialConfirm () {
+			async _callMaterialConfirm () {
 				this.disabled = true
-				if (!this.val1 || !this.val2 || !this.pkId) {
+				if (!this.val1 || !this.val2 || !this.dataList.length) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await materialConfirm(this.index, this.val1, this.pkObj)
+					let res = await callMaterialConfirm(this.index, this.val1, this.pkObj)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.message,
diff --git a/pages/outbound/mater-outstore.vue b/pages/outbound/mater-outstore.vue
index 9a3f6bd..5d2c469 100644
--- a/pages/outbound/mater-outstore.vue
+++ b/pages/outbound/mater-outstore.vue
@@ -57,7 +57,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}" @tap="_materialConfirm">确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !dataList.length}" @tap="_materialConfirm">确认</button>
 		</view>
 	</view>
 </template>
@@ -106,7 +106,7 @@
 		methods: {
 			async _getSect () {
 				try {
-					let res = await getSect()
+					let res = await getSect('XB')
 					if (res) {
 						this.options = res
 					} else {
@@ -168,7 +168,7 @@
 			},
 			async _materialConfirm () {
 				this.disabled = true
-				if (!this.val1 || !this.val2 || !this.pkId) {
+				if (!this.dataList.length) {
 					this.disabled = false
 					return
 				}
diff --git a/utils/getData3.js b/utils/getData3.js
index be2d710..1f9b6dd 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -23,14 +23,14 @@ export const handLogin = (user, password) => request({
 
 // 公共接口
 // 仓库列表/区域列表
-export const getSect = (page, size) => request({
+export const getSect = (scode, page, size) => request({
 	url:'api/pda/iosIn/getSect',
-	data: {page: page, size: size}
+	data: {stor_code: scode, page: page, size: size}
 })
 // 区域列表
-export const getRegion = (page, size) => request({
+export const getRegion = (region, page, size) => request({
 	url:'api/pda/iosIn/getRegion',
-	data: {page: page, size: size}
+	data: {region: region, page: page, size: size}
 })
 // 获取物料列表
 export const getMaterialList = (search, page, size) => request({