diff --git a/src/views/wms/odsRawOrderIn/index.vue b/src/views/wms/odsRawOrderIn/index.vue
index 132489c..02b2bc4 100644
--- a/src/views/wms/odsRawOrderIn/index.vue
+++ b/src/views/wms/odsRawOrderIn/index.vue
@@ -1,6 +1,7 @@
 <template>
 	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
+    <div ref="pageHeaderRef">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="送货单号" prop="orderNo">
         <el-input
           v-model="queryParams.orderNo"
@@ -34,15 +35,16 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="物料描述" prop="materialDesc">
-				<el-input
-					v-model="queryParams.materialDesc"
-					placeholder="请输入物料描述"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-
+      <el-form-item label="订单状态" prop="status">
+        <el-select v-model="queryParams.orderStatus" placeholder="请选择拆分状态" clearable>
+          <el-option
+            v-for="dict in order_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
 			<el-form-item label="供应商编码" prop="supplyCode" width="180">
 				<el-input
 					v-model="queryParams.supplyCode"
@@ -52,6 +54,17 @@
 				/>
 			</el-form-item>
 
+      <el-form-item label="收货时间" prop="deliveryTimeArray">
+        <el-date-picker
+          v-model="queryParams.deliveryTimeArray"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+
 			<el-form-item>
 				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -136,8 +149,9 @@
 			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
+    </div>
 
-		<el-table v-loading="loading" :data="odsRawOrderInList" @selection-change="handleSelectionChange">
+		<el-table v-loading="loading" :data="odsRawOrderInList" @selection-change="handleSelectionChange" :max-height="tableHeight">
 			<el-table-column type="selection" width="55" align="center" />
       <el-table-column label="送货单号" align="center" prop="orderNo" width="130"/>
       <el-table-column label="物料编码" align="center" prop="materialCode"  min-width="150">
@@ -360,11 +374,19 @@
 
 <script>
 import { listOdsRawOrderIn, getOdsRawOrderIn, delOdsRawOrderIn, addOdsRawOrderIn, updateOdsRawOrderIn ,sap105temporarilyCollected,handleUpdateSAP103,handleUpdateSAP105} from "@/api/wms/odsRawOrderIn";
+import moment from "moment/moment";
+import useTableMaxHeight from "@/utils/useTableMaxHeight";
 
 export default {
 	name: "OdsRawOrderIn",
-	data() {
+  mixins: [useTableMaxHeight],
+  data() {
 		return {
+      order_status:[
+        {label:"暂收",value:"0"},
+        {label:"收货完成",value:"1"},
+        {label:"冲销",value:"5"},
+      ],
 			// 遮罩层
 			loading: true,
 			// 选中数组
@@ -385,6 +407,7 @@ export default {
 			open: false,
 			// 查询参数
 			queryParams: {
+        deliveryTimeArray:undefined,
 				pageNum: 1,
 				pageSize: 10,
 				factoryCode: null,
@@ -448,9 +471,18 @@ export default {
 	created() {
 		this.getList();
 	},
+  mounted() {
+    this.pageHeaderRef = this.$refs.pageHeaderRef
+  },
 	methods: {
 		/** 查询包材到货单列表 */
 		getList() {
+
+      if(this.queryParams.deliveryTimeArray!=null){
+        this.queryParams.deliveryTimeStart = moment(this.queryParams.deliveryTimeArray[0]).format('YYYY-MM-DD');
+        this.queryParams.deliveryTimeEnd = moment(this.queryParams.deliveryTimeArray[1]).format('YYYY-MM-DD');
+      }
+
 			this.loading = true;
 			listOdsRawOrderIn(this.queryParams).then(response => {
 				this.odsRawOrderInList = response.rows;