From a21953207c5ef2bc7730edcfb23f355e6f4b55d5 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, 23 Feb 2023 16:22:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E9=A2=86=E7=94=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inout/receiveOrder.js                 |   8 +
 src/api/thrsys/thrOrderReceive.js             |  24 ++
 src/views/inout/DialogSelectInvProduct.vue    |  76 ++--
 src/views/inout/receive/receiveAdd.vue        | 265 ++++--------
 src/views/inout/receive/receiveAudit.vue      | 267 ++++++++++++
 .../inout/receive/receiveAuditDetail.vue      | 179 ++++++++
 src/views/inout/receive/receiveSearch.vue     | 393 ++++++------------
 src/views/inout/receive/thrOrderNew.vue       | 212 ++--------
 8 files changed, 763 insertions(+), 661 deletions(-)
 create mode 100644 src/views/inout/receive/receiveAudit.vue
 create mode 100644 src/views/inout/receive/receiveAuditDetail.vue

diff --git a/src/api/inout/receiveOrder.js b/src/api/inout/receiveOrder.js
index a66e284d..d9f2c070 100644
--- a/src/api/inout/receiveOrder.js
+++ b/src/api/inout/receiveOrder.js
@@ -27,6 +27,14 @@ export function getOrderDetail(query) {
   });
 }
 
+export function getAudit(query) {
+  return axios({
+    url: "/udiwms/receive/order/audit",
+    method: "post",
+    data: query
+  });
+}
+
 
 
 
diff --git a/src/api/thrsys/thrOrderReceive.js b/src/api/thrsys/thrOrderReceive.js
index 3ad028e8..2f22e590 100644
--- a/src/api/thrsys/thrOrderReceive.js
+++ b/src/api/thrsys/thrOrderReceive.js
@@ -16,3 +16,27 @@ export function updateReceive(query) {
     });
 }
 
+export function updateReceiveDetail(query) {
+  return axios({
+    url: "/udiwms/receive/detail/Update",
+    method: "post",
+    data: query
+  });
+}
+export function delReceive(query) {
+  return axios({
+    url: "/udiwms/receive/order/del",
+    method: "get",
+    params: query
+  });
+}
+
+
+export function delReceiveDetail(query) {
+  return axios({
+    url: "/udiwms/receive/detail/delReceiveDetail",
+    method: "get",
+    params: query
+  });
+}
+
diff --git a/src/views/inout/DialogSelectInvProduct.vue b/src/views/inout/DialogSelectInvProduct.vue
index b342c027..d40b58a7 100644
--- a/src/views/inout/DialogSelectInvProduct.vue
+++ b/src/views/inout/DialogSelectInvProduct.vue
@@ -1,40 +1,40 @@
 <template>
   <div>
     <el-card>
-      <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
+      <el-form  :model="filterQuery"  size="mini" label-width="100px" v-show="showSearch">
         <el-row>
-          <el-form-item class="query-form-item">
-            <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"></el-input>
+          <el-col :span="6">
+          <el-form-item label="产品标识DI:">
+            <el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="产品标识DI"></el-input>
           </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"></el-input>
+          </el-col>
+          <el-col :span="6">
+          <el-form-item label="产品名称:">
+            <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="产品名称"></el-input>
           </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button-group>
-              <el-button
-                type="primary"
-                icon="el-icon-refresh"
-                @click="onReset"
-              ></el-button>
-              <el-button type="primary" icon="search" @click="onSubmit"
-              >查询
-              </el-button
-              >
-              <el-button type="primary" icon="search" @click="combine">确定</el-button>
-            </el-button-group>
+          </el-col>
+          <el-col :span="6">
+          <el-form-item label="批次号:">
+            <el-input v-model="filterQuery.batchNo" style="width: 90%" placeholder="批次号"></el-input>
           </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
-      <el-table v-loading="loading" :data="list" style="width: 100%"
-                highlight-current-row="false"
-                ref="multipleTable">
-        <el-table-column
-          type="selection"
-          width="55">
-        </el-table-column>
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="combine">确定</el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
+
+
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="false" border ref="multipleTable">
+        <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="产品标识" prop="nameCode"></el-table-column>
         <el-table-column label="产品名称" prop="cpmctymc">
@@ -49,13 +49,13 @@
       </el-table>
     </el-card>
 
-    <el-pagination
-      :page-size="filterQuery.limit"
-      @current-change="handleCurrentChange"
-      layout="prev, pager, next"
+    <pagination
+      v-show="total>0"
       :total="total"
-      :current-page="filterQuery.page"
-    ></el-pagination>
+      :limit.sync="filterQuery.limit"
+      :page.sync="filterQuery.page"
+      @pagination="handleCurrentChange"
+    ></pagination>
   </div>
 </template>
 
@@ -86,6 +86,7 @@ export default {
   },
   data() {
     return {
+      showSearch: true,
       filterQuery: {
         cpmctymc: null,
         nameCode: null,
@@ -149,7 +150,7 @@ export default {
       this.getList();
     },
     handleCurrentChange(val) {
-      this.filterQuery.page = val;
+      this.filterQuery.page = val.page;
       this.getList();
     },
     closeDetailDialog(val) {
@@ -171,7 +172,9 @@ export default {
           this.total = 0;
         });
     },
-
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
     combine() {
       let selection = this.$refs.multipleTable.selection;
       if (selection.length < 1) {
@@ -186,6 +189,7 @@ export default {
           productDate: obj.productionDate,
           expireDate: obj.expireDate,
           supId: obj.supId,
+          nameCode: obj.nameCode,
         }
         ids.push(data);
       });
diff --git a/src/views/inout/receive/receiveAdd.vue b/src/views/inout/receive/receiveAdd.vue
index 5149ba1d..f472ca93 100644
--- a/src/views/inout/receive/receiveAdd.vue
+++ b/src/views/inout/receive/receiveAdd.vue
@@ -1,25 +1,21 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :inline="true" :model="filterQuery"
-               class="query-form" size="mini">
+      <el-form  :model="filterQuery"  label-width="100px" v-show="showSearch">
         <el-row>
-          <el-form-item class="query-form-item">
-            <el-input
-              v-model="filterQuery.billNo"
-              placeholder="单据号"
-              clearable
-            ></el-input>
+          <el-col :span="6" >
+          <el-form-item label="单据号:">
+            <el-input v-model="filterQuery.billNo" style="width: 90%"  placeholder="请输入单据号" clearable></el-input>
           </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-input
-              v-model="filterQuery.corpName"
-              placeholder="往来信息"
-              clearable
-            ></el-input>
+          </el-col>
+          <el-col :span="6">
+          <el-form-item label="往来信息:">
+            <el-input v-model="filterQuery.corpName" style="width: 90%"  placeholder="请输入往来信息" clearable></el-input>
           </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-select v-model="filterQuery.billAction" placeholder="领用类型" clearable="true">
+          </el-col>
+          <el-col :span="6">
+          <el-form-item label="领用类型:">
+            <el-select v-model="filterQuery.billAction" style="width: 90%"  placeholder="请选择领用类型" clearable="true">
               <el-option
                 v-for="item in originTypes"
                 :key="item.name"
@@ -32,9 +28,11 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item class="query-form-item">
-            <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
+          </el-col>
+          <el-col :span="6">
+          <el-form-item label="单据日期:">
             <el-date-picker
+              style="width: 90%"
               :picker-options="pickerOptions"
               v-model="actDateRange"
               type="daterange"
@@ -46,56 +44,59 @@
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item>
-            <el-button-group style="display:flex;">
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-              <el-button type="primary" icon="search" @click="onSubmitFind">查询</el-button>
-              <el-button type="primary" icon="search" @click="newDistributionForm()" :loading="loading">
-                新增单据
-              </el-button>
-            </el-button-group>
-          </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
-      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
-                border
-                @current-change="handleDetail">
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
+          <el-button type="primary" icon="search" @click="newDistributionForm()" :loading="loading">
+            新增单据
+          </el-button>
+        </el-button-group>
+      </div>
+
+        <el-divider style="margin: 15px"></el-divider>
+
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true" border @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="invName"></el-table-column>
-        <el-table-column label="往来信息" prop="targetInvName"
-                         show-overflow-tooltip="true"></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">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.status) | statusFilterType">
+              {{ statusMap[scope.row.status] }}
+            </el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click.native="newDistributionForm(scope.$index, scope.row)"
-            >编辑
-            </el-button
-            >
-            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
-            >删除
-            </el-button>
+            <el-button type="text" size="small" :disabled="scope.row.status==3 ||scope.row.status==4 " @click.native="newDistributionForm(scope.$index, scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :page-size="filterQuery.limit"
-        @current-change="handleCurrentChange"
-        layout="prev, pager, next"
+
+      <pagination
+        v-show="total>0"
         :total="total"
-        :current-page="filterQuery.page"
-      ></el-pagination>
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="handleCurrentChange"
+      ></pagination>
     </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="productId"></el-table-column>
-        <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></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="规格型号" 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>
@@ -121,20 +122,19 @@
   </div>
 </template>
 <script>
-import {
-  delThrOrders, delAll, downloadAll
-} from "@/api/thrsys/thrOrder";
+import {delThrOrders, delAll, downloadAll} from "@/api/thrsys/thrOrder";
 import {getLocalJoinByUser} from "@/api/basic/busType";
 import {getOriginBusType} from "@/api/basic/busOriginType";
-
+import {delReceive} from "@/api/thrsys/thrOrderReceive";
 import {filterDetailByKey} from "@/api/basic/basicThirdSys";
 import {selectIp} from "@/api/param/systemParamConfig";
 import thrOrderNew from "./thrOrderNew";
-import {getReceiveOrder} from "@/api/inout/receiveOrder";
+import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
 
 export default {
   data() {
     return {
+      showSearch: true,
       filterQuery: {
         billType: null,
         billNo: "",
@@ -149,7 +149,12 @@ export default {
         add: "新增领用单据",
         update: "编辑领用单据",
       },
-
+      statusMap: {
+        1: "草稿",
+        2: "未审核",
+        3: "已审核",
+        4: "已拒绝"
+      },
       idQuery: {},
       total: 0,
       thirdSys: [],
@@ -237,7 +242,7 @@ export default {
         this.filterQuery.startDate = null;
         this.filterQuery.endDate = null;
       }
-      this.loading = true;
+
       getReceiveOrder(this.filterQuery)
         .then((response) => {
           if (response.code == 20000) {
@@ -246,16 +251,25 @@ export default {
           } else {
             this.$message.error(response.message);
           }
-          this.loading = false;
         })
         .catch(() => {
-          this.loading = false;
           this.list = [];
           this.total = 0;
         });
     },
     handleDetail(row) {
-      this.detailList = row.subErpOrders;
+      var  query={};
+      query.orderIdFk = row.billNo;
+      getOrderDetail(query) //查找该单号下的所有条码
+        .then((response) => {
+          this.detailList = response.data.list || [];
+        })
+        .catch(() => {
+          this.detailList = [];
+        });
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
     },
     deleteDialog(row) {
       this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
@@ -265,157 +279,36 @@ export default {
       })
         .then(() => {
           let dQuery = {
-            id: row.id,
+            orderIdFk: row.billNo,
           };
-          delThrOrders(dQuery)
+          delReceive(dQuery)
             .then((response) => {
-              this.loading = false;
               if (response.code == 20000) {
                 this.$message.success("删除成功");
                 this.getList();
+                this.detailList=null;
               } else {
                 this.$message.error(response.message);
               }
             })
             .catch(() => {
-              this.loading = false;
             });
 
         })
         .catch(() => {
         });
     },
-    clearAll() {
-      this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          delAll()
-            .then((response) => {
-              this.loading = false;
-              if (response.code == 20000) {
-                this.$message.success("删除成功");
-                this.getList();
-              } else {
-                this.$message.success(response.message);
-              }
-            })
-            .catch(() => {
-              this.loading = false;
-            });
 
-        })
-        .catch(() => {
-        });
-    },
     handleCurrentChange(val) {
-      this.filterQuery.page = val;
+      this.filterQuery.page = val.page;
       this.getList();
     },
-    handleChange(response, files, fileList) {
-      console.log(response);
-      if (response.code != 20000) {
-        this.$message.error(response.message);
-      } else {
-        console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
-        this.$message.success("文件上传成功,请稍后刷新查看！");
-      }
-    },
-    selectSysParam() {
-      let query = {
-        key: "thirdIpUrl",
-        thirdSysFk: this.filterQuery.thirdSysFk
-      };
-      selectIp(query).then((response) => {
-        if (response.code == 20000) {
-          this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
-        }
-      });
-    },
-    thirdSysChange() {
-      this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-      this.getThirdSysDetail();
-    },
-    getThirdSysDetail() {
-      let query = {
-        thirdSysFk: this.filterQuery.thirdSysFk,
-        key: "orderQueryUrl",
-      };
-      filterDetailByKey(query)
-        .then((response) => {
-          this.thirdSysDetail = response.data;
-        })
-        .catch(() => {
-          this.loading = false;
-          this.list = [];
-        });
-
-    },
-    downloadDatas() {
-      let query = {
-        billAction: this.filterQuery.billAction
-      };
-      downloadAll(query).then((response) => {
-        if (response.code == 20000) {
-          this.$message.success(response.data);
-        } else {
-          this.$message.error(response.message);
-        }
-      });
-
-    },
-    getActionName(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].action === action) {
-          return this.busTypes[i].name;
-        }
-      }
-    },
-    closeConfirmFunction(type) {
-      if (this.$isNotBlank(type) && type) {
-        this.closeConfirm = type;
-      }
-    },
-    getlocalName(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].action === action) {
-          return this.busTypes[i].localName;
-        }
-      }
-    },
-    getBusType() {
-      let query = {
-        enabled: true,
-        corpType: 1,
-      };
-      getLocalJoinByUser(query)
-        .then((response) => {
-          this.busTypes = response.data.list || [];
-          // this.getList();
-        })
-        .catch(() => {
-        });
-      getOriginBusType(query)
-        .then((response) => {
-          this.originTypes = response.data.list || [];
-          // this.filterQuery.originType = this.originTypes[0].action;
-          // this.getList();
-        })
-        .catch(() => {
-        });
-
-
-    },
-
     closeDialog() {
       this.newSpDistributionVisible = false;
       this.getList();
       this.detailList = [];
     },
 
-
     newDistributionForm(index, row) {
       this.idQuery.id = '';
       if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
diff --git a/src/views/inout/receive/receiveAudit.vue b/src/views/inout/receive/receiveAudit.vue
new file mode 100644
index 00000000..9559839c
--- /dev/null
+++ b/src/views/inout/receive/receiveAudit.vue
@@ -0,0 +1,267 @@
+<template>
+  <div>
+    <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-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-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="单据日期:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                style="width: 90%"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
+
+      <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="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">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.status) | statusFilterType">
+              {{ statusMap[scope.row.status] }}
+            </el-tag>
+          </template>
+        </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)"
+            >审核
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="handleCurrentChange"
+      ></pagination>
+
+    </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="规格型号" 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>
+    </el-card>
+    <el-dialog
+      :visible.sync="newSpDistributionVisible"
+      width="80%"
+      v-if="newSpDistributionVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <auditDetail
+        :closeDialog="closeDialog"
+        :idQuery="idQuery"
+      ></auditDetail>
+    </el-dialog>
+  </div>
+</template>
+<script>
+
+import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
+import auditDetail from "@/views/inout/receive/receiveAuditDetail"
+
+export default {
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        billAction: null,
+        billNo: "",
+        originType: null,
+        thirdSysFk: "",
+        page: 1,
+        limit: 10,
+        corpName: null,
+        type: 1,
+        editStatus: 2,
+      },
+      statusMap: {
+        1: "草稿",
+        2: "未审核",
+        3: "已审核",
+        4: "已拒绝"
+      },
+      idQuery:null,
+      newSpDistributionVisible:false,
+      total: 0,
+      thirdSys: [],
+      thirdSysDetail: null,
+      busTypes: [],
+      originTypes: [],
+      list: [],
+      detailList: [],
+      uploadFileUrl: null,
+      fileList: [],
+      uploadData: {
+        thirdSys: "thirdId",
+      },
+      loading: false,
+      actDateRange: [],
+      pickerOptions: {
+        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]);
+            },
+          },
+        ],
+      },
+    };
+  },
+
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        billNo: "",
+        thirdSysFk: "",
+        billFlag: null,
+        billAction: null,
+        startDate: null,
+        endDate: null,
+        page: 1,
+        limit: 10,
+        corpName: null,
+        type: 1,
+        editStatus: 2,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+
+    onSubmitFind() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    closeDialog(){
+      this.newSpDistributionVisible = false;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getList() {
+      this.loading = true;
+      getReceiveOrder(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    handleDetail(row) {
+      var  query={};
+      query.orderIdFk = row.billNo;
+      getOrderDetail(query) //查找该单号下的所有条码
+        .then((response) => {
+          this.detailList = response.data.list || [];
+        })
+        .catch(() => {
+          this.detailList = [];
+        });
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    auditDialog(row) {
+      this.idQuery=row;
+      this.newSpDistributionVisible = true;
+    },
+  },
+  components: {
+    auditDetail
+  },
+  mounted() {
+  },
+  created() {
+    this.getList();
+  },
+};
+</script>
+<style scoped>
+</style>
+
diff --git a/src/views/inout/receive/receiveAuditDetail.vue b/src/views/inout/receive/receiveAuditDetail.vue
new file mode 100644
index 00000000..4b39ad2a
--- /dev/null
+++ b/src/views/inout/receive/receiveAuditDetail.vue
@@ -0,0 +1,179 @@
+<template>
+  <div>
+    <el-form :model="formData"  ref="dataForm" label-width="100px">
+      <el-row type="flex" justify="end">
+        <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -5px">
+          <el-button
+            type="primary"
+            @click.native="saveOrder('3')"
+            :loading="loading"
+          >审核通过
+          </el-button
+          >
+          <el-button
+            type="primary"
+            @click.native="saveOrder('4')"
+            :loading="loading"
+          >审核拒绝
+          </el-button
+          >
+        </el-button-group>
+      </el-row>
+      <el-card style="margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="11">
+            <el-form-item prop="billNo" label="单据号:">
+              <el-input v-model="formData.billNo" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="billDate" label="单据日期:">
+              <el-date-picker
+                :disabled="true"
+                v-model="formData.billDate"
+                type="datetime"
+                placeholder="选择日期"
+                style="width: 100%"
+                :clearable="false"
+                value-format="yyyy-MM-dd HH:mm:ss"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="11">
+            <el-form-item prop="invCode" label="当前仓库:">
+              <el-input v-model="formData.invName" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item class="query-form-item" prop="targetInvCode" label="往来信息:">
+              <el-input v-model="formData.targetInvName" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+      <el-card>
+        <el-table v-loading="loading" :data="codeArray" style="width: 100%;"  border max-height="300" height="300" ref="multipleTable">
+          <el-table-column label="序号" type="index" width="50"></el-table-column>
+          <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+          <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+          <el-table-column label="单据数量" prop="count" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产厂家" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+        </el-table>
+      </el-card>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import {getBusChange} from "@/api/basic/busTypeChange";
+import {inserThrOrderWeb, updateReceive, updateReceiveDetail,delReceiveDetail} from "@/api/thrsys/thrOrderReceive";
+import {filterSubByInv, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse";
+import dialogInvProduct from "../DialogSelectInvProduct";
+import {getAudit, getOrderDetail} from "@/api/inout/receiveOrder";
+
+export default {
+  name: "idQuery",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    idQuery: {
+      type: Object,
+      required: true,
+    },
+    formData: {
+      invCode: null,
+      targetInvCode: null,
+      billNo: null,
+      billDate: "",
+      billType: "",
+    },
+    codeArray: [],
+  },
+  data() {
+    return {
+      showSearch: true,
+      code: "",
+      query: {
+        orderIdFk: "",
+        page: 1,
+        limit: 10,
+      },
+    };
+  },
+  components: {
+    dialogInvProduct
+  },
+  methods: {
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    handleDetail() {
+      var  query={};
+      query.orderIdFk = this.formData.billNo;
+      getOrderDetail(query) //查找该单号下的所有条码
+        .then((response) => {
+          this.codeArray = response.data.list || [];
+        })
+        .catch(() => {
+          this.codeArray = [];
+        });
+    },
+    saveOrder(val){
+      var data={
+        id:this.formData.id,
+        status:val,
+        auditRemark:this.formData.auditRemark
+      };
+      getAudit(data).then((res=>{
+        if(res.code==20000){
+          this.closeDialog();
+        }else{
+          this.$message.error(res.message);
+        }
+      }))
+    }
+  },
+  filters: {},
+  mounted() {},
+  created() {
+    console.log(this.idQuery)
+     this.formData=this.idQuery;
+     this.handleDetail();
+  },
+};
+</script>
+<style>
+
+.ao-text {
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
+}
+
+</style>
+
+
+
diff --git a/src/views/inout/receive/receiveSearch.vue b/src/views/inout/receive/receiveSearch.vue
index 177f9ba6..7f68f500 100644
--- a/src/views/inout/receive/receiveSearch.vue
+++ b/src/views/inout/receive/receiveSearch.vue
@@ -1,115 +1,120 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :inline="true" :model="filterQuery"
-               class="query-form" size="mini">
+      <el-form  :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
         <el-row>
-          <el-form-item class="query-form-item">
-            <el-input
-              v-model="filterQuery.billNo"
-              placeholder="单据号"
-              clearable
-            ></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-input
-              v-model="filterQuery.corpName"
-              placeholder="往来单位"
-              clearable
-            ></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-
-            <el-select v-model="filterQuery.billAction" placeholder="请选择第三方系统单据类型" clearable="true">
-              <el-option
-                v-for="item in originTypes"
-                :key="item.name"
-                :label="item.name"
-                :value="item.action">
-                <span style="float: left;font-size: 13px">{{ item.name }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
-                    item.thirdSysName
-                  }}</span>
-              </el-option>
-
-            </el-select>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
-            <el-date-picker
-              :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-form-item>
-            <el-button-group style="display:flex;">
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-              <el-button type="primary" icon="search" @click="onSubmitFind">查询</el-button>
-            </el-button-group>
-          </el-form-item>
+          <el-col :span="6">
+            <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-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="单据日期:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                style="width: 90%"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
 
-      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
-                @current-change="handleDetail">
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
+
+      <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="billTypeName"></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="corpName"
-                         show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="单据日期" prop="billdate"></el-table-column>
-        <el-table-column label="操作" fixed="right">
+        <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">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.status) | statusFilterType">
+              {{ statusMap[scope.row.status] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" >
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
+            <el-button type="text" size="small"  @click.native.stop="deleteDialog(scope.row)"
             >删除
             </el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :page-size="filterQuery.limit"
-        @current-change="handleCurrentChange"
-        layout="prev, pager, next"
+
+      <pagination
+        v-show="total>0"
         :total="total"
-        :current-page="filterQuery.page"
-      ></el-pagination>
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="handleCurrentChange"
+      ></pagination>
+
     </el-card>
     <el-card class="el-card">
-      <el-table v-loading="loading" :data="detailList" style="width: 100%">
+      <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="productId"></el-table-column>
-        <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></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="规格型号" 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="reCount"></el-table-column>
-        <el-table-column label="实际数量" prop="count"></el-table-column>
+        <el-table-column label="单据数量" prop="count"></el-table-column>
       </el-table>
     </el-card>
+    <el-dialog
+      :visible.sync="newSpDistributionVisible"
+      width="80%"
+      v-if="newSpDistributionVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <auditDetail
+        :closeDialog="closeDialog"
+        :idQuery="idQuery"
+      ></auditDetail>
+    </el-dialog>
   </div>
 </template>
 <script>
-import {
-  delThrOrders, delAll, downloadAll
-} from "@/api/thrsys/thrOrder";
-import {getLocalJoinByUser} from "@/api/basic/busType";
-import {getOriginBusType} from "@/api/basic/busOriginType";
 
-import {getBasicThirdSys, filterDetailByKey} from "@/api/basic/basicThirdSys";
-import {selectIp} from "@/api/param/systemParamConfig";
-import {getReceiveOrder} from "@/api/inout/receiveOrder";
+import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
+import auditDetail from "@/views/inout/receive/receiveAuditDetail"
+import {delReceive} from "@/api/thrsys/thrOrderReceive";
 
 export default {
   data() {
     return {
+      showSearch: true,
       filterQuery: {
         billAction: null,
         billNo: "",
@@ -121,6 +126,14 @@ export default {
         type: 1,
         editStatus: 2,
       },
+      statusMap: {
+        1: "草稿",
+        2: "未审核",
+        3: "已审核",
+        4: "已拒绝"
+      },
+      idQuery:null,
+      newSpDistributionVisible:false,
       total: 0,
       thirdSys: [],
       thirdSysDetail: null,
@@ -191,43 +204,12 @@ export default {
       this.getList();
     },
 
-
     onSubmitFind() {
       this.filterQuery.page = 1;
       this.getList();
     },
-
-    getList() {
-      if (this.filterQuery.thirdSysFk == null) {
-        this.$message.warning("请先选择第三方系统！")
-        return;
-      }
-      if (this.actDateRange != null) {
-        this.filterQuery.startDate = this.actDateRange[0];
-        this.filterQuery.endDate = this.actDateRange[1];
-      } else {
-        this.filterQuery.startDate = null;
-        this.filterQuery.endDate = null;
-      }
-      this.loading = true;
-      getReceiveOrder(this.filterQuery)
-        .then((response) => {
-          if (response.code == 20000) {
-            this.list = response.data.list || [];
-            this.total = response.data.total || 0;
-          } else {
-            this.$message.error(response.message);
-          }
-          this.loading = false;
-        })
-        .catch(() => {
-          this.loading = false;
-          this.list = [];
-          this.total = 0;
-        });
-    },
-    handleDetail(row) {
-      this.detailList = row.subErpOrders;
+    hideSearch() {
+      this.showSearch = !this.showSearch;
     },
     deleteDialog(row) {
       this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
@@ -237,199 +219,70 @@ export default {
       })
         .then(() => {
           let dQuery = {
-            id: row.id,
+            orderIdFk: row.billNo,
           };
-          delThrOrders(dQuery)
+          delReceive(dQuery)
             .then((response) => {
-              this.loading = false;
               if (response.code == 20000) {
                 this.$message.success("删除成功");
                 this.getList();
+                this.detailList=null;
               } else {
                 this.$message.error(response.message);
               }
             })
             .catch(() => {
-              this.loading = false;
-            });
-        })
-        .catch(() => {
-        });
-    }
-    ,
-    clearAll() {
-      this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          delAll()
-            .then((response) => {
-              this.loading = false;
-              if (response.code == 20000) {
-                this.$message.success("删除成功");
-                this.getList();
-              } else {
-                this.$message.success(response.message);
-              }
-            })
-            .catch(() => {
-              this.loading = false;
             });
+
         })
         .catch(() => {
         });
-    }
-    ,
-    getBasicThirdSys() {
-      let query = {
-        enabled: true,
-      };
-      getBasicThirdSys(query)
+    },
+    getList() {
+      this.loading = true;
+      getReceiveOrder(this.filterQuery)
         .then((response) => {
-          this.thirdSys = response.data.list || [];
-          this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
-          this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-          this.selectSysParam();
-          this.getThirdSysDetail();
-          this.getBusType();
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
         })
         .catch(() => {
           this.loading = false;
           this.list = [];
+          this.total = 0;
         });
-    }
-    ,
-    handleCurrentChange(val) {
-      this.filterQuery.page = val;
-      this.getList();
-    }
-    ,
-    handleChange(response, files, fileList) {
-      console.log(response);
-      if (response.code != 20000) {
-        this.$message.error(response.message);
-      } else {
-        console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
-        this.$message.success("文件上传成功,请稍后刷新查看！");
-      }
-    }
-    ,
-    selectSysParam() {
-      let query = {
-        key: "thirdIpUrl",
-        thirdSysFk: this.filterQuery.thirdSysFk
-      };
-      selectIp(query).then((response) => {
-        if (response.code == 20000) {
-          this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
-        }
-      });
-    },
-    thirdSysChange() {
-      this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-      this.getThirdSysDetail();
     },
-    getThirdSysDetail() {
-      let query = {
-        thirdSysFk: this.filterQuery.thirdSysFk,
-        key: "orderQueryUrl",
-      };
-      filterDetailByKey(query)
+    handleDetail(row) {
+      var  query={};
+      query.orderIdFk = row.billNo;
+      getOrderDetail(query) //查找该单号下的所有条码
         .then((response) => {
-          this.thirdSysDetail = response.data;
+          this.detailList = response.data.list || [];
         })
         .catch(() => {
-          this.loading = false;
-          this.list = [];
+          this.detailList = [];
         });
     },
-    downloadDatas() {
-      let query = {
-        billAction: this.filterQuery.billAction
-      };
-      downloadAll(query).then((response) => {
-        if (response.code == 20000) {
-          this.$message.success(response.data);
-        } else {
-          this.$message.error(response.message);
-        }
-      });
-    },
-    getActionName(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].action === action) {
-          return this.busTypes[i].name;
-        }
-      }
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
     },
 
-    getlocalName(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].action === action) {
-          return this.busTypes[i].localName;
-        }
-      }
-    },
-    getBusType() {
-      let query = {
-        enabled: true,
-      };
-      getLocalJoinByUser(query)
-        .then((response) => {
-          this.busTypes = response.data.list || [];
-        })
-        .catch(() => {
-        });
-      getOriginBusType(query)
-        .then((response) => {
-          this.originTypes = response.data.list || [];
-        })
-        .catch(() => {
-        });
-    },
   },
-  components: {},
+  components: {
+    auditDetail
+  },
   mounted() {
   },
   created() {
-    this.getBasicThirdSys();
-    let end = new Date();
-    let start = new Date();
-    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-    this.actDateRange = [start, end];
     this.getList();
   },
 };
 </script>
 <style scoped>
-.itemTag {
-  float: left;
-  text-align: left;
-  margin-top: 10px;
-  width: 25%;
-}
-
-.text {
-  font-size: 13px;
-  font-family: "Microsoft YaHei";
-}
-
-.query-form-item {
-  display: block !important;
-  margin-right: 10px;
-  margin-bottom: 5px;
-}
-
-.el-row {
-  display: flex;
-  flex-wrap: wrap;
-}
-
-.el-col {
-  border-radius: 4px;
-  flex-wrap: wrap;
-}
 </style>
 
diff --git a/src/views/inout/receive/thrOrderNew.vue b/src/views/inout/receive/thrOrderNew.vue
index 1445d02f..4996667d 100644
--- a/src/views/inout/receive/thrOrderNew.vue
+++ b/src/views/inout/receive/thrOrderNew.vue
@@ -44,7 +44,7 @@
         <el-row :gutter="20">
           <el-col :span="11">
             <el-form-item prop="invCode" label="当前仓库:">
-              <el-select v-model="formData.invCode" @change="subStorageChange" placeholder="当前仓库信息"
+              <el-select v-model="formData.invCode" :disabled="editType" @change="subStorageChange" placeholder="当前仓库信息"
                          style="width: 100%;"
                          clearable>
                 <el-option
@@ -58,7 +58,7 @@
           </el-col>
           <el-col :span="11">
             <el-form-item class="query-form-item" prop="targetInvCode" label="往来信息:">
-              <el-select v-model="formData.targetInvCode" placeholder="请选择仓库"
+              <el-select v-model="formData.targetInvCode" :disabled="editType" placeholder="请选择仓库"
                          clearable="true"
                          style="width: 100%"
               >
@@ -111,17 +111,9 @@
                   border
                   max-height="300" height="300" ref="multipleTable">
           <el-table-column label="序号" type="index" width="50"></el-table-column>
-          <el-table-column width="150"
-                           label="产品通用名"
-                           prop="cpmctymc"
-                           show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column width="150"
-                           label="规格型号"
-                           prop="ggxh"
-                           show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column width="150" label="单据数量">
+          <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+          <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+          <el-table-column label="单据数量">
             <template slot-scope="scope">
               <el-input v-model="scope.row.count"
                         placeholder="请输入数量" style="width: 80%"
@@ -132,35 +124,12 @@
             </template>
           </el-table-column>
 
-          <el-table-column width="150"
-                           label="注册/备案凭证号"
-                           prop="zczbhhzbapzbh"
-                           show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column width="150"
-                           label="生产厂家"
-                           prop="ylqxzcrbarmc"
-                           show-overflow-tooltip
-          ></el-table-column>
+          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产厂家" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作" width="150">
             <template slot-scope="scope">
-              <el-button
-                type="text"
-                size="small"
-                :disabled="scope.row.index === selectedIndex"
-                @click.stop="true"
-                @click.native="rowChange(scope.row)"
-              >编辑
-              </el-button
-              >
-              <el-button
-                type="text"
-                size="small"
-                @click.stop="true"
-                @click.native="deleteCodeArray(scope.$index, scope.row)"
-              >删除
-              </el-button
-              >
+              <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true" @click.native="rowChange(scope.row)">编辑</el-button>
+              <el-button type="text" size="small" @click.stop="true" @click.native="deleteCodeArray(scope.$index, scope.row)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -187,12 +156,8 @@
 </template>
 
 <script>
-import {
-  uploadStockOrderDetail,
-} from "@/api/inout/stockOrder";
 import {getBusChange} from "@/api/basic/busTypeChange";
-import {inserThrOrderWeb, updateReceive} from "@/api/thrsys/thrOrderReceive";
-import {getThrOrderDetails, delThrOrders, delOrderDetail} from "@/api/thrsys/thrOrder";
+import {inserThrOrderWeb, updateReceive, updateReceiveDetail,delReceiveDetail} from "@/api/thrsys/thrOrderReceive";
 import {filterSubByInv, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse";
 import dialogInvProduct from "../DialogSelectInvProduct";
 import {getOrderDetail} from "@/api/inout/receiveOrder";
@@ -219,6 +184,7 @@ export default {
   },
   data() {
     return {
+      showSearch: true,
       code: "",
       query: {
         orderIdFk: "",
@@ -321,7 +287,9 @@ export default {
         .catch(() => {
         });
     },
-
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
 
     saveOrder(status) {
       this.code = "";
@@ -347,13 +315,12 @@ export default {
           }
 
           if (status === '2') {
+            debugger
             for (let i = 0; i < this.codeArray.length; i++) {
               if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
                 return this.$message.error('单据数量不能为0');
               }
-              if (this.$isBlank(this.codeArray[i].batchNo)) {
-                return this.$message.error('批次号不能为空');
-              }
+
 
 
             }
@@ -376,6 +343,7 @@ export default {
               type: "warning",
             }).then(() => {
               this.submitFunction(status);
+              this.loading=false
             }).catch(() => {
               this.loading = false;
             });
@@ -389,29 +357,12 @@ export default {
 
     submitFunction(status) {
       let tMessage = status === '501' ? '保存' : '提交';
-      this.loading = true;
       let tQuery = this.formData;
-      tQuery.editStatus = status;
+      tQuery.status = status;
       tQuery.subErpOrders = this.codeArray;
       tQuery.thirdPartyDate = 2;
-      if (this.editType === "add") {
-        inserThrOrderWeb(tQuery)
-          .then(response => {
-            this.loading = false;
-            if (response.code === 20000) {
-              this.$message.success(tMessage + "成功");
-              this.closeDialog(true);
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-          })
-      } else if (this.editType === "update") {
         updateReceive(tQuery)
           .then(response => {
-            this.loading = false;
             if (response.code === 20000) {
               this.$message.success(tMessage + "成功");
               this.closeDialog(true);
@@ -422,17 +373,23 @@ export default {
           .catch(() => {
             this.loading = false;
           })
-      }
-
-
     },
     selectProductFunction(event) {
+
+      if(this.formData.targetInvCode==null){
+        this.$message.error("往来信息为空！");
+        return;
+      }
+
       if (this.$isBlank(event)) {
         this.selectInvProductVisible = true;
       }
     },
     closeDialogC2(rData) {
       this.selectInvProductVisible = false;
+      this.formData.billNo=rData;
+      this.getOrderDetailList();
+
     },
     rowChange(val) {
       this.currentRow = val;
@@ -443,7 +400,14 @@ export default {
     },
     tableCountChange(row) {
       if (this.$isNotBlank(row)) {
-        // row.count = row.reCount;
+        updateReceiveDetail(row).then(res=>{
+           if (res.code==20000){
+             this.loading = false;
+           }else{
+             this.$message.error(res.message);
+           }
+
+        })
       }
     },
     tableRowClassName({row, rowIndex}) {
@@ -462,50 +426,20 @@ export default {
         this.getList();
       }
     },
-    saveCodeArray(index, row) {
-      if (this.$isBlank(row.batchNo)) {
-        return this.$message.error('批次号不能为空');
-      }
-      this.$refs.multipleTable.setCurrentRow();
-      this.currentRow = {};
-      this.selectedIndex = "";
-      this.iCount = 0;
-
-      this.detailLoading = true;
-      // row.count = row.reCount;
-      let tQuery = row;
-      uploadStockOrderDetail(tQuery).then((response) => {
-        this.detailLoading = false;
-        if (response.code === 20000) {
-          this.$message.success("修改完成");
-          this.getStockOrderDetailList();
-          this.$refs.inputRef.focus();
-        } else {
-          this.$message.error(response.message);
-        }
-      });
-    },
     deleteCodeArray(index, row) {
       this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
-        this.$refs.multipleTable.setCurrentRow();
-        this.currentRow = {};
-        this.selectedIndex = "";
-        this.iCount = 0;
-
         if (this.orderEditor) {
           this.detailLoading = true;
           if (this.$isNotBlank(row.id)) {
-            delOrderDetail({id: row.id})
+            delReceiveDetail({id: row.id})
               .then(response => {
                 this.detailLoading = false;
                 if (response.code === 20000) {
-                  this.$message.success(response.data);
-                  // this.getStockOrderDetailList();
-                  this.codeArray.splice(index, 1);
+                     this.getOrderDetailList();
                 } else {
                   this.$message.error(response.message);
                 }
@@ -529,47 +463,8 @@ export default {
       this.getBusType();
       this.findFromInv();
     },
-    copyDetail(row) {
-      this.$confirm("是否复制该记录?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        let rData = JSON.parse(JSON.stringify(row));
-        rData.id = null;
-        if (this.codeArray.length === 0) {
-          this.codeArray.push(rData);
-          this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
-          this.currentRow = this.codeArray[0];
-          this.selectedIndex = 0;
-        } else {
-          this.codeArray.unshift(rData);
-          this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
-          this.currentRow = this.codeArray[0];
-          this.selectedIndex = 0;
-        }
-        this.$message.success("复制成功");
-        this.iCount = this.currentRow.count;
-        this.focusNext('iCount');
-      }).catch(() => {
-      });
-    },
-    getInputFocus(event) {
-      event.currentTarget.select();
-    },
-    tableSelection() {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleAllSelection();
-    },
-    handleSizeChange(val) {
-      this.query.limit = val;
-      this.getStockOrderDetailList();
-    },
-    handleCurrentChange(val) {
-      this.query.page = val;
-      this.getStockOrderDetailList();
-    },
-    getStockOrderDetailList() {
+
+    getOrderDetailList() {
       this.loading = true;
       this.query.orderIdFk = this.formData.billNo;
       getOrderDetail(this.query) //查找该单号下的所有条码
@@ -584,30 +479,6 @@ export default {
           this.total = 0;
         });
     },
-    intentBack() {
-      this.$router.go(-1);
-    },
-
-    selectOne(event) {
-      this.formData.corpName = event.name;
-      this.formData.corpId = event.erpId;
-      this.formData.unitIdFk = event.erpId;
-    },
-    getActionItem(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].thirdAction === action) {
-          return this.busTypes[i];
-        }
-      }
-    },
-    locInChange(item) {
-      if (this.formData.invWarehouseCode != null) {
-        this.formData.invWarehouseCode = "";
-      }
-      this.formData.locStorageCode = item;
-      this.$forceUpdate();
-      this.finCurInv();
-    },
   },
   filters: {},
   mounted() {
@@ -618,13 +489,15 @@ export default {
   },
   created() {
     if (this.$isNotBlank(this.idQuery.id)) {
+      this.editType=true;
       this.query.limit = 100;
       this.query.orderIdFk = this.idQuery.id;
       this.formData = this.idQuery.formData;
       this.orderEditor = true;
       this.sValue = this.formData.corpName;
-      this.getStockOrderDetailList();
+      this.getOrderDetailList();
     } else {
+      this.editType=false;
       this.formData = {
         invCode: null,
         targetInvCode: null,
@@ -636,6 +509,7 @@ export default {
     }
 
     this.getBusType();
+    this.findFromInv();
     this.finCurInv();
   },
 };