From da9c4229e3686a88a4655678385e67183f86c599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 2 Mar 2023 10:20:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=97=E6=9D=90=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/receive/receiveAudit.vue       | 8 ++++++++
 src/views/inout/receive/receiveAuditDetail.vue | 1 +
 src/views/inout/receive/receiveSearch.vue      | 9 +++++++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/views/inout/receive/receiveAudit.vue b/src/views/inout/receive/receiveAudit.vue
index a8d83e3e..994bdda1 100644
--- a/src/views/inout/receive/receiveAudit.vue
+++ b/src/views/inout/receive/receiveAudit.vue
@@ -215,6 +215,14 @@ export default {
       this.showSearch = !this.showSearch;
     },
     getList() {
+
+      if (this.actDateRange != null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
       this.loading = true;
       getReceiveOrder(this.filterQuery)
         .then((response) => {
diff --git a/src/views/inout/receive/receiveAuditDetail.vue b/src/views/inout/receive/receiveAuditDetail.vue
index 3386a29d..df1a4fea 100644
--- a/src/views/inout/receive/receiveAuditDetail.vue
+++ b/src/views/inout/receive/receiveAuditDetail.vue
@@ -138,6 +138,7 @@ export default {
     saveOrder(val){
       var data={
         id:this.formData.id,
+        billNo:this.formData.billNo,
         status:val,
         auditRemark:this.formData.auditRemark
       };
diff --git a/src/views/inout/receive/receiveSearch.vue b/src/views/inout/receive/receiveSearch.vue
index 1f1630be..7190e18e 100644
--- a/src/views/inout/receive/receiveSearch.vue
+++ b/src/views/inout/receive/receiveSearch.vue
@@ -11,8 +11,6 @@
           <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-select>
@@ -239,6 +237,13 @@ export default {
         });
     },
     getList() {
+      if (this.actDateRange != null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
       this.loading = true;
       getReceiveOrder(this.filterQuery)
         .then((response) => {