diff --git a/src/views/inout/receive/receiveAudit.vue b/src/views/inout/receive/receiveAudit.vue
index 994bdda1..456e2787 100644
--- a/src/views/inout/receive/receiveAudit.vue
+++ b/src/views/inout/receive/receiveAudit.vue
@@ -3,28 +3,53 @@
     <el-card class="el-card">
       <el-form  :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
         <el-row>
-          <el-col :span="6">
-            <el-form-item label="单据号:">
-              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="单据号" clearable></el-input>
+          <el-col :span="8" >
+            <el-form-item label="领用单号:">
+              <el-input v-model="filterQuery.billNo" style="width: 90%"  placeholder="请输入单据号" clearable></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="审核状态:">
-              <el-select v-model="filterQuery.status" style="width: 90%" placeholder="审核状态">
-                <el-option label="全部" value=""></el-option>
-                <el-option label="未审核" value="2"></el-option>
-                <el-option label="已审核" value="3"></el-option>
-                <el-option label="已拒绝" value="4"></el-option>
+          <el-col :span="8">
+            <el-form-item label="领用仓库:">
+              <el-select v-model="filterQuery.invCode"  placeholder="请选择领用仓库" style="width: 100%;">
+                <el-option
+                  v-for="item in invList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code">
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="单据日期:">
+          <el-col :span="8">
+            <el-form-item label="往来信息:">
+              <el-input v-model="filterQuery.corpName" style="width: 90%"  placeholder="请输入往来信息" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <!--          <el-col :span="6">-->
+          <!--          <el-form-item label="领用类型:">-->
+          <!--            <el-select v-model="filterQuery.billType" style="width: 90%"  placeholder="请选择领用类型" clearable="true">-->
+          <!--              <el-option-->
+          <!--                v-for="item in originTypes"-->
+          <!--                :key="item.originAction"-->
+          <!--                :label="item.originName"-->
+          <!--                :value="item.originAction">-->
+          <!--                <span style="float: left;font-size: 13px">{{ item.originName }}</span>-->
+          <!--                <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{-->
+          <!--                    item.thirdSysName-->
+          <!--                  }}</span>-->
+          <!--              </el-option>-->
+          <!--            </el-select>-->
+          <!--          </el-form-item>-->
+          <!--          </el-col>-->
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="创建时间:">
               <el-date-picker
+                style="width: 90%"
                 :picker-options="pickerOptions"
                 v-model="actDateRange"
                 type="daterange"
-                style="width: 90%"
                 format="yyyy 年 MM 月 dd 日"
                 value-format="yyyy-MM-dd"
                 range-separator="至"
@@ -49,18 +74,18 @@
 
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true" @current-change="handleDetail">
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="领用类型" prop="billType"></el-table-column>
-        <el-table-column label="单据号" prop="billNo"></el-table-column>
+        <el-table-column label="领用单号" prop="billNo"></el-table-column>
+        <el-table-column label="领用部门" prop="deptName"></el-table-column>
         <el-table-column label="领用仓库" prop="invName"></el-table-column>
         <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="单据日期" prop="billDate"></el-table-column>
-        <el-table-column label="状态" prop="status">
+        <el-table-column label="单据状态" prop="status">
           <template slot-scope="scope">
-            <el-tag :type="(scope.row.status) | statusFilterType">
+            <el-tag :type="(scope.row.status)">
               {{ statusMap[scope.row.status] }}
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="创建时间" prop="createTime"></el-table-column>
         <el-table-column label="操作" >
           <template slot-scope="scope">
             <el-button type="text" size="small"  :disabled="scope.row.status!=2" @click.native.stop="auditDialog(scope.row)"
@@ -81,14 +106,15 @@
     </el-card>
     <el-card class="el-card">
       <el-table v-loading="loading" :data="detailList" style="width: 100%" border>
-        <el-table-column label="序号" type="index" width="120"></el-table-column>
-        <el-table-column label="产品编码" prop="nameCode"></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="批次号" prop="batchNo"></el-table-column>
-        <el-table-column label="生产日期" prop="productDate"></el-table-column>
-        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-        <el-table-column label="单据数量" prop="count"></el-table-column>
+        <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
+        <el-table-column label="领用数量" prop="count"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
+        <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+        <el-table-column label="供应商" prop="supName"></el-table-column>
       </el-table>
     </el-card>
     <el-dialog
@@ -109,6 +135,7 @@
 
 import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
 import auditDetail from "@/views/inout/receive/receiveAuditDetail"
+import {findInvByUser} from "@/api/system/invSubWarehouse";
 
 export default {
   data() {
@@ -122,6 +149,7 @@ export default {
         page: 1,
         limit: 10,
         corpName: null,
+        invCode:'',
         type: 2,
         editStatus: 2,
       },
@@ -135,6 +163,7 @@ export default {
       newSpDistributionVisible:false,
       total: 0,
       thirdSys: [],
+      invList:[],
       thirdSysDetail: null,
       busTypes: [],
       originTypes: [],
@@ -145,6 +174,7 @@ export default {
       uploadData: {
         thirdSys: "thirdId",
       },
+      invCodebe:null,
       loading: false,
       actDateRange: [],
       pickerOptions: {
@@ -196,6 +226,7 @@ export default {
         page: 1,
         limit: 10,
         corpName: null,
+        invCode: this.invCodebe,
         type: 2,
         editStatus: 2,
       };
@@ -229,6 +260,7 @@ export default {
           if (response.code == 20000) {
             this.list = response.data.list || [];
             this.total = response.data.total || 0;
+            this.detailList=[]
           } else {
             this.$message.error(response.message);
           }
@@ -259,6 +291,23 @@ export default {
       this.idQuery=row;
       this.newSpDistributionVisible = true;
     },
+    finCurInv() {
+      this.invList = [];
+      let query = {
+        filter: 3
+      };
+      findInvByUser(query)
+        .then((response) => {
+          this.invList = response.data || [];
+          if(this.invList.length>0){
+            this.filterQuery.invCode=this.invList[0].code
+            this.invCodebe=this.filterQuery.invCode
+          }
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
   },
   components: {
     auditDetail
@@ -266,7 +315,7 @@ export default {
   mounted() {
   },
   created() {
-    this.getList();
+  this.finCurInv();
   },
 };
 </script>
diff --git a/src/views/inout/receive/receiveAuditDetail.vue b/src/views/inout/receive/receiveAuditDetail.vue
index f56fd118..d3fad3c9 100644
--- a/src/views/inout/receive/receiveAuditDetail.vue
+++ b/src/views/inout/receive/receiveAuditDetail.vue
@@ -27,10 +27,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item prop="billDate" label="单据日期:">
+            <el-form-item prop="createTime" label="创建日期:">
               <el-date-picker
                 :disabled="true"
-                v-model="formData.billDate"
+                v-model="formData.createTime"
                 type="datetime"
                 placeholder="选择日期"
                 style="width: 100%"
@@ -44,7 +44,7 @@
 
         <el-row :gutter="20">
           <el-col :span="11">
-            <el-form-item prop="invCode" label="当前仓库:">
+            <el-form-item prop="invCode" label="领用仓库:">
               <el-input v-model="formData.invName" auto-complete="off" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
@@ -56,11 +56,6 @@
 
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="11">
-            <el-form-item prop="billType" label="领用类型:">
-              <el-input v-model="formData.billType" auto-complete="off" :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="11">
             <el-form-item prop="remark" label="审核说明:">
               <el-input v-model="formData.auditRemark" auto-complete="off"></el-input>
@@ -101,7 +96,7 @@ export default {
       invCode: null,
       targetInvCode: null,
       billNo: null,
-      billDate: "",
+      createTime: "",
       billType: "",
     },
     codeArray: [],
diff --git a/src/views/inout/receive/receiveSearch.vue b/src/views/inout/receive/receiveSearch.vue
index 7190e18e..ceb842fe 100644
--- a/src/views/inout/receive/receiveSearch.vue
+++ b/src/views/inout/receive/receiveSearch.vue
@@ -3,26 +3,70 @@
     <el-card class="el-card">
       <el-form  :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
         <el-row>
-          <el-col :span="6">
-            <el-form-item label="单据号:">
-              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="单据号" clearable></el-input>
+          <el-col :span="8" >
+            <el-form-item label="领用单号:">
+              <el-input v-model="filterQuery.billNo" style="width: 90%"  placeholder="请输入单据号" clearable></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="审核状态:">
-              <el-select v-model="filterQuery.status" style="width: 90%" placeholder="审核状态">
-                <el-option label="已审核" value="3"></el-option>
-                <el-option label="已拒绝" value="4"></el-option>
+          <el-col :span="8">
+            <el-form-item label="领用仓库:">
+              <el-select v-model="filterQuery.invCode"  placeholder="请选择领用仓库" style="width: 90%;">
+                <el-option
+                  v-for="item in invList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code">
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="单据日期:">
+          <el-col :span="8">
+            <el-form-item label="往来信息:">
+              <el-input v-model="filterQuery.corpName" style="width: 90%"  placeholder="请输入往来信息" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <!--          <el-col :span="6">-->
+          <!--          <el-form-item label="领用类型:">-->
+          <!--            <el-select v-model="filterQuery.billType" style="width: 90%"  placeholder="请选择领用类型" clearable="true">-->
+          <!--              <el-option-->
+          <!--                v-for="item in originTypes"-->
+          <!--                :key="item.originAction"-->
+          <!--                :label="item.originName"-->
+          <!--                :value="item.originAction">-->
+          <!--                <span style="float: left;font-size: 13px">{{ item.originName }}</span>-->
+          <!--                <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{-->
+          <!--                    item.thirdSysName-->
+          <!--                  }}</span>-->
+          <!--              </el-option>-->
+          <!--            </el-select>-->
+          <!--          </el-form-item>-->
+          <!--          </el-col>-->
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="创建时间:">
               <el-date-picker
+                style="width: 90%"
                 :picker-options="pickerOptions"
                 v-model="actDateRange"
                 type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="审核时间:">
+              <el-date-picker
                 style="width: 90%"
+                :picker-options="pickerAuditOptions"
+                v-model="actAuditDateRange"
+                type="daterange"
                 format="yyyy 年 MM 月 dd 日"
                 value-format="yyyy-MM-dd"
                 range-separator="至"
@@ -47,18 +91,19 @@
 
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true" @current-change="handleDetail">
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="领用类型" prop="billType"></el-table-column>
-        <el-table-column label="单据号" prop="billNo"></el-table-column>
+        <el-table-column label="领用单号" prop="billNo"></el-table-column>
+        <el-table-column label="领用部门" prop="deptName"></el-table-column>
         <el-table-column label="领用仓库" prop="invName"></el-table-column>
         <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="单据日期" prop="billDate"></el-table-column>
-        <el-table-column label="状态" prop="status">
+        <el-table-column label="单据状态" prop="status">
           <template slot-scope="scope">
-            <el-tag :type="(scope.row.status) | statusFilterType">
+            <el-tag :type="(scope.row.status)">
               {{ statusMap[scope.row.status] }}
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="创建时间" prop="createTime"></el-table-column>
+        <el-table-column label="审核时间" prop="auditTime"></el-table-column>
         <el-table-column label="操作" >
           <template slot-scope="scope">
             <el-button type="text" size="small"  @click.native.stop="deleteDialog(scope.row)"
@@ -79,14 +124,15 @@
     </el-card>
     <el-card class="el-card">
       <el-table v-loading="loading" :data="detailList" style="width: 100%" border>
-        <el-table-column label="序号" type="index" width="120"></el-table-column>
-        <el-table-column label="产品编码" prop="nameCode"></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="批次号" prop="batchNo"></el-table-column>
-        <el-table-column label="生产日期" prop="productDate"></el-table-column>
-        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-        <el-table-column label="单据数量" prop="count"></el-table-column>
+        <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
+        <el-table-column label="领用数量" prop="count"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
+        <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+        <el-table-column label="供应商" prop="supName"></el-table-column>
       </el-table>
     </el-card>
     <el-dialog
@@ -108,6 +154,7 @@
 import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
 import auditDetail from "@/views/inout/receive/receiveAuditDetail"
 import {delReceive} from "@/api/thrsys/thrOrderReceive";
+import {findInvByUser} from "@/api/system/invSubWarehouse";
 
 export default {
   data() {
@@ -131,6 +178,8 @@ export default {
         4: "已拒绝"
       },
       idQuery:null,
+      invList:[],
+      invCodebe:null,
       newSpDistributionVisible:false,
       total: 0,
       thirdSys: [],
@@ -146,6 +195,7 @@ export default {
       },
       loading: false,
       actDateRange: [],
+      actAuditDateRange: [],
       pickerOptions: {
         shortcuts: [
           {
@@ -177,6 +227,38 @@ export default {
           },
         ],
       },
+
+      pickerAuditOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
     };
   },
 
@@ -197,8 +279,10 @@ export default {
         corpName: null,
         type: 3,
         editStatus: 2,
+        invCode: this.invCodebe,
       };
       this.actDateRange = [];
+      this.actAuditDateRange = [];
       this.getList();
     },
 
@@ -244,7 +328,15 @@ export default {
         this.filterQuery.startTime = null;
         this.filterQuery.endTime = null;
       }
+      if (this.actAuditDateRange != null) {
+        this.filterQuery.startAuditTime = this.actAuditDateRange[0];
+        this.filterQuery.endAuditTime = this.actAuditDateRange[1];
+      } else {
+        this.filterQuery.startAuditTime = null;
+        this.filterQuery.endAuditTime = null;
+      }
       this.loading = true;
+      this.detailList=[]
       getReceiveOrder(this.filterQuery)
         .then((response) => {
           if (response.code == 20000) {
@@ -276,6 +368,23 @@ export default {
       this.filterQuery.page = val.page;
       this.getList();
     },
+    finCurInv() {
+      this.invList = [];
+      let query = {
+        filter: 3
+      };
+      findInvByUser(query)
+        .then((response) => {
+          this.invList = response.data || [];
+          if(this.invList.length>0){
+            this.filterQuery.invCode=this.invList[0].code
+            this.invCodebe=this.filterQuery.invCode
+          }
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
 
   },
   components: {
@@ -284,7 +393,7 @@ export default {
   mounted() {
   },
   created() {
-    this.getList();
+    this.finCurInv();
   },
 };
 </script>