diff --git a/common/style/layout.css b/common/style/layout.css
index bbca117..0afcbee 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -543,4 +543,7 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 }
 .uni-select__selector-empty {
 	color: #fff
+}
+.uni-select__selector-item:hover {
+	background-color: #3F6ACA !important;
 }
\ No newline at end of file
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 5e22f59..16663a9 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -34,7 +34,7 @@
 			return {
 				intervalId: null,
 				interTime: this.$store.getters.setTime,
-				userName: this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : '',
+				userName: this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).person_name : '',
 				menuList: []
 			};
 		},
diff --git a/pages/management/alloc-maintenance.vue b/pages/management/alloc-maintenance.vue
index 6838a10..00d6bf2 100644
--- a/pages/management/alloc-maintenance.vue
+++ b/pages/management/alloc-maintenance.vue
@@ -2,9 +2,14 @@
 	<view class="content">
 		<nav-bar title="调拨维护"></nav-bar>
 		<view class="search-confirm-wrap">
-			<view class="zd-row jcflexstart">
-				<view class="zd-col-8"><search-box v-model="val1" /></view>
-				<button class="confirm-button" @tap="toSearch">查询</button>
+			<view class="zd-row">
+				<view class="zd-col-19 zd-row">
+					<view class="zd-col-10"><search-box v-model="val1" /></view>
+					<view class="zd-col-10 select_wraper">
+						<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
+					</view>
+					<button class="confirm-button" @tap="toSearch">查询</button>
+				</view>
 			</view>
 		</view>
 		<view class="zd-row jcflexstart table-title_wraper">调拨单</view>
@@ -230,7 +235,9 @@
 				date: '',
 				show: false,
 				modalObj: {},
-				disabled: false
+				disabled: false,
+				value1: '',
+				range1: []
 			};
 		},
 		created () {
@@ -246,6 +253,7 @@
 						this.$set(e, 'text', e.ckmc)
 						this.$set(e, 'value', e.ckbm)
 					})
+					this.range1 = [...this.range]
 					this.toSearch()
 				}
 			},
@@ -262,7 +270,7 @@
 			},
 			// 一级表格接口
 			async _allocationPage () {
-				let res = await allocationPage(this.val1, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
+				let res = await allocationPage(this.val1, this.value1, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
 				if (res.code === 1) {
 					this.dataList1 = [...res.result]
 					this.totalCount1 = Number(res.totalElements)
diff --git a/pages/management/receive-confirm.vue b/pages/management/receive-confirm.vue
index c020ed9..1f9b883 100644
--- a/pages/management/receive-confirm.vue
+++ b/pages/management/receive-confirm.vue
@@ -2,9 +2,14 @@
 	<view class="content">
 		<nav-bar title="收货确认"></nav-bar>
 		<view class="search-confirm-wrap">
-			<view class="zd-row jcflexstart">
-				<view class="zd-col-8"><search-box v-model="val1" /></view>
-				<button class="confirm-button" @tap="toSearch">查询</button>
+			<view class="zd-row">
+				<view class="zd-col-19 zd-row">
+					<view class="zd-col-10"><search-box v-model="val1" /></view>
+					<view class="zd-col-10 select_wraper">
+						<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
+					</view>
+					<button class="confirm-button" @tap="toSearch">查询</button>
+				</view>
 			</view>
 		</view>
 		<view class="zd-row jcflexstart table-title_wraper">收货确认</view>
@@ -202,7 +207,9 @@
 				range: [],
 				show: false,
 				modalObj: {},
-				disabled: false
+				disabled: false,
+				value1: '',
+				range1: []
 			};
 		},
 		created () {
@@ -218,6 +225,7 @@
 						this.$set(e, 'text', e.ckmc)
 						this.$set(e, 'value', e.ckbm)
 					})
+					this.range1 = [...this.range]
 					this.toSearch()
 				}
 			},
@@ -234,7 +242,7 @@
 			},
 			// 一级表格接口
 			async _receiptPage () {
-				let res = await receiptPage(this.val1, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
+				let res = await receiptPage(this.val1, this.value1, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
 				if (res.code === 1) {
 					this.dataList1 = [...res.result]
 					this.totalCount1 = Number(res.totalElements)
diff --git a/utils/getData2.js b/utils/getData2.js
index 669fa60..3bacb4c 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -69,10 +69,11 @@ export const getWarehouseInfo = () => request({
 	data: {}
 })
 // 2.查询调拨单据
-export const allocationPage = (fuzzy, page, size) => request({
+export const allocationPage = (fuzzy, ckbm, page, size) => request({
 	url:'api/allocationBill/allocationPage',
 	data: {
 		fuzzy: fuzzy,
+		ckbm: ckbm,
 		page: page,
 		size: size
 	}
@@ -101,10 +102,11 @@ export const allocationBillConfirm = (arr) => request({
  * 收货确认
  */
 // 1.收货单据分页
-export const receiptPage = (fuzzy, page, size) => request({
+export const receiptPage = (fuzzy, ckbm, page, size) => request({
 	url:'api/receiptBill/receiptPage',
 	data: {
 		fuzzy: fuzzy,
+		ckbm: ckbm,
 		page: page,
 		size: size
 	}