From b8865d7584b8e3615237776b4dfe6aa65863eb63 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 22 Mar 2023 17:24:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=95=8C=E9=9D=A2=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue              |  39 ++++---
 src/views/basic/business/stockOrder.vue       |   8 +-
 src/views/inout/InvoiceRegistration.vue       |  27 +++--
 src/views/inout/IoArrivalSearchOrder.vue      |  26 ++---
 src/views/inout/IoCheckErrorOrder.vue         |   6 +-
 src/views/inout/IoCreateBusOrder.vue          |   4 +-
 src/views/inout/IoCreateErrorOrder.vue        |   4 +-
 src/views/inout/IoCreateOrder.vue             |  10 +-
 src/views/inout/IoCreateScanOrder.vue         |   7 +-
 src/views/inout/IoDealOrder.vue               |   6 +-
 src/views/inout/IoDeliveryAuditOrder.vue      | 110 ++++++++++++------
 src/views/inout/IoDeliverySearchOrder.vue     |  30 ++---
 src/views/inout/IoInoutSearchOrder.vue        |  23 ++--
 src/views/inout/IoReturnedSearchOrder.vue     |  28 +++--
 src/views/inout/IoSupAduitOrder.vue           |   8 +-
 src/views/inout/IoSupSearchOrder.vue          |  25 ++--
 src/views/inout/IoSupSecAuditOrder.vue        |  31 ++---
 src/views/inventory/InvSupProuducts.vue       |   2 +-
 .../purDelivery/purDeliveryAuditDialog.vue    |   2 +-
 .../purDelivery/purDeliveryEditDialog.vue     |   6 +-
 .../purDelivery/purDeliverySearch.vue         |   2 +-
 21 files changed, 233 insertions(+), 171 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index a6ef0c1..55f024c 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -9,12 +9,16 @@
       <template v-if="device!=='mobile'">
 
         <div class="inv-hos-title">
-          <span style="font-weight: bold;color: #303133;">协和医院平潭分院</span>
+          <!--          <span style="font-weight: bold;color: #303133;">协和医院平潭分院</span>-->
           <span
-            style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">({{ inv }})</span>
-
-          <span style="font-weight: 500;color:rgb(51 48 48); ">{{this.companyName}}</span>
-          <span style="font-weight: 500;color:rgb(51 48 48);">({{this.userName}})</span>
+            style="margin-left:8px;color: #2d8cf0;font-size: 14px;">部门:{{ deptName }}</span>
+          <span
+            style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">仓库:{{ inv }}</span>
+          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户:{{ this.companyName }}</span>
+          <span
+            style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px">({{
+              this.userName
+            }})</span>
         </div>
         <search id="header-search" class="right-menu-item"/>
         <screenfull id="screenfull" class="right-menu-item hover-effect"/>
@@ -122,13 +126,14 @@ import router from "@/router";
 export default {
   data() {
     return {
+      deptName: store.getters.locDeptName,
       inv: store.getters.locInvName,
       selInvVisible: false,
       userInfo: {},
       deptList: [],
       invList: [],
-      userName:'',
-      companyName:'',
+      userName: '',
+      companyName: '',
       formRules: {
         locDeptCode: [
           {required: true, message: "请选择当前部门", trigger: "blur"}
@@ -184,7 +189,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = process.env.VUE_APP_CONTEXT_PATH ;
+          location.href = process.env.VUE_APP_CONTEXT_PATH;
         })
       }).catch(() => {
       });
@@ -207,7 +212,7 @@ export default {
 
     deptChange() {
       this.getInvList();
-      this.userInfo.locInvCode="";
+      this.userInfo.locInvCode = "";
     },
 
     getInvList() {
@@ -223,7 +228,7 @@ export default {
           }
         })
         .catch(() => {
-          this.selInvVisible=true;
+          this.selInvVisible = true;
         });
     },
 
@@ -275,13 +280,13 @@ export default {
 
   },
   created() {
-    this.userName=this.$store.getters.name;
-    this.companyName=this.$store.getters.companyName;
-      this.userInfo = {
-        id: store.getters.adminId,
-        locInvCode: store.getters.locInvCode,
-        locDeptCode: store.getters.locDeptCode,
-      };
+    this.userName = this.$store.getters.name;
+    this.companyName = this.$store.getters.companyName;
+    this.userInfo = {
+      id: store.getters.adminId,
+      locInvCode: store.getters.locInvCode,
+      locDeptCode: store.getters.locDeptCode,
+    };
 
 
     this.getDeptList();
diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index 19c43ce..bbbd7c5 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -83,8 +83,10 @@
         </el-table-column>
         <el-table-column label="创建时间" prop="createTime" width="150"></el-table-column>
         <el-table-column label="打印状态" width="100" prop="inCodeStatus">
+          <template slot-scope="scope">
+            <span>{{ enableMap[scope.row.inCodeStatus] }}</span>
+          </template>
         </el-table-column>
-
         <el-table-column label="采购部门" prop="deptName" width="120">
         </el-table-column>
         <el-table-column label="收货仓库" prop="invName" width="150">
@@ -222,6 +224,10 @@ export default {
       detailTotal: 0,
       loading: false,
       detailLoading: false,
+      enableMap: {
+        1: "已打印",
+        0: "未打印",
+      },
       sourceMap: {
         "1": "UDIMS平台",
         "2": "网页新增",
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 174812c..ff5f1d7 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -113,28 +113,29 @@
                 border
                 @current-change="handleSelectionChange">
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <i class="el-icon-time"></i>
-            <span>{{ scope.row.createTime }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
+        <!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
+        <!--        </el-table-column>-->
         <el-table-column label="单据类型" prop="billTypeName" width="150">
         </el-table-column>
-        <el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
-<!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
-        <!--        </el-table-column>-->
+        <el-table-column label="供应商" prop="fromName" width="220" v-if="showSup">
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createTimem" width="150" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column label="审核时间" prop="auditTime" width="150" show-overflow-tooltip>
+        </el-table-column>
+
         <el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">
         </el-table-column>
         <el-table-column label="收货仓库" prop="invName" width="120">
         </el-table-column>
         <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
+
         <el-table-column label="来源" prop="fromType" width="120">
           <template slot-scope="scope">
             <span>{{ fromTypeMap[scope.row.fromType] }}</span>
           </template>
         </el-table-column>
-
         <el-table-column label="单据状态" prop="status" width="100">
           <template slot-scope="scope">
             <el-tag :type="statusFilterType(scope.row.status)">{{
@@ -378,6 +379,8 @@ export default {
       loading: false,
       index: null,
       enableDept: false,
+      showSup: false,
+
       fromTypeMap: {
         "1": "UDIMS平台",
         "2": "网页新增",
@@ -751,6 +754,10 @@ export default {
   }
   ,
   created() {
+    let supId = this.$store.getters.customerId;
+    if (supId == "110") {
+      this.showSup = true;
+    }
     this.getInvList();
     this.getDeptList();
     this.getBusType();
diff --git a/src/views/inout/IoArrivalSearchOrder.vue b/src/views/inout/IoArrivalSearchOrder.vue
index 0fce208..e200042 100644
--- a/src/views/inout/IoArrivalSearchOrder.vue
+++ b/src/views/inout/IoArrivalSearchOrder.vue
@@ -108,22 +108,10 @@
                 border
                 @current-change="handleSelectionChange">
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
         <el-table-column label="送单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
         <el-table-column label="送货单位" prop="fromName" width="220">
         </el-table-column>
-        <el-table-column label="采购部门" prop="deptName" width="120">
-        </el-table-column>
-        <el-table-column label="收货仓库" prop="invName" width="120">
-        </el-table-column>
-
-        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
-        <el-table-column label="来源" prop="fromType" width="120">
-          <template slot-scope="scope">
-            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
-          </template>
-        </el-table-column>
-
         <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
           <template slot-scope="scope">
             <i class="el-icon-time"></i>
@@ -137,6 +125,16 @@
             <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="采购部门" prop="deptName" width="120">
+        </el-table-column>
+        <el-table-column label="收货仓库" prop="invName" width="120">
+        </el-table-column>
+        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="来源" prop="fromType" width="120">
+          <template slot-scope="scope">
+            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+          </template>
+        </el-table-column>
 
 
         <el-table-column label="审核状态" prop="status" width="100">
@@ -518,7 +516,7 @@ export default {
         6: "校验异常",
         7: "已审核",
         8: "审核拒绝",
-        9: "正在处理",10: "待审核",
+        9: "正在处理", 10: "待审核",
       },
       storageList: [],
       invList: [],
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index 935f1d0..8986d84 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -101,15 +101,15 @@
                 border
                 @cell-click="handleSelectionChange">
         <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="150">
+        </el-table-column>
         <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             <i class="el-icon-time"></i>
             <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="单据类型" prop="billTypeName" width="150">
-        </el-table-column>
-        <el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="送货单位" prop="fromName" width="220">
         </el-table-column>
         <el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index 4c44156..0b4d3d8 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -112,10 +112,10 @@
                 border
       >
         <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
         <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
-        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
         <!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
         <!--        </el-table-column>-->
         <el-table-column label="采购部门" prop="deptName" width="120">
diff --git a/src/views/inout/IoCreateErrorOrder.vue b/src/views/inout/IoCreateErrorOrder.vue
index db861c6..9fb0555 100644
--- a/src/views/inout/IoCreateErrorOrder.vue
+++ b/src/views/inout/IoCreateErrorOrder.vue
@@ -35,8 +35,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item class="query-form-item" label="送货仓库:">
-              <el-select v-model="filterQuery.invCode" placeholder="请选择送货仓库" clearable="true"
+            <el-form-item class="query-form-item" label="收货仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
                          style="width: 90%"
                          @change="invChange"
               >
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 6a70462..105f3a4 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -102,16 +102,18 @@
                 border
       >
         <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="150">
+        </el-table-column>
         <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             <i class="el-icon-time"></i>
             <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="单据类型" prop="billTypeName" width="150">
-        </el-table-column>
-        <el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
-<!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
+
+
+        <!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
         <!--        </el-table-column>-->
         <el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">
         </el-table-column>
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
index 64e9796..5f1d6b7 100644
--- a/src/views/inout/IoCreateScanOrder.vue
+++ b/src/views/inout/IoCreateScanOrder.vue
@@ -102,11 +102,12 @@
                 border
       >
         <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
+
+        <el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
         <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
-        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
-<!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
+        <!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
         <!--        </el-table-column>-->
         <el-table-column label="采购部门" prop="deptName" width="120">
         </el-table-column>
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index 32c455f..258d919 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -103,15 +103,15 @@
                 border
       >
         <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="150">
+        </el-table-column>
         <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             <i class="el-icon-time"></i>
             <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="单据类型" prop="billTypeName" width="150">
-        </el-table-column>
-        <el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="送货单位" prop="fromName" width="220">
         </el-table-column>
         <el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">
diff --git a/src/views/inout/IoDeliveryAuditOrder.vue b/src/views/inout/IoDeliveryAuditOrder.vue
index d2b4a8d..4a7caa0 100644
--- a/src/views/inout/IoDeliveryAuditOrder.vue
+++ b/src/views/inout/IoDeliveryAuditOrder.vue
@@ -3,7 +3,35 @@
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
-          <el-col :span="8">
+
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="送货单位:">
+              <el-select
+                v-model="filterQuery.fromCorp"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="供应商名称"
+                :remote-method="findMethod"
+                size="mini"
+                :loading="corpLoading"
+                style="width: 90%"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.erpId"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="送货单号:">
               <el-input v-model="filterQuery.billNo" placeholder="请输入送货单号"
                         style="width: 90%"
@@ -11,19 +39,9 @@
             </el-form-item>
           </el-col>
 
-          <!--          <el-col :span="6">-->
-          <!--            <el-form-item class="query-form-item" label="出入库类型:">-->
-          <!--              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">-->
-          <!--                <el-option label="全部" value=""></el-option>-->
-          <!--                <el-option label="入库" value="WareHouseIn"></el-option>-->
-          <!--                <el-option label="出库" value="WareHouseOut"></el-option>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="送货仓库:">
-              <el-select v-model="filterQuery.invCode" placeholder="请选择送货仓库" clearable="true"
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="收货仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
                          style="width: 90%"
                          @change="invChange"
               >
@@ -37,7 +55,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
                          style="width: 90%"
@@ -55,7 +73,7 @@
         </el-row>
         <el-row>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="审核状态:">
               <el-select v-model="filterQuery.status" placeholder="请选择出入库类型" style="width: 90%">
                 <el-option label="全部" value=""></el-option>
@@ -65,7 +83,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="创建时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -82,7 +100,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="审核时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -120,29 +138,16 @@
                 border
                 @current-change="handleSelectionChange">
         <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
-        <el-table-column label="送单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="送货单位" prop="fromName" width="220">
         </el-table-column>
-        <el-table-column label="采购部门" prop="deptName" width="120">
-        </el-table-column>
-        <el-table-column label="收货仓库" prop="invName" width="120">
-        </el-table-column>
-
-        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
-        <el-table-column label="来源" prop="fromType" width="120">
-          <template slot-scope="scope">
-            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
-          </template>
-        </el-table-column>
-
         <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
           <template slot-scope="scope">
             <i class="el-icon-time"></i>
             <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
-
         <el-table-column label="审核时间" prop="createTime" show-overflow-tooltip width="150">
           <template slot-scope="scope">
             <i class="el-icon-time"></i>
@@ -150,6 +155,17 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="采购部门" prop="deptName" width="120">
+        </el-table-column>
+        <el-table-column label="收货仓库" prop="invName" width="120">
+        </el-table-column>
+        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="来源" prop="fromType" width="120">
+          <template slot-scope="scope">
+            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+          </template>
+        </el-table-column>
+
 
         <el-table-column label="审核状态" prop="status" width="100">
           <template slot-scope="scope">
@@ -508,6 +524,7 @@ import {getCodeDetailList} from "@/api/inout/orderDetailCode";
 import {getCodeList} from "@/api/inout/code";
 import AcceptOrder from "@/views/inout/DialogReviewOrder";
 import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
+import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 
 
 const formJson = {
@@ -527,7 +544,7 @@ export default {
         billNo: null,
         mainAction: null,
         action: null,
-        status:10,
+        status: 10,
         page: 1,
         limit: 10,
         startTime: null,
@@ -583,6 +600,8 @@ export default {
       formData: formJson,
       deleteLoading: false,
       busTypes: [],
+      corpLoading: false,
+      fromOptions: [],
       currentRow: {
         billNo: ""
       },
@@ -660,7 +679,7 @@ export default {
         billNo: null,
         mainAction: null,
         action: null,
-        status:10,
+        status: 10,
         page: 1,
         limit: 10,
         startTime: null,
@@ -745,6 +764,29 @@ export default {
         .catch(() => {
         });
     },
+
+    findMethod(key) {
+      this.corpLoading = true;
+      this.fromOptions = [];
+      let params = {
+        key: key,
+        corpType: 2,
+        page: 1,
+        limit: 20
+      };
+      getBasicUnitMaintains(params).then((res) => {
+        this.corpLoading = false;
+        this.fromOptions = res.data.list || [];
+      }).catch(() => {
+        this.corpLoading = false;
+      })
+    },
+    corpChange(value) {
+      if (!isBlank(value)) {
+        this.findMethod(value);
+      }
+    },
+
     handleSelectionChange(val) {
       this.currentRow = val;
       this.getOrderDetails();
diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue
index 83d5d87..459ae4a 100644
--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@@ -22,8 +22,8 @@
           <!--          </el-col>-->
 
           <el-col :span="8">
-            <el-form-item class="query-form-item" label="送货仓库:">
-              <el-select v-model="filterQuery.invCode" placeholder="请选择送货仓库" clearable="true"
+            <el-form-item class="query-form-item" label="收货仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
                          style="width: 90%"
                          @change="invChange"
               >
@@ -120,22 +120,10 @@
                 border
                 @current-change="handleSelectionChange">
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
         <el-table-column label="送单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
         <el-table-column label="送货单位" prop="fromName" width="220">
         </el-table-column>
-        <el-table-column label="采购部门" prop="deptName" width="120">
-        </el-table-column>
-        <el-table-column label="收货仓库" prop="invName" width="120">
-        </el-table-column>
-
-        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
-        <el-table-column label="来源" prop="fromType" width="120">
-          <template slot-scope="scope">
-            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
-          </template>
-        </el-table-column>
-
         <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
           <template slot-scope="scope">
             <i class="el-icon-time"></i>
@@ -151,6 +139,18 @@
         </el-table-column>
 
 
+        <el-table-column label="采购部门" prop="deptName" width="120">
+        </el-table-column>
+        <el-table-column label="收货仓库" prop="invName" width="120">
+        </el-table-column>
+        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="来源" prop="fromType" width="120">
+          <template slot-scope="scope">
+            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+          </template>
+        </el-table-column>
+
+
         <el-table-column label="审核状态" prop="status" width="100">
           <template slot-scope="scope">
             <el-tag :type="statusFilterType(scope.row.status)">{{
diff --git a/src/views/inout/IoInoutSearchOrder.vue b/src/views/inout/IoInoutSearchOrder.vue
index 2f5e5f2..2d1d9e1 100644
--- a/src/views/inout/IoInoutSearchOrder.vue
+++ b/src/views/inout/IoInoutSearchOrder.vue
@@ -107,26 +107,27 @@
                 @current-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
         <el-table-column label="订单号" prop="billNo" width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
+        <el-table-column label="往来单位" prop="fromName" width="220">
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
+          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
+            <span>{{ scope.row.createTime }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="来源订单号" prop="corpOrderId" width="180" show-overflow-tooltip></el-table-column>
         <el-table-column label="来源" prop="fromType" width="120">
           <template slot-scope="scope">
             <span>{{ fromTypeMap[scope.row.fromType] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="往来单位" prop="fromName" width="220">
-        </el-table-column>
+
         <el-table-column label="当前部门" prop="deptName" width="120">
         </el-table-column>
         <el-table-column label="当前仓库" prop="invName" width="120">
         </el-table-column>
-        <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
-          <template slot-scope="scope">
-            <i class="el-icon-time"></i>
-            <span>{{ scope.row.createTime }}</span>
-          </template>
-        </el-table-column>
         <el-table-column label="校验状态" prop="status" width="100">
           <template slot-scope="scope">
             <el-tag :type="statusFilterType(scope.row.status)">{{
@@ -511,7 +512,7 @@ export default {
         6: "校验异常",
         7: "审核通过",
         8: "审核拒绝",
-        9: "正在处理",10: "待审核",
+        9: "正在处理", 10: "待审核",
       },
       storageList: [],
       invList: [],
@@ -698,7 +699,7 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enabled: true,
-        inStock:true,
+        inStock: true,
       };
       getLocalJoinByUser(query)
         .then((response) => {
diff --git a/src/views/inout/IoReturnedSearchOrder.vue b/src/views/inout/IoReturnedSearchOrder.vue
index 95f8a7c..403efda 100644
--- a/src/views/inout/IoReturnedSearchOrder.vue
+++ b/src/views/inout/IoReturnedSearchOrder.vue
@@ -118,22 +118,8 @@
                 border
                 @current-change="handleSelectionChange">
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
         <el-table-column label="退货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
-        <!--        <el-table-column label="供应商" prop="fromName" width="220">-->
-        <!--        </el-table-column>-->
-        <el-table-column label="退货部门" prop="deptName" width="120">
-        </el-table-column>
-        <el-table-column label="退货仓库" prop="invName" width="120">
-        </el-table-column>
-
-        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
-        <el-table-column label="来源" prop="fromType" width="120">
-          <template slot-scope="scope">
-            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
-          </template>
-        </el-table-column>
-
+        <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
         <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
           <template slot-scope="scope">
             <i class="el-icon-time"></i>
@@ -147,6 +133,18 @@
             <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
+        <!--        <el-table-column label="供应商" prop="fromName" width="220">-->
+        <!--        </el-table-column>-->
+        <el-table-column label="退货部门" prop="deptName" width="120">
+        </el-table-column>
+        <el-table-column label="退货仓库" prop="invName" width="120">
+        </el-table-column>
+        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="来源" prop="fromType" width="120">
+          <template slot-scope="scope">
+            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+          </template>
+        </el-table-column>
 
 
         <el-table-column label="审核状态" prop="status" width="100">
diff --git a/src/views/inout/IoSupAduitOrder.vue b/src/views/inout/IoSupAduitOrder.vue
index 6efc18a..f135049 100644
--- a/src/views/inout/IoSupAduitOrder.vue
+++ b/src/views/inout/IoSupAduitOrder.vue
@@ -101,12 +101,12 @@
                 border
                 @current-change="handleSelectionChange">
         <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
         <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
-        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
-<!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
-<!--        </el-table-column>-->
+        <!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
+        <!--        </el-table-column>-->
         <el-table-column label="采购部门" prop="deptName" width="120">
         </el-table-column>
         <el-table-column label=收货仓库 prop="invName" width="120">
diff --git a/src/views/inout/IoSupSearchOrder.vue b/src/views/inout/IoSupSearchOrder.vue
index 4f973bd..b1b79ad 100644
--- a/src/views/inout/IoSupSearchOrder.vue
+++ b/src/views/inout/IoSupSearchOrder.vue
@@ -119,18 +119,19 @@
                 border
                 @current-change="handleSelectionChange">
         <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="审核时间" prop="auditTime" width="140" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
-        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
-<!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
-<!--        </el-table-column>-->
+        <!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
+        <!--        </el-table-column>-->
         <el-table-column label="采购部门" prop="deptName" width="120">
         </el-table-column>
-        <el-table-column label="送货仓库" prop="invName" width="120">
-        </el-table-column>
-        <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
+        <el-table-column label="收货仓库" prop="invName" width="120">
         </el-table-column>
+
         <el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>
         <el-table-column label="来源" prop="fromType">
           <template slot-scope="scope">
@@ -355,11 +356,11 @@
             label="序列号"
             prop="serialNo"
           ></el-table-column>
-<!--          <el-table-column-->
-<!--            label="供应商"-->
-<!--            prop="supName"-->
-<!--            show-overflow-tooltip-->
-<!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="供应商"-->
+          <!--            prop="supName"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
           <el-table-column
             label="扫码数量"
             prop="reCount"
diff --git a/src/views/inout/IoSupSecAuditOrder.vue b/src/views/inout/IoSupSecAuditOrder.vue
index 97e8590..4bf76cb 100644
--- a/src/views/inout/IoSupSecAuditOrder.vue
+++ b/src/views/inout/IoSupSecAuditOrder.vue
@@ -113,18 +113,19 @@
                 border
                 @current-change="handleSelectionChange">
         <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="审核时间" prop="auditTime" width="140" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
-        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
         <!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
         <!--        </el-table-column>-->
         <el-table-column label="采购部门" prop="deptName" width="120">
         </el-table-column>
-        <el-table-column label="送货仓库" prop="invName" width="120">
-        </el-table-column>
-        <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
+        <el-table-column label="收货仓库" prop="invName" width="120">
         </el-table-column>
+
         <el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>
         <el-table-column label="来源" prop="fromType">
           <template slot-scope="scope">
@@ -156,14 +157,14 @@
             >打印
             </el-button
             >
-            <el-button
-              type="text"
-              size="small"
-              v-if="scope.row.status == 10"
-              @click.native.stop="reviewOrder(scope.row)"
-            >审核
-            </el-button
-            >
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              v-if="scope.row.status == 10"-->
+<!--              @click.native.stop="reviewOrder(scope.row)"-->
+<!--            >审核-->
+<!--            </el-button-->
+<!--            >-->
             <el-button
               type="text"
               size="small"
@@ -422,7 +423,7 @@ export default {
         id: "",
         billNo: null,
         // statusType: "audited",
-        status:10,
+        status: 10,
         mainAction: null,
         action: null,
         page: 1,
@@ -553,7 +554,7 @@ export default {
       this.filterQuery = {
         id: "",
         billNo: null,
-        status:10,
+        status: 10,
         mainAction: null,
         action: null,
         page: 1,
diff --git a/src/views/inventory/InvSupProuducts.vue b/src/views/inventory/InvSupProuducts.vue
index cf071f5..33376e4 100644
--- a/src/views/inventory/InvSupProuducts.vue
+++ b/src/views/inventory/InvSupProuducts.vue
@@ -212,8 +212,8 @@ export default {
         id: "",
         status: 10,
       },
-      corpLoading: false,
       dialogVisible: false,
+      corpLoading: false,
       fromOptions: [],
       showSup: false,
       detailDialogVisible: false,
diff --git a/src/views/purchase/purDelivery/purDeliveryAuditDialog.vue b/src/views/purchase/purDelivery/purDeliveryAuditDialog.vue
index d60fe85..fb2801c 100644
--- a/src/views/purchase/purDelivery/purDeliveryAuditDialog.vue
+++ b/src/views/purchase/purDelivery/purDeliveryAuditDialog.vue
@@ -36,7 +36,7 @@
 
         <el-row>
           <el-col :span="11">
-            <el-form-item prop="fromCorp" label="送货仓库:">
+            <el-form-item prop="fromCorp" label="收货仓库:">
               <el-input v-model="formData.invName" auto-complete="off"
                         disabled
               ></el-input>
diff --git a/src/views/purchase/purDelivery/purDeliveryEditDialog.vue b/src/views/purchase/purDelivery/purDeliveryEditDialog.vue
index 6cdbbfc..4627b79 100644
--- a/src/views/purchase/purDelivery/purDeliveryEditDialog.vue
+++ b/src/views/purchase/purDelivery/purDeliveryEditDialog.vue
@@ -32,8 +32,8 @@
 
         <el-row>
           <el-col :span="11">
-            <el-form-item label="送货仓库:" prop="invCode">
-              <el-select v-model="formData.invCode" @change="setDeptCode" placeholder="送货仓库信息" style="width: 100%"
+            <el-form-item label="收货仓库:" prop="invCode">
+              <el-select v-model="formData.invCode" @change="setDeptCode" placeholder="收货仓库信息" style="width: 100%"
                          clearable>
                 <el-option
                   v-for="item in invCodeList"
@@ -276,7 +276,7 @@ export default {
               return this.$message.error("单据日期不能为空！");
             }
             if (this.formData.invCode == "" || this.formData.invCode == null) {
-              return this.$message.error("送货仓库不能为空！");
+              return this.$message.error("收货仓库不能为空！");
             }
             for (let i = 0; i < this.codeArray.length; i++) {
               if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
diff --git a/src/views/purchase/purDelivery/purDeliverySearch.vue b/src/views/purchase/purDelivery/purDeliverySearch.vue
index 07e0074..78faba4 100644
--- a/src/views/purchase/purDelivery/purDeliverySearch.vue
+++ b/src/views/purchase/purDelivery/purDeliverySearch.vue
@@ -47,7 +47,7 @@
         </el-table-column>
         <el-table-column label="供应商" prop="createUser"></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="invName"></el-table-column>
         <el-table-column label="备注" prop="remark"></el-table-column>
         <el-table-column label="状态" prop="status">
           <template slot-scope="scope">