From dc5f34b9b6f93acf639245db5f7c6f1f868226e8 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 30 May 2024 19:21:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.css         |  3 +++
 pages/management/in-storage.vue | 24 ++++++++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/common/style/layout.css b/common/style/layout.css
index 46b534b..2dc7de0 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -528,4 +528,7 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 .uni-calendar-item__weeks-box-item {
 	width: 40px !important;
 	height: 40px !important;
+}
+.uni-select__selector-empty {
+	color: #fff
 }
\ No newline at end of file
diff --git a/pages/management/in-storage.vue b/pages/management/in-storage.vue
index a97a120..0fe0655 100644
--- a/pages/management/in-storage.vue
+++ b/pages/management/in-storage.vue
@@ -6,11 +6,7 @@
 				<view class="zd-col-24 zd-row">
 					<view class="zd-col-8"><search-box v-model="val1" /></view>
 					<view class="zd-col-8 select_wraper">
-						<uni-data-select
-						placeholder="请选择仓库名称"
-						 v-model="value1"
-						 :localdata="range1"
-						></uni-data-select>
+						<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
 					</view>
 					<view class="zd-col-7 select_wraper">
 						<uni-data-select
@@ -179,7 +175,7 @@
 	import ScanInput from '@/components/ScanInput.vue'
 	import Pagination from '@/components/Pagination.vue'
 	import GridDetail from '@/components/GridDetail.vue'
-	import {easOutInBillPage, easOutInBillDetailPage, easOutInBillUpdate, easOutInBillDetailUpdate, queryInventoryInfo} from '@/utils/getData2.js'
+	import {getWarehouseInfo, easOutInBillPage, easOutInBillDetailPage, easOutInBillUpdate, easOutInBillDetailUpdate, queryInventoryInfo} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -226,7 +222,7 @@
 				value: '',
 				range:[{value: 1, text: '提交'}, {value: 2, text: '审核'}],
 				value1: '',
-				range1: [{value: '3.03.013', text: '三期原材料库'}]
+				range1: []
 			};
 		},
 		onShow() {
@@ -243,9 +239,21 @@
 			this.crType = options.type
 		},
 		created () {
-			this.toSearch()
+			this._getWarehouseInfo()
 		},
 		methods: {
+			// 仓库下拉框
+			async _getWarehouseInfo () {
+				let res = await getWarehouseInfo()
+				if (res.code === 1) {
+					this.range1 = [...res.result]
+					this.range1.map(e => {
+						this.$set(e, 'text', e.ckmc)
+						this.$set(e, 'value', e.ckbm)
+					})
+					this.toSearch()
+				}
+			},
 			// 查询一级表格
 			toSearch () {
 				this.queryParams1 = {