diff --git a/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue b/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue
index aba31b9..225bc94 100644
--- a/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue
+++ b/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue
@@ -27,6 +27,14 @@
             <el-input v-model="formobj.warehouseCode" placeholder="仓库编码" class="item_input" clearable
               oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
           </div>
+          <div class="item">
+            <span class="item_text"><span class="must">*</span> 仓库类型：</span>
+            <el-select v-model="formobj.warehouseTypeValue" placeholder="请选择仓库类型" class="item_input"
+              @change="selectWarehouseTypeChange">
+              <el-option v-for="item in warehouseTypeList" :key="item.dictKey" :label="item.dictValue"
+                :value="item.dictKey" />
+            </el-select>
+          </div>
           <div class="item">
             <span class="item_text">仓库联系人：</span>
             <el-input v-model="formobj.contacts" placeholder="仓库联系人" class="item_input" clearable />
@@ -100,6 +108,9 @@
 
 <script>
   import req from '@/api/baseinfo/warehouse/warehouse.js'
+  import {
+    typeValues,
+  } from '@/api/Common/dictcommons.js'
   import divAdd from './warehouseAdd2.vue'
   export default {
     components: {
@@ -114,6 +125,8 @@
           sid: '',
           warehouseName: '',
           warehouseCode: '',
+          warehouseTypeKey: '',
+          warehouseTypeValue: '',
           contacts: "",
           mob: "",
           telephone: "",
@@ -133,6 +146,7 @@
           userSid: window.sessionStorage.getItem('userSid'),
           createOrgSid: window.sessionStorage.getItem('orgSid'),
         },
+        warehouseTypeList: []
       }
     },
     created() {},
@@ -140,6 +154,29 @@
 
     },
     methods: {
+      getDictValue() {
+
+        var params = {
+          type: "warehouse",
+          psid: '0'
+        }
+
+        typeValues(params).then(resp => {
+          console.log('>>>>>>>>>typeValues', resp)
+          this.warehouseTypeList = resp.data
+        }).catch(() => {})
+
+      },
+
+      selectWarehouseTypeChange(val) {
+
+        const choose = this.warehouseTypeList.filter((item) => item.dictKey == val)
+        console.log('>>>>>>>>>selectWarehouseTypeChange', choose)
+        this.formobj.warehouseTypeKey = choose[0].dictKey
+        this.formobj.warehouseTypeValue = choose[0].dictValue
+
+      },
+
       changeTheme(val) {
 
       },
@@ -164,6 +201,15 @@
           return
         }
 
+        if (this.formobj.warehouseTypeValue == '' || this.formobj.warehouseTypeKey == '') {
+          this.$message({
+            showClose: true,
+            type: 'warning',
+            message: '仓库类型不能为空'
+          })
+          return
+        }
+
         if (this.formobj.address == '') {
           this.$message({
             showClose: true,
@@ -208,6 +254,8 @@
           sid: '',
           warehouseName: '',
           warehouseCode: '',
+          warehouseTypeKey: '',
+          warehouseTypeValue: '',
           contacts: "",
           mob: "",
           telephone: "",
@@ -230,8 +278,11 @@
         this.submitdisabled = false
         this.$emit('doback')
       },
-      showAdd() {},
+      showAdd() {
+        this.getDictValue()
+      },
       showEdit(row) {
+        this.getDictValue()
         req.initWarehouse(row.sid)
           .then(resp => {
             if (resp.success) {
diff --git a/src/views/goods/goods/index.vue b/src/views/goods/goods/index.vue
index d1d088e..2ac97e6 100644
--- a/src/views/goods/goods/index.vue
+++ b/src/views/goods/goods/index.vue
@@ -12,6 +12,28 @@
               <el-form-item label="商品名称">
                 <el-input v-model="queryParams.params.name" placeholder="" clearable />
               </el-form-item>
+              <el-form-item label="商品条码">
+                <el-input v-model="queryParams.params.barCode" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="商品编码">
+                <el-input v-model="queryParams.params.goodsCode" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="商品品牌">
+                <el-select v-model="queryParams.params.brandName" placeholder="请选择品牌">
+                  <el-option v-for="item in brandList" :key="item.sid" :label="item.brandName" :value="item.sid" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="商品类别">
+                <el-select v-model="queryParams.params.goodsTypeName" placeholder="请选择类别">
+                  <el-option v-for="item in cateList" :key="item.sid" :label="item.goodsTypeName" :value="item.sid" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="商品厂家">
+                <el-select v-model="queryParams.params.manufacturerName" placeholder="请选择厂家">
+                  <el-option v-for="item in facturerList" :key="item.sid" :label="item.manufacturerName"
+                    :value="item.sid" />
+                </el-select>
+              </el-form-item>
 
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -106,6 +128,9 @@
 
 <script>
   import req from '@/api/goods/goods.js'
+  import req2 from '@/api/goods/brand.js'
+  import req3 from '@/api/goods/category.js'
+  import req4 from '@/api/goods/factory.js'
   import ButtonBar from '@/components/ButtonBar'
   import Pagination from '@/components/pagination'
   import pageye from '@/components/pagination/pageye'
@@ -179,11 +204,19 @@
           size: 10,
           total: 0,
           params: {
-            name: ''
+            name: '',
+            goodsCode: '',
+            barCode: '',
+            brandName: '',
+            goodsTypeName: '',
+            manufacturerName: ''
           }
         },
         sids: [],
-        selectionList: []
+        selectionList: [],
+        brandList: [],
+        cateList: [],
+        facturerList: []
       }
     },
     mounted() {
@@ -191,8 +224,23 @@
     },
     created() {
       this.loadList()
+      this.initData()
     },
     methods: {
+      initData() {
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('orgSid'),
+        }
+        req2.getAllBrand(parpams).then(resp => {
+          this.brandList = resp.data
+        })
+        req3.getAllType(parpams).then(resp => {
+          this.cateList = resp.data
+        })
+        req4.getAllFacturer(parpams).then(resp => {
+          this.facturerList = resp.data
+        })
+      },
       downLoad() {
         const loading = this.$loading({
           lock: true,
@@ -316,7 +364,12 @@
           size: 10,
           total: 0,
           params: {
-            name: ''
+            name: '',
+            goodsCode: '',
+            barCode: '',
+            brandName: '',
+            goodsTypeName: '',
+            manufacturerName: ''
           }
         }
         this.loadList()
diff --git a/src/views/purchase/purchaseReview/index.vue b/src/views/purchase/purchaseReview/index.vue
index f975c9d..d91ffd4 100644
--- a/src/views/purchase/purchaseReview/index.vue
+++ b/src/views/purchase/purchaseReview/index.vue
@@ -96,7 +96,7 @@
         <!-- End 项目列表头部 -->
         <!-- Start 项目列表 -->
         <div class="">
-          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
+          <el-table class="table" v-loading="tableLoading" :data="dataList" border style="width: 100%"
             @selection-change="selectionLineChangeHandle" @row-click="rowItemClick" show-summary
             :summary-method="getSummaries">
             <el-table-column fixed width="80" type="selection" align="center" />
@@ -135,7 +135,7 @@
         <div class="">
           <el-tabs v-model="activeName" type="border-card">
             <el-tab-pane name="first" label="采购明细">
-              <el-table :data="goodsDetailList" border style="width: 100%">
+              <el-table class="table" :data="goodsDetailList" border style="width: 100%">
                 <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
                 <el-table-column prop="goodsSkuTitle" label="商品名称" width="120" align="center" />
                 <el-table-column prop="goodsSkuCode" label="商品编码" width="120" align="center" />
@@ -339,6 +339,10 @@
           {
             dictKey: "2",
             dictValue: "已审核"
+          },
+          {
+            dictKey: "3",
+            dictValue: "审核未通过"
           }
         ]
 
@@ -837,4 +841,27 @@
     background: #1c88cf !important;
     color: #fff !important;
   }
+
+  /deep/ .table .el-table__footer-wrapper .el-table__footer tr td {
+    border: 0 !important;
+  }
+
+  /deep/ .table .el-table__fixed-footer-wrapper .el-table__footer tr td {
+    border: 0 !important;
+
+  }
+
+  /deep/ .table .el-table__fixed-footer-wrapper .el-table__cell {
+    padding: 0px;
+
+  }
+
+  /deep/.el-table__footer-wrapper tbody td.el-table__cell {
+    height: 30px !important;
+    padding: 0px;
+  }
+
+  /* /deep/.el-table .el-table__footer-wrapper .cell {
+    height: 30px !important;
+  } */
 </style>