diff --git a/.env.development b/.env.development
index c36d00d3..eed92e7d 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
 ENV = 'development'
 
 # 开发环境
-VUE_APP_BASE_API = 'http://192.168.0.166:9991'
+VUE_APP_BASE_API = 'http://127.0.0.1:9991'
 
 VUE_APP_SYNC_API ="http://127.0.0.1:10001"
 
diff --git a/.env.production b/.env.production
index 34ff415f..3f823e62 100644
--- a/.env.production
+++ b/.env.production
@@ -14,9 +14,10 @@ ENV = 'production'
 
 刘恩典
 # VUE_APP_BASE_API = 'http://192.168.0.127:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.0.127:9160/UDI_WMS_MC/'
 
 # 平潭正式
-VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 
 # 漳州中医院
 # VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
diff --git a/src/api/inout/orderDetailResult.js b/src/api/inout/orderDetailResult.js
index 2dcba502..9e465330 100644
--- a/src/api/inout/orderDetailResult.js
+++ b/src/api/inout/orderDetailResult.js
@@ -33,3 +33,22 @@ export function printOrder(data) {
     data: data
   });
 }
+
+
+export function excelInoutImport(params) {
+  return axios({
+    url: "/udiwms/inout/resultDetail/exportExcel",
+    method: "get",
+    responseType: 'blob',
+    params: params
+  });
+}
+
+export function postExcelInoutImport(data) {
+  return axios({
+    url: "/udiwms/inout/resultDetail/selectExportExcel",
+    method: "post",
+    responseType: 'blob',
+    data: data
+  });
+}
diff --git a/src/views/inout/DialogSelectInvProduct.vue b/src/views/inout/DialogSelectInvProduct.vue
index 43c1d19d..cd7ccc28 100644
--- a/src/views/inout/DialogSelectInvProduct.vue
+++ b/src/views/inout/DialogSelectInvProduct.vue
@@ -72,6 +72,7 @@
         <el-table-column label="DI/物资编码" prop="nameCode" width="120" show-overflow-tooltip></el-table-column>
         <el-table-column label="物资名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" width="160"></el-table-column>
+        <el-table-column label="计量单位" prop="measname" width="90"></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="90"></el-table-column>
         <el-table-column label="价格" prop="price"></el-table-column>
         <el-table-column label="生产日期" prop="productionDate" width="90"></el-table-column>
diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue
index d93478ee..426927d5 100644
--- a/src/views/inout/receive/DialogNewReceive.vue
+++ b/src/views/inout/receive/DialogNewReceive.vue
@@ -59,8 +59,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item class="query-form-item" prop="targetInvCode" label="领用仓库:">
-              <el-select v-model="formData.targetInvCode" placeholder="请选择领用仓库" @change="getTargerType"
+            <el-form-item class="query-form-item" prop="targetInvCode" label="到货仓库:">
+              <el-select v-model="formData.targetInvCode" placeholder="请选择到货仓库" @change="getTargerType"
                          clearable="true"
                          style="width: 100%"
               >
diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue
index 5fd61c0d..7d16ad1c 100644
--- a/src/views/inventory/supInoutSearchOrder.vue
+++ b/src/views/inventory/supInoutSearchOrder.vue
@@ -110,6 +110,8 @@
           <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-document" @click="selectExport">选中导出Excel</el-button>
+          <el-button type="primary" icon="el-icon-document" @click="searchExport">结果导出Excel</el-button>
           <el-button type="primary" icon="el-icon-printer" @click="optinPrint">选中打印</el-button>
           <el-button type="primary" icon="el-icon-printer" @click="selectPrint">查询结果打印</el-button>
 
@@ -137,7 +139,7 @@
         <el-table-column label="出入库时间" prop="auditTime" width="170" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="manufacturer" width="160" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案号" prop="certCode" width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column label="打印状态" width="100"  prop="inoutPrintStatus" >
+        <el-table-column label="打印状态" width="100" prop="inoutPrintStatus">
           <template slot-scope="scope">
             <el-tag :type="statusFilterType(scope.row.inoutPrintStatus)">{{
                 printMap[scope.row.inoutPrintStatus]
@@ -159,9 +161,16 @@
 </template>
 
 <script>
-import {getResultDetailList, getResultOrderList, verifyTemplateFile, printOrder} from '@/api/inout/orderDetailResult'
+import {
+  getResultDetailList,
+  getResultOrderList,
+  verifyTemplateFile,
+  printOrder,
+  excelInoutImport, postExcelInoutImport
+} from '@/api/inout/orderDetailResult'
 import {findByInvUser, getLocalJoinByUser} from "@/api/basic/busType";
 import {getCorrespondence} from "@/api/basic/basicUnitMaintain";
+import {excelImport} from "@/api/inout/statData";
 
 export default {
   name: "supInoutSearchOrder",
@@ -386,8 +395,6 @@ export default {
 
     },
     selectPrint() {
-
-
       this.$confirm("是否确定打印所有查询结果数据", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -446,9 +453,74 @@ export default {
       return;
 
 
+    },
+
+    selectExport() {
+      this.$confirm("是否确定导出选中出入库明细, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          if (this.orderSelection == null || this.orderSelection.length <= 0) {
+            return this.$message.error("请选择需要导出的明细！");
+          }
+          let printParams = {
+            list: this.orderSelection
+          };
+          postExcelInoutImport(printParams).then((response) => {
+            let blob = new Blob([response], {type: "application/vnd.ms-excel"});
+            let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+            let a = document.createElement("a");
+            a.href = url;
+            a.click();
+            this.$message("成功")
+          })
+        });
+
+
+    },
+    searchExport() {
+      this.$confirm("是否确定打印所有查询结果数据", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+
+          let printParams = {
+            orderIdFk: this.filterQuery.orderIdFk,
+            nameCode: this.filterQuery.nameCode,
+            coName: this.filterQuery.coName,
+            spec: this.filterQuery.spec,
+            batchNo: this.filterQuery.batchNo,
+            zczbhhzbapzbh: this.filterQuery.zczbhhzbapzbh,
+            manufacturer: this.filterQuery.manufacturer,
+            actionType: this.filterQuery.actionType,
+            keyWords: this.filterQuery.keyWords,
+            mainAction: this.filterQuery.mainAction,
+            action: this.filterQuery.action
+
+          };
+          if (this.actDateRange !== null) {
+            printParams.startAduditTime = this.actDateRange[0];
+            printParams.endAduditTime = this.actDateRange[1];
+          } else {
+            printParams.startAduditTime = null;
+            printParams.endAduditTime = null;
+          }
+          excelInoutImport(printParams).then((response) => {
+            let blob = new Blob([response], {type: "application/vnd.ms-excel"});
+            let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+            let a = document.createElement("a");
+            a.href = url;
+            a.click();
+            this.$message("成功")
+          })
+
+        });
     }
-  }
-  ,
+  },
   mounted() {
     document.body.ondrop = function (event) {
       event.preventDefault();
diff --git a/src/views/purchase/cert/supCertAudit.vue b/src/views/purchase/cert/supCertAudit.vue
index c48060cf..00587604 100644
--- a/src/views/purchase/cert/supCertAudit.vue
+++ b/src/views/purchase/cert/supCertAudit.vue
@@ -275,6 +275,7 @@
                 style="width: 100%">
         <el-table-column type="index" label="序号" width="50"></el-table-column>
         <el-table-column label="物资名称" prop="recordProductName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>
diff --git a/src/views/purchase/cert/supCertSearch.vue b/src/views/purchase/cert/supCertSearch.vue
index 823c928f..e163f010 100644
--- a/src/views/purchase/cert/supCertSearch.vue
+++ b/src/views/purchase/cert/supCertSearch.vue
@@ -1,253 +1,290 @@
 <template>
-    <div>
-
-        <!--        配送企业资质       -->
-        <el-card>
-            <el-form :model="filterQuery" class="query-form"  label-width="120px"  v-show="showSearch">
-                <el-row>
-                  <el-col span="6">
-                    <el-form-item label="配送企业名称:">
-                        <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入配送企业名称" clearable></el-input>
-                    </el-form-item>
-                  </el-col>
-                    <el-col span="6">
-                    <el-form-item label="统一社会信用号:">
-                        <el-input v-model="filterQuery.creditNum" style="width: 90%" placeholder="请输入统一社会信用号" clearable></el-input>
-                    </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="onSubmit">查询</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 @row-click="supCompanyClick">
-                <el-table-column type="index" label="序号" width="50"></el-table-column>
-                <el-table-column label="配送企业名称" prop="companyName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="统一社会信用号" prop="creditNum"></el-table-column>
-                <el-table-column label="所属地区" prop="area"></el-table-column>
-                <el-table-column label="详细地址" prop="detailAddr" :show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="审核状态" prop="auditStatus" width="120">
-                    <template slot-scope="scope">
-                        <el-tag :type="(scope.row.auditStatus) | statusFilterType">
-                            {{ checkFlag[scope.row.auditStatus] }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
-
-                <el-table-column label="操作"  width="180">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3" @click.native.stop="editCompany(scope.row)">审核</el-button>
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3" @click.native.stop="editCompany(scope.row)">详情</el-button>
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3" @click.native="printSupCertPdf(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-dialog
-            :title="formMap[formName]"
-            :visible.sync="supCompanyVisible"
-            width="80%"
-            v-if="supCompanyVisible"
-            @close='closeDialog'
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-        >
-            <supCompanyEditAdudit
-                :closeDialog="closeDialog"
-                :inputQuery="inputQuery"
-                :editType="editType"
-            ></supCompanyEditAdudit>
-        </el-dialog>
-
-
-        <!--        生产企业资质       -->
-        <el-card class="el-card">
-            <el-form  :model="filterManufacturerQuery" class="query-form" label-width="120px"  v-show="showSearch1">
-                <el-row>
-                  <el-col :span="6">
-                    <el-form-item label="生产企业名称">
-                        <el-input v-model="filterManufacturerQuery.companyName" style="width: 90%" placeholder="请输入生产企业名称" clearable></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="统一社会信用号">
-                        <el-input v-model="filterManufacturerQuery.creditCode" style="width: 90%" placeholder="请输入统一社会信用号" clearable></el-input>
-                    </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="hideSearch1">显示/隐藏搜索栏</el-button>
-              <el-button type="primary" icon="el-icon-refresh" @click="onManufacturerReset">重置</el-button>
-              <el-button type="primary" icon="el-icon-search" @click="onManufacturerSubmit">查询</el-button>
-            </el-button-group>
-          </div>
-          <el-divider style="margin: 15px"></el-divider>
-
-          <el-table v-loading="loadManufacturerLoading" :data="manufacturerList" style="width: 100%" border highlight-current-row @row-click="supManufacturerClick">
-                <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="生产企业名称" prop="companyName" width="200" show-overflow-tooltip></el-table-column>
-                <el-table-column label="社会信用号" prop="creditCode"></el-table-column>
-                <el-table-column label="企业类型" prop="bussinessStatus" width="120">
-                    <template slot-scope="scope">
-                        <span>{{ companyTypeMap[scope.row.companyType] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="所在地区" prop="placeArea"></el-table-column>
-                <el-table-column label="所在地址" prop="placeAddress" :show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="所属供应商" prop="supName" :show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="审核状态" prop="auditStatus" width="120">
-                    <template slot-scope="scope">
-                        <el-tag :type="(scope.row.auditStatus) | statusFilterType">
-                            {{ checkFlag[scope.row.auditStatus] }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
-
-                <el-table-column label="操作"  width="180">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3" @click.native.stop="addInfoDialog(scope.row)">审核</el-button>
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3" @click.native.stop="addInfoDialog(scope.row)">详情</el-button>
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3" @click.native="printSupCertManufacturerPdf(scope.row)">打印</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-          <pagination
-            v-show="manufacturerTotal>0"
-            :total="manufacturerTotal"
-            :page.sync="filterManufacturerQuery.page"
-            :limit.sync="filterManufacturerQuery.limit"
-            @pagination="handleManuChange"
-          ></pagination>
-
-        </el-card>
-        <el-dialog
-            :title="formManufacturerMap[formManufacturerName]"
-            :visible.sync="addInfoVisible"
-            width="80%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            v-if="addInfoVisible"
-            @close='closeDialog'
-        >
-            <supManufacturerAuditDialog
-                :addCloseDialog="closeManufacturerDialog"
-                :enterpriseId="enterpriseId"
-                :inputQuery="inputManufacturerQuery"
-                :editType="editManufacturerType"
-            ></supManufacturerAuditDialog>
-        </el-dialog>
-
-
-        <!--        配送产品资质       -->
-        <el-card class="el-card">
-            <el-form  :model="registrationQuery" class="query-form" label-width="100px"  v-show="showSearch2">
-                <el-row style="width: 100%">
-                  <el-col :span="6">
-                    <el-form-item label="物资名称:">
-                        <el-input v-model="registrationQuery.recordProductName" style="width: 90%" clearable="true" placeholder="请输入物资名称"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="注册备案号:">
-                        <el-input v-model="registrationQuery.recordCode" style="width: 90%"  clearable="true" placeholder="请输入注册备案号"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="注册备案人:">
-                        <el-input v-model="registrationQuery.recordPeopleName" style="width: 90%"  clearable="true" placeholder="请输入注册备案人"></el-input>
-                    </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="hideSearch2">显示/隐藏搜索栏</el-button>
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset2">重置</el-button>
-              <el-button type="primary" icon="el-icon-search" @click="onSubmit2">查询</el-button>
-            </el-button-group>
-          </div>
-          <el-divider style="margin: 15px"></el-divider>
-
-            <el-table v-loading="registrationLoading" :data="registrationList" border highlight-current-row style="width: 100%">
-                <el-table-column type="index" label="序号" width="50"></el-table-column>
-                <el-table-column label="物资名称" prop="recordProductName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
-                <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="审核状态" prop="auditStatus" width="120">
-                    <template slot-scope="scope">
-                        <el-tag :type="(scope.row.auditStatus) | statusFilterType">
-                            {{ checkFlag[scope.row.auditStatus] }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
-
-
-                <el-table-column label="操作"  width="180">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3" @click.native.stop="registrationDialog(scope.row)">审核</el-button>
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3" @click.native.stop="registrationDialog(scope.row)">详情</el-button>
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3" @click.native="printSupCertProductionPdf(scope.row)">打印</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-          <pagination
-            v-show="certTotal>0"
-            :total="certTotal"
-            :page.sync="registrationQuery.page"
-            :limit.sync="registrationQuery.limit"
-            @pagination="certHandleCurrentChange"
-          ></pagination>
-
-
-        </el-card>
-        <el-dialog
-            :title="formProductMap[formProductName]"
-            :visible.sync="registrationVisible"
-            width="80%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            v-if="registrationVisible"
-            @close='closeProductDialog'
-        >
-            <suppliersRegistrationBasic
-                :closeRegistrationDialog="closeProductDialog"
-                :inputQuery="inputProudtQuery"
-                :editType="editProductType"
-            ></suppliersRegistrationBasic>
-        </el-dialog>
-
-    </div>
+  <div>
+
+    <!--        配送企业资质       -->
+    <el-card>
+      <el-form :model="filterQuery" class="query-form" label-width="120px" v-show="showSearch">
+        <el-row>
+          <el-col span="6">
+            <el-form-item label="配送企业名称:">
+              <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入配送企业名称"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col span="6">
+            <el-form-item label="统一社会信用号:">
+              <el-input v-model="filterQuery.creditNum" style="width: 90%" placeholder="请输入统一社会信用号"
+                        clearable></el-input>
+            </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="onSubmit">查询</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
+                @row-click="supCompanyClick">
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="配送企业名称" prop="companyName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="统一社会信用号" prop="creditNum"></el-table-column>
+        <el-table-column label="所属地区" prop="area"></el-table-column>
+        <el-table-column label="详细地址" prop="detailAddr" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="审核状态" prop="auditStatus" width="120">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
+              {{ checkFlag[scope.row.auditStatus] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" width="180">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3"
+                       @click.native.stop="editCompany(scope.row)">审核
+            </el-button>
+            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"
+                       @click.native.stop="editCompany(scope.row)">详情
+            </el-button>
+            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"
+                       @click.native="printSupCertPdf(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-dialog
+      :title="formMap[formName]"
+      :visible.sync="supCompanyVisible"
+      width="80%"
+      v-if="supCompanyVisible"
+      @close='closeDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <supCompanyEditAdudit
+        :closeDialog="closeDialog"
+        :inputQuery="inputQuery"
+        :editType="editType"
+      ></supCompanyEditAdudit>
+    </el-dialog>
+
+
+    <!--        生产企业资质       -->
+    <el-card class="el-card">
+      <el-form :model="filterManufacturerQuery" class="query-form" label-width="120px" v-show="showSearch1">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="生产企业名称">
+              <el-input v-model="filterManufacturerQuery.companyName" style="width: 90%" placeholder="请输入生产企业名称"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="统一社会信用号">
+              <el-input v-model="filterManufacturerQuery.creditCode" style="width: 90%" placeholder="请输入统一社会信用号"
+                        clearable></el-input>
+            </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="hideSearch1">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onManufacturerReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onManufacturerSubmit">查询</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+
+      <el-table v-loading="loadManufacturerLoading" :data="manufacturerList" style="width: 100%" border
+                highlight-current-row @row-click="supManufacturerClick">
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="生产企业名称" prop="companyName" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column label="社会信用号" prop="creditCode"></el-table-column>
+        <el-table-column label="企业类型" prop="bussinessStatus" width="120">
+          <template slot-scope="scope">
+            <span>{{ companyTypeMap[scope.row.companyType] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="所在地区" prop="placeArea"></el-table-column>
+        <el-table-column label="所在地址" prop="placeAddress" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="所属供应商" prop="supName" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="审核状态" prop="auditStatus" width="120">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
+              {{ checkFlag[scope.row.auditStatus] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" width="180">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3"
+                       @click.native.stop="addInfoDialog(scope.row)">审核
+            </el-button>
+            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"
+                       @click.native.stop="addInfoDialog(scope.row)">详情
+            </el-button>
+            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"
+                       @click.native="printSupCertManufacturerPdf(scope.row)">打印
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="manufacturerTotal>0"
+        :total="manufacturerTotal"
+        :page.sync="filterManufacturerQuery.page"
+        :limit.sync="filterManufacturerQuery.limit"
+        @pagination="handleManuChange"
+      ></pagination>
+
+    </el-card>
+    <el-dialog
+      :title="formManufacturerMap[formManufacturerName]"
+      :visible.sync="addInfoVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="addInfoVisible"
+      @close='closeDialog'
+    >
+      <supManufacturerAuditDialog
+        :addCloseDialog="closeManufacturerDialog"
+        :enterpriseId="enterpriseId"
+        :inputQuery="inputManufacturerQuery"
+        :editType="editManufacturerType"
+      ></supManufacturerAuditDialog>
+    </el-dialog>
+
+
+    <!--        配送产品资质       -->
+    <el-card class="el-card">
+      <el-form :model="registrationQuery" class="query-form" label-width="100px" v-show="showSearch2">
+        <el-row style="width: 100%">
+          <el-col :span="6">
+            <el-form-item label="物资名称:">
+              <el-input v-model="registrationQuery.recordProductName" style="width: 90%" clearable="true"
+                        placeholder="请输入物资名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="注册备案号:">
+              <el-input v-model="registrationQuery.recordCode" style="width: 90%" clearable="true"
+                        placeholder="请输入注册备案号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="注册备案人:">
+              <el-input v-model="registrationQuery.recordPeopleName" style="width: 90%" clearable="true"
+                        placeholder="请输入注册备案人"></el-input>
+            </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="hideSearch2">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset2">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit2">查询</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+
+      <el-table v-loading="registrationLoading" :data="registrationList" border highlight-current-row
+                style="width: 100%">
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="物资名称" prop="recordProductName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="审核状态" prop="auditStatus" width="120">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
+              {{ checkFlag[scope.row.auditStatus] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+
+
+        <el-table-column label="操作" width="180">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3"
+                       @click.native.stop="registrationDialog(scope.row)">审核
+            </el-button>
+            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"
+                       @click.native.stop="registrationDialog(scope.row)">详情
+            </el-button>
+            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"
+                       @click.native="printSupCertProductionPdf(scope.row)">打印
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="certTotal>0"
+        :total="certTotal"
+        :page.sync="registrationQuery.page"
+        :limit.sync="registrationQuery.limit"
+        @pagination="certHandleCurrentChange"
+      ></pagination>
+
+
+    </el-card>
+    <el-dialog
+      :title="formProductMap[formProductName]"
+      :visible.sync="registrationVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="registrationVisible"
+      @close='closeProductDialog'
+    >
+      <suppliersRegistrationBasic
+        :closeRegistrationDialog="closeProductDialog"
+        :inputQuery="inputProudtQuery"
+        :editType="editProductType"
+      ></suppliersRegistrationBasic>
+    </el-dialog>
+
+  </div>
 </template>
 
 <script>
-import {getSupComapnys, delSupComapnys, printSupCert, verifyTemplateFile,filterCompanyCertIdList,printSupCertManufacturer,printSupCertProduction} from "@/api/purchase/supCompany";
+import {
+  getSupComapnys,
+  delSupComapnys,
+  printSupCert,
+  verifyTemplateFile,
+  filterCompanyCertIdList,
+  printSupCertManufacturer,
+  printSupCertProduction
+} from "@/api/purchase/supCompany";
 import supCompanyEditAdudit from "@/views/purchase/company/supCompanyAduditDialog";
 import supManufacturerAuditDialog from "@/views/purchase/manufacturer/supManufacturerAuditDialog";
 import {deleteCompany, getCompanyList} from "@/api/purchase/supManufacturer";
@@ -255,475 +292,475 @@ import suppliersRegistrationBasic from "@/views/purchase/product/supProductAudit
 import {deleteRegistration, getRegistrationList} from "@/api/purchase/suppliersRegistrationBasic";
 
 export default {
-    data() {
-        return {
-            /**-----------------配送企业资质----------------------------*/
-            showSearch:true,
-            filterQuery: {
-                companyName: "",
-                checkType: "",
-                creditNum: "",
-                auditStatus: "22",
-                page: 1,
-                limit: 20,
-            },
-            loading: false,
-            list: [],
-            total: 0,
-            formName: 1,
-            formMap: {
-                1: "配送企业资质详情",
-                2: "配送企业资质审核",
-            },
-            checkFlag: {
-                0: "草稿",
-                1: "已通过",
-                2: "已拒绝",
-                3: "变更未审核",
-                6: "未审核",
-            },
-            supCompanyVisible: false,
-            inputQuery: {},
-            editType: 0,            //0:新增，1：编辑
-
-            /**-----------------生产企业资质----------------------------*/
-            showSearch1:true,
-            filterManufacturerQuery: {
-                customerId: null,
-                companyName: "",
-                creditCode: "",
-                placeArea: "",
-                auditStatus: "22",
-                page: 1,
-                limit: 10,
-            },
-            manufacturerTotal: 0,
-            companyTypeMap: {
-                1: "境内企业",
-                2: "境外企业"
-            },
-            productManageTypeMap: {
-                1: "Ⅰ类",
-                2: "Ⅱ类",
-                3: "Ⅲ类",
-            },
-            formManufacturerName: 1,
-            formManufacturerMap: {
-                1: "生产企业资质详情",
-                2: "生产企业资质审核",
-            },
-
-            manufacturerLoading: false,
-            manufacturerList: [],
-            fromOptions: [],
-            addInfoVisible: false,
-            enterpriseId: "",
-            inputManufacturerQuery: {},
-            editManufacturerType: 1,
-            loadManufacturerLoading: false,
-
-
-            /**----------------------------配送产品资质--------------------------------*/
-            showSearch2:true,
-            productLoading: false,
-            value: "",
-            registrationVisible: false,
-            registrationQuery: {
-                customerId: null,
-                manufacturerIdFk: null,
-                auditStatus: "22",
-                recordProductName: "",
-                recordCode: "",
-                recordPeopleName: "",
-                page: 1,
-                limit: 20
-            },
-            registrationList: [],
-            registrationLoading: false,
-
-            pmQuery: {
-                customerId: null,
-                companyName: null,
-                page: 1,
-                limit: 10,
-            },
-            formProductName: 1,
-            formProductMap: {
-                1: "配送产品资质详情",
-                2: "配送产品资质审核",
-            },
-
-            inputProudtQuery: {},
-            editProductType: 0,
-            certTotal: 0,
-
-        };
+  data() {
+    return {
+      /**-----------------配送企业资质----------------------------*/
+      showSearch: true,
+      filterQuery: {
+        companyName: "",
+        checkType: "",
+        creditNum: "",
+        auditStatus: "22",
+        page: 1,
+        limit: 20,
+      },
+      loading: false,
+      list: [],
+      total: 0,
+      formName: 1,
+      formMap: {
+        1: "配送企业资质详情",
+        2: "配送企业资质审核",
+      },
+      checkFlag: {
+        0: "草稿",
+        1: "已通过",
+        2: "已拒绝",
+        3: "变更未审核",
+        6: "未审核",
+      },
+      supCompanyVisible: false,
+      inputQuery: {},
+      editType: 0,            //0:新增，1：编辑
+
+      /**-----------------生产企业资质----------------------------*/
+      showSearch1: true,
+      filterManufacturerQuery: {
+        customerId: null,
+        companyName: "",
+        creditCode: "",
+        placeArea: "",
+        auditStatus: "22",
+        page: 1,
+        limit: 10,
+      },
+      manufacturerTotal: 0,
+      companyTypeMap: {
+        1: "境内企业",
+        2: "境外企业"
+      },
+      productManageTypeMap: {
+        1: "Ⅰ类",
+        2: "Ⅱ类",
+        3: "Ⅲ类",
+      },
+      formManufacturerName: 1,
+      formManufacturerMap: {
+        1: "生产企业资质详情",
+        2: "生产企业资质审核",
+      },
+
+      manufacturerLoading: false,
+      manufacturerList: [],
+      fromOptions: [],
+      addInfoVisible: false,
+      enterpriseId: "",
+      inputManufacturerQuery: {},
+      editManufacturerType: 1,
+      loadManufacturerLoading: false,
+
+
+      /**----------------------------配送产品资质--------------------------------*/
+      showSearch2: true,
+      productLoading: false,
+      value: "",
+      registrationVisible: false,
+      registrationQuery: {
+        customerId: null,
+        manufacturerIdFk: null,
+        auditStatus: "22",
+        recordProductName: "",
+        recordCode: "",
+        recordPeopleName: "",
+        page: 1,
+        limit: 20
+      },
+      registrationList: [],
+      registrationLoading: false,
+
+      pmQuery: {
+        customerId: null,
+        companyName: null,
+        page: 1,
+        limit: 10,
+      },
+      formProductName: 1,
+      formProductMap: {
+        1: "配送产品资质详情",
+        2: "配送产品资质审核",
+      },
+
+      inputProudtQuery: {},
+      editProductType: 0,
+      certTotal: 0,
+
+    };
+  },
+  filters: {
+
+
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "success",
+        2: "danger",
+        6: "warning",
+      };
+      return statusMap[status];
     },
-    filters: {
-
-
-        statusFilterType(status) {
-            const statusMap = {
-                0: "warning",
-                1: "success",
-                2: "danger",
-                6: "warning",
-            };
-            return statusMap[status];
-        },
-        statusFilterName(status) {
-            const statusMap = {
-                0: "禁用",
-                1: "正常",
-                2: "未验证",
-            };
-            return statusMap[status];
-        },
+    statusFilterName(status) {
+      const statusMap = {
+        0: "禁用",
+        1: "正常",
+        2: "未验证",
+      };
+      return statusMap[status];
+    },
+  },
+  methods: {
+
+    /**-------------------------配送企业资质--------------------------*/
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        companyName: "",
+        creditNum: "",
+        auditStatus: "22",
+        page: 1,
+        limit: 20,
+      };
+      this.getList();
+      this.productList = [];
+      this.salesmanList = [];
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getList() {
+      this.loading = true;
+      getSupComapnys(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    onSubmit() {
+      this.getList();
+    },
+    editCompany(row) {
+      if (row.auditStatus == 6 || row.auditStatus == 3) {
+        this.formName = 2;
+        this.editType = 2;
+      } else {
+        this.editType = 1;
+        this.formName = 1;
+      }
+      this.supCompanyVisible = true;
+      this.inputQuery = row;
     },
-    methods: {
-
-        /**-------------------------配送企业资质--------------------------*/
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                companyName: "",
-                creditNum: "",
-                auditStatus: "22",
-                page: 1,
-                limit: 20,
-            };
-            this.getList();
-            this.productList = [];
-            this.salesmanList = [];
-        },
-        hideSearch() {
-          this.showSearch = !this.showSearch;
-        },
-        getList() {
-            this.loading = true;
-            getSupComapnys(this.filterQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.list = response.data.list || [];
-                    this.total = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        onSubmit() {
-            this.getList();
-        },
-        editCompany(row) {
-            if (row.auditStatus == 6 || row.auditStatus == 3) {
-                this.formName = 2;
-                this.editType = 2;
-            } else {
-                this.editType = 1;
-                this.formName = 1;
-            }
-            this.supCompanyVisible = true;
-            this.inputQuery = row;
-        },
 
-        handleCurrentChange(val) {
-            this.filterQuery.page = val.page;
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    deleteDialog(row) {
+      this.$confirm("删除后将清空该供应商以及所有关联信息?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let tQuery = {
+            id: row.customerId,
+          };
+          delSupComapnys(tQuery).then(() => {
             this.getList();
-        },
-        deleteDialog(row) {
-            this.$confirm("删除后将清空该供应商以及所有关联信息?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    let tQuery = {
-                        id: row.customerId,
-                    };
-                    delSupComapnys(tQuery).then(() => {
-                        this.getList();
-                    });
-                })
-                .catch(() => {
-                });
-        },
-        closeDialog() {
-            this.supCompanyVisible = false;
-        },
-
-        supCompanyClick(row) {
-            this.filterManufacturerQuery.customerId = row.customerId;
-            this.onManufacturerReset();
-        },
-
-
-        /**-------------------------生产企业资质--------------------------*/
-        onManufacturerReset() {
-            let customerId = this.filterManufacturerQuery.customerId;
-            this.filterManufacturerQuery = {
-                customerId: customerId,
-                companyName: "",
-                creditCode: "",
-                placeArea: "",
-                page: 1,
-                auditStatus: "22",
-                limit: 10,
-            };
-            this.manufacturerList = [];
-            this.getManufacturerList();
-        },
-        hideSearch1() {
-          this.showSearch1 = !this.showSearch1;
-        },
-        onManufacturerSubmit() {
-            this.manufacturerList = [];
-            this.getManufacturerList();
-        },
-        getManufacturerList() {
-            this.manufacturerLoading = true;
-            getCompanyList(this.filterManufacturerQuery)
-                .then((response) => {
-                    this.manufacturerLoading = false;
-                    this.manufacturerList = response.data.list || [];
-                    this.manufacturerTotal = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.manufacturerLoading = false;
-                    this.manufacturerList = [];
-                    this.manufacturerTotal = 0;
-                });
-        },
-        addInfoDialog(row) {
-
-            if (row.auditStatus == 6 || row.auditStatus == 3) {
-                this.editManufacturerType = 2;
-                this.formManufacturerName = 2;
-            } else {
-                this.editManufacturerType = 1;
-                this.formManufacturerName = 1;
-            }
-            this.enterpriseId = row.id;
-            this.inputManufacturerQuery = row;
-            this.addInfoVisible = true;
-        },
-        closeManufacturerDialog(type) {
-            this.addInfoVisible = false;
-            this.enterpriseId = null;
-            this.manufacturerList = [];
-            this.getManufacturerList();
-
-        },
-        handleManuChange(val) {
-            this.filterManufacturerQuery.page = val.page;
-            this.getManufacturerList();
-        },
-
-        supManufacturerClick(row) {
-            this.registrationQuery.customerId = row.customerId;
-            this.registrationQuery.manufacturerIdFk = row.manufacturerId;
-            this.onReset2();
-        },
-
-
-        /**-------------------------配送产品资质--------------------------*/
-        onReset2() {
-
-            let customerId = this.registrationQuery.customerId;
-            let manufacturerIdFk = this.registrationQuery.manufacturerIdFk;
-
-            this.registrationQuery = {
-                customerId: customerId,
-                manufacturerIdFk: manufacturerIdFk,
-                recordProductName: "",
-                recordCode: "",
-                recordPeopleName: "",
-                auditStatus: "22",
-                page: 1,
-                limit: 10
-            };
-            this.getRegistrationList();
-        },
-        onSubmit2() {
-            this.getRegistrationList();
-        },
-        hideSearch2() {
-          this.showSearch2 = !this.showSearch2;
-        },
-        registrationDialog(row) {
-            if (row.auditStatus == 6 || row.auditStatus == 3) {
-                this.formProductName = 2;
-                this.editProductType = 2;
-            } else {
-                this.editProductType = 1;
-                this.formProductName = 1;
-            }
-            this.registrationId = row.id;
-            this.inputProudtQuery = row;
-            this.registrationVisible = true;
-        },
-        closeProductDialog() {
-            this.registrationVisible = false;
-            this.enterpriseId = null;
-            this.registrationId = null;
-            this.registrationList = [];
-            this.getRegistrationList();
-        },
-        getRegistrationList() {
-            this.registrationLoading = true;
-            getRegistrationList(this.registrationQuery)
-                .then((response) => {
-                    this.registrationLoading = false;
-                    this.registrationList = response.data.list || [];
-                    this.certTotal = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.registrationLoading = false;
-                    this.registrationList = [];
-                    this.certTotal = 0;
-                });
-        },
-        certHandleCurrentChange(val) {
-            this.registrationQuery.page = val.page;
-            this.getRegistrationList();
-        },
-        printSupCertPdf(row) {
-            let query = {id: 1};
-            this.loading = true;
-            verifyTemplateFile(query).then((res) => {
-                if (res.code === 20000) {
-                    //查询全部详情id
-                    var supCertQuery={
-                        customerId:row.customerId,
-                        type:1
-                    };
-                    filterCompanyCertIdList(supCertQuery).then((req) => {
-                        if(req.code===20000){
-                            let printParams = {
-                                templateId: res.data,
-                                ids: req.data,
-                                customerId: row.customerId
-                            };
-                            printSupCert(printParams).then((response) => {
-                                //将pdf文件转换为url。
-                                const binaryData = [];
-                                binaryData.push(response);
-                                //获取blob链接。
-                                let url = window.URL.createObjectURL(
-                                    new Blob(binaryData, {type: "application/pdf"})
-                                );
-                                this.loading = false;
-                                window.open(url);//打开新标签页，预览pdf。
-                            })
-                        }
-                    })
-                } else {
-                    this.loading = false;
-                    this.$message.error(res.message);
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.$message.error(error.message);
-            })
-        },
-        //生产企业打印
-        printSupCertManufacturerPdf(row) {
-            let query = {id: 2};
-            this.loading = true;
-            verifyTemplateFile(query).then((res) => {
-                if (res.code === 20000) {
-                    //查询全部详情id
-                    var supCertQuery={
-                        customerId:row.customerId,
-                        manufacturerIdFk:row.manufacturerId,
-                        type:2
-                    };
-                    filterCompanyCertIdList(supCertQuery).then((req) => {
-                        if(req.code===20000){
-                            let printParams = {
-                                templateId: res.data,
-                                ids: req.data,
-                                id: row.id
-                            };
-                            printSupCertManufacturer(printParams).then((response) => {
-                                //将pdf文件转换为url。
-                                const binaryData = [];
-                                binaryData.push(response);
-                                //获取blob链接。
-                                let url = window.URL.createObjectURL(
-                                    new Blob(binaryData, {type: "application/pdf"})
-                                );
-                                this.loading = false;
-                                window.open(url);//打开新标签页，预览pdf。
-                            })
-                        }
-                    })
-                } else {
-                    this.loading = false;
-                    this.$message.error(res.message);
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.$message.error(error.message);
-            })
-        },
-        //生产产品打印
-        printSupCertProductionPdf(row) {
-
-            let query = {id: 3};
-            this.loading = true;
-            verifyTemplateFile(query).then((res) => {
-                if (res.code === 20000) {
-                    //查询全部详情id
-                    var supCertQuery={
-                        customerId:row.customerId,
-                        manufacturerIdFk:row.manufacturerIdFk,
-                        productIdFk:row.productId,
-                        type:3
-                    };
-                    filterCompanyCertIdList(supCertQuery).then((req) => {
-                        if(req.code===20000){
-                            let printParams = {
-                                templateId: res.data,
-                                ids: req.data,
-                                id: row.id
-                            };
-                            printSupCertProduction(printParams).then((response) => {
-                                //将pdf文件转换为url。
-                                const binaryData = [];
-                                binaryData.push(response);
-                                //获取blob链接。
-                                let url = window.URL.createObjectURL(
-                                    new Blob(binaryData, {type: "application/pdf"})
-                                );
-                                this.loading = false;
-                                window.open(url);//打开新标签页，预览pdf。
-                            })
-                        }
-                    })
-                } else {
-                    this.loading = false;
-                    this.$message.error(res.message);
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.$message.error(error.message);
-            })
-        },
+          });
+        })
+        .catch(() => {
+        });
+    },
+    closeDialog() {
+      this.supCompanyVisible = false;
     },
 
-    components: {
-        supCompanyEditAdudit, supManufacturerAuditDialog, suppliersRegistrationBasic
-    }
-    ,
+    supCompanyClick(row) {
+      this.filterManufacturerQuery.customerId = row.customerId;
+      this.onManufacturerReset();
+    },
+
+
+    /**-------------------------生产企业资质--------------------------*/
+    onManufacturerReset() {
+      let customerId = this.filterManufacturerQuery.customerId;
+      this.filterManufacturerQuery = {
+        customerId: customerId,
+        companyName: "",
+        creditCode: "",
+        placeArea: "",
+        page: 1,
+        auditStatus: "22",
+        limit: 10,
+      };
+      this.manufacturerList = [];
+      this.getManufacturerList();
+    },
+    hideSearch1() {
+      this.showSearch1 = !this.showSearch1;
+    },
+    onManufacturerSubmit() {
+      this.manufacturerList = [];
+      this.getManufacturerList();
+    },
+    getManufacturerList() {
+      this.manufacturerLoading = true;
+      getCompanyList(this.filterManufacturerQuery)
+        .then((response) => {
+          this.manufacturerLoading = false;
+          this.manufacturerList = response.data.list || [];
+          this.manufacturerTotal = response.data.total || 0;
+        })
+        .catch(() => {
+          this.manufacturerLoading = false;
+          this.manufacturerList = [];
+          this.manufacturerTotal = 0;
+        });
+    },
+    addInfoDialog(row) {
+
+      if (row.auditStatus == 6 || row.auditStatus == 3) {
+        this.editManufacturerType = 2;
+        this.formManufacturerName = 2;
+      } else {
+        this.editManufacturerType = 1;
+        this.formManufacturerName = 1;
+      }
+      this.enterpriseId = row.id;
+      this.inputManufacturerQuery = row;
+      this.addInfoVisible = true;
+    },
+    closeManufacturerDialog(type) {
+      this.addInfoVisible = false;
+      this.enterpriseId = null;
+      this.manufacturerList = [];
+      this.getManufacturerList();
 
-    mounted() {
     },
-    created() {
-        this.getList();
+    handleManuChange(val) {
+      this.filterManufacturerQuery.page = val.page;
+      this.getManufacturerList();
+    },
+
+    supManufacturerClick(row) {
+      this.registrationQuery.customerId = row.customerId;
+      this.registrationQuery.manufacturerIdFk = row.manufacturerId;
+      this.onReset2();
+    },
+
+
+    /**-------------------------配送产品资质--------------------------*/
+    onReset2() {
+
+      let customerId = this.registrationQuery.customerId;
+      let manufacturerIdFk = this.registrationQuery.manufacturerIdFk;
+
+      this.registrationQuery = {
+        customerId: customerId,
+        manufacturerIdFk: manufacturerIdFk,
+        recordProductName: "",
+        recordCode: "",
+        recordPeopleName: "",
+        auditStatus: "22",
+        page: 1,
+        limit: 10
+      };
+      this.getRegistrationList();
+    },
+    onSubmit2() {
+      this.getRegistrationList();
+    },
+    hideSearch2() {
+      this.showSearch2 = !this.showSearch2;
+    },
+    registrationDialog(row) {
+      if (row.auditStatus == 6 || row.auditStatus == 3) {
+        this.formProductName = 2;
+        this.editProductType = 2;
+      } else {
+        this.editProductType = 1;
+        this.formProductName = 1;
+      }
+      this.registrationId = row.id;
+      this.inputProudtQuery = row;
+      this.registrationVisible = true;
+    },
+    closeProductDialog() {
+      this.registrationVisible = false;
+      this.enterpriseId = null;
+      this.registrationId = null;
+      this.registrationList = [];
+      this.getRegistrationList();
+    },
+    getRegistrationList() {
+      this.registrationLoading = true;
+      getRegistrationList(this.registrationQuery)
+        .then((response) => {
+          this.registrationLoading = false;
+          this.registrationList = response.data.list || [];
+          this.certTotal = response.data.total || 0;
+        })
+        .catch(() => {
+          this.registrationLoading = false;
+          this.registrationList = [];
+          this.certTotal = 0;
+        });
+    },
+    certHandleCurrentChange(val) {
+      this.registrationQuery.page = val.page;
+      this.getRegistrationList();
+    },
+    printSupCertPdf(row) {
+      let query = {id: 1};
+      this.loading = true;
+      verifyTemplateFile(query).then((res) => {
+        if (res.code === 20000) {
+          //查询全部详情id
+          var supCertQuery = {
+            customerId: row.customerId,
+            type: 1
+          };
+          filterCompanyCertIdList(supCertQuery).then((req) => {
+            if (req.code === 20000) {
+              let printParams = {
+                templateId: res.data,
+                ids: req.data,
+                customerId: row.customerId
+              };
+              printSupCert(printParams).then((response) => {
+                //将pdf文件转换为url。
+                const binaryData = [];
+                binaryData.push(response);
+                //获取blob链接。
+                let url = window.URL.createObjectURL(
+                  new Blob(binaryData, {type: "application/pdf"})
+                );
+                this.loading = false;
+                window.open(url);//打开新标签页，预览pdf。
+              })
+            }
+          })
+        } else {
+          this.loading = false;
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.loading = false;
+        this.$message.error(error.message);
+      })
+    },
+    //生产企业打印
+    printSupCertManufacturerPdf(row) {
+      let query = {id: 2};
+      this.loading = true;
+      verifyTemplateFile(query).then((res) => {
+        if (res.code === 20000) {
+          //查询全部详情id
+          var supCertQuery = {
+            customerId: row.customerId,
+            manufacturerIdFk: row.manufacturerId,
+            type: 2
+          };
+          filterCompanyCertIdList(supCertQuery).then((req) => {
+            if (req.code === 20000) {
+              let printParams = {
+                templateId: res.data,
+                ids: req.data,
+                id: row.id
+              };
+              printSupCertManufacturer(printParams).then((response) => {
+                //将pdf文件转换为url。
+                const binaryData = [];
+                binaryData.push(response);
+                //获取blob链接。
+                let url = window.URL.createObjectURL(
+                  new Blob(binaryData, {type: "application/pdf"})
+                );
+                this.loading = false;
+                window.open(url);//打开新标签页，预览pdf。
+              })
+            }
+          })
+        } else {
+          this.loading = false;
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.loading = false;
+        this.$message.error(error.message);
+      })
+    },
+    //生产产品打印
+    printSupCertProductionPdf(row) {
+
+      let query = {id: 3};
+      this.loading = true;
+      verifyTemplateFile(query).then((res) => {
+        if (res.code === 20000) {
+          //查询全部详情id
+          var supCertQuery = {
+            customerId: row.customerId,
+            manufacturerIdFk: row.manufacturerIdFk,
+            productIdFk: row.productId,
+            type: 3
+          };
+          filterCompanyCertIdList(supCertQuery).then((req) => {
+            if (req.code === 20000) {
+              let printParams = {
+                templateId: res.data,
+                ids: req.data,
+                id: row.id
+              };
+              printSupCertProduction(printParams).then((response) => {
+                //将pdf文件转换为url。
+                const binaryData = [];
+                binaryData.push(response);
+                //获取blob链接。
+                let url = window.URL.createObjectURL(
+                  new Blob(binaryData, {type: "application/pdf"})
+                );
+                this.loading = false;
+                window.open(url);//打开新标签页，预览pdf。
+              })
+            }
+          })
+        } else {
+          this.loading = false;
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.loading = false;
+        this.$message.error(error.message);
+      })
     },
+  },
+
+  components: {
+    supCompanyEditAdudit, supManufacturerAuditDialog, suppliersRegistrationBasic
+  }
+  ,
+
+  mounted() {
+  },
+  created() {
+    this.getList();
+  },
 };
 </script>
diff --git a/src/views/purchase/cert/supCertificationAdd.vue b/src/views/purchase/cert/supCertificationAdd.vue
index bb193f4e..f7d5d1ed 100644
--- a/src/views/purchase/cert/supCertificationAdd.vue
+++ b/src/views/purchase/cert/supCertificationAdd.vue
@@ -146,6 +146,11 @@
                 highlight-current-row>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
         <el-table-column label="注册/备案产品名称" prop="recordProductName" show-overflow-tooltip></el-table-column>
+        <el-table-column
+          label="规格型号"
+          prop="ggxh"
+          show-overflow-tooltip
+        ></el-table-column>
         <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>
@@ -332,7 +337,7 @@ export default {
       this.filterQuery.page = 1
       this.getList();
       this.registrationList = [];
-      this.currentManufacturer=null;
+      this.currentManufacturer = null;
     },
     toViewRegistrationCert(row, num) {
       let path = num === 1 ? row.filePath : row.instructions;
diff --git a/src/views/system/param/busTypePre.vue b/src/views/system/param/busTypePre.vue
index a6ffdf7e..2b93f04d 100644
--- a/src/views/system/param/busTypePre.vue
+++ b/src/views/system/param/busTypePre.vue
@@ -234,11 +234,11 @@ export default {
         this.$message.error("补单方式不能为空！")
         return;
       }
-      if (this.inputQuery.beforeTime < 0){
+      if (this.inputQuery.beforeTime < 0) {
         this.$message.error("生成出入库单时间间隔不能为负数！")
         return;
       }
-      if (this.inputQuery.busBeforeTime < 0){
+      if (this.inputQuery.busBeforeTime < 0) {
         this.$message.error("生成业务单时间间隔不能为负数！")
         return;
       }
diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue
index e19e04f7..72a7ff5c 100644
--- a/src/views/system/param/busTypePreModify.vue
+++ b/src/views/system/param/busTypePreModify.vue
@@ -99,6 +99,7 @@
               <el-option label="向上级仓库补单" :value="2"></el-option>
               <el-option label="预验收转入库补单" :value="3"></el-option>
               <el-option label="寄售转入库补单" :value="4"></el-option>
+              <el-option label="退货补单" :value="5"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -116,6 +117,22 @@
 
           </el-form-item>
         </el-col>
+
+        <el-col :span="11">
+          <el-form-item label="默认补单仓库" prop="defaultInvCode">
+            <el-select v-model="inputQuery.defaultInvCode" placeholder="默认补单仓库" clearable size="small"
+                       @change="invChange"
+                       style="width: 90%">
+              <el-option
+                v-for="item in fromInvs"
+                :key="item.name"
+                :label="item.name"
+                :value="item.code">
+                <span style="float: left"> {{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-divider content-position="left">生成业务单</el-divider>
       <el-row>
@@ -174,7 +191,7 @@
 <script>
 
 import {findChangeOrigin, findChangeTarget, getBusTypeList, getBusTypeListByUser} from "@/api/basic/busType";
-import {filterSubAll, findByFrom} from "@/api/system/invSubWarehouse";
+import {filterSubAll, findByFrom, getInvWarehouseList} from "@/api/system/invSubWarehouse";
 import {isBlank} from "@/utils/strUtil";
 import {getBusTypeChangeList} from "@/api/basic/busTypeChange";
 
@@ -263,7 +280,8 @@ export default {
 
     getTargetBusType() {
       let query = {
-        enable: true
+        enable: true,
+        invCode: this.inputQuery.defaultInvCode,
       };
       findChangeTarget(query).then((res) => {
         if (res.code === 20000) {
@@ -295,10 +313,10 @@ export default {
 
     getFromInv() {
       let params = {
-        locInvCode: this.inputQuery.invCode,
-        filter: 2
+        // locInvCode: this.inputQuery.invCode,
+        // filter: 2
       };
-      findByFrom(params).then((res) => {
+      getInvWarehouseList(params).then((res) => {
         if (res.code === 20000) {
           this.fromInvs = res.data;
         }
@@ -306,16 +324,10 @@ export default {
     },
 
     invChange() {
-      if (!isBlank(this.inputQuery.invCode)) {
-        this.getFromInv();
-
-      } else {
-        this.inputQuery.action = null;
-        this.targetTypes = [];
-      }
+      this.targetTypes = [];
+      this.getTargetBusType()
     },
   },
-
   created() {
     if (this.inputQuery.originAction == null) {
       this.isAdd = true;