From e7f045da19d02bd6d2e0af5505687e7ced84a3d9 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 16 Aug 2024 10:55:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=BC=96=E7=A0=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/entry/mater-group-to-store.vue | 33 ++++++++++++++++++++++++----
 utils/getData2.js                    |  4 ++++
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/pages/entry/mater-group-to-store.vue b/pages/entry/mater-group-to-store.vue
index 92f81c3..e322f83 100644
--- a/pages/entry/mater-group-to-store.vue
+++ b/pages/entry/mater-group-to-store.vue
@@ -72,8 +72,9 @@
 					<view class="zd-col-7">
 						<span class="filter_label">仓库编码</span>
 					</view>
-					<view class="zd-col-24">
-						<search-box v-model="currentData.stor_code"/>
+					<view class="zd-col-24 filter_select">
+						<!-- <search-box v-model="currentData.stor_code"/> -->
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
 			</view>
@@ -88,7 +89,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {groupMaterIn} from '@/utils/getData2.js'
+	import {storList, groupMaterIn} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -98,19 +99,41 @@
 			return {
 				title: '',
 				currentData: {},
+				options: [],
+				index: '',
 				disabled: false
 			};
 		},
 		onLoad (options) {
 			this.title = options.title
+			this._storList()
 		},
 		onShow () {
 			if (this.$store.getters.publicObj !== '') {
 				this.currentData = this.$store.getters.publicObj
+				if(this.currentData.stor_code !== '' && this.currentData.stor_code !== null && this.currentData.stor_code !== undefined) {
+					this.options.map(el => {
+						if (el.value === this.currentData.stor_code) {
+							this.index = el.value
+						}
+					})
+				}
 				this.$store.dispatch('setPublicObj', '')
 			}
 		},
 		methods: {
+			selectChange (e) {
+				this.index = e
+			},
+			async _storList () {
+				let res = await storList()
+				if (res.code === '200') {
+					this.options = [...res.content]
+					this.options.map(el => {
+						this.$set(el, 'text', el.label)
+					})
+				}
+			},
 			toJump () {
 				uni.navigateTo({
 					url: '/pages/common/mater-list?title=查询物料'
@@ -118,6 +141,7 @@
 			},
 			toEmpty () {
 				this.currentData = {}
+				this.index = ''
 				this.disabled = false
 			},
 			async _groupMaterIn () {
@@ -127,7 +151,8 @@
 					return
 				}
 				try {
-					let res = await groupMaterIn(this.currentData.stor_code, this.currentData)
+					this.currentData.stor_code = this.index
+					let res = await groupMaterIn(this.index, this.currentData)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.msg,
diff --git a/utils/getData2.js b/utils/getData2.js
index 6ccbea3..2e16ea4 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -24,6 +24,10 @@ export const handLogin = (user, password) => request({
 /**
  * 物料组盘入库
  */
+export const storList = () => request({
+	url:'api/pda/common/storList',
+	data: {}
+})
 export const groupMaterList = (page, size, search) => request({
 	url:'api/groupMater/maters',
 	data: {page: page, size: size, search: search}