diff --git a/src/icons/svg/PurchaseSituationSearch.svg b/src/icons/svg/PurchaseSituationSearch.svg
new file mode 100644
index 00000000..a0560fb7
--- /dev/null
+++ b/src/icons/svg/PurchaseSituationSearch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1552869793988" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="597" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M798 63.82H226.2a67.55 67.55 0 0 0-67.55 67.55V892a67.55 67.55 0 0 0 67.55 67.55H798A67.55 67.55 0 0 0 865.55 892V131.37A67.55 67.55 0 0 0 798 63.82z m10.16 811.85a26.49 26.49 0 0 1-26.49 26.49H242.54A26.49 26.49 0 0 1 216 875.67v-728a26.49 26.49 0 0 1 26.49-26.49h539.17a26.49 26.49 0 0 1 26.49 26.49z" p-id="598"></path><path d="M347.15 717.73m-35.35 0a35.35 35.35 0 1 0 70.7 0 35.35 35.35 0 1 0-70.7 0Z" p-id="599"></path><path d="M429.62 689.04l282.77 0 0 57.39-282.77 0 0-57.39Z" p-id="600"></path><path d="M683.7 298.17H458.32a28.7 28.7 0 1 0 0 57.39H683.7a28.7 28.7 0 0 0 0-57.39zM336.49 347.89a4.48 4.48 0 0 0 3.51 1.31 4.42 4.42 0 0 0 3.51-1.31L378.14 313a4.56 4.56 0 0 0 0-6.45c-1.71-1.73-4.69-1.73-7.85 0l-31.74 32-12.47-14a4.61 4.61 0 0 0-6.4 0 4.55 4.55 0 0 0 0 6.45z" p-id="601"></path><path d="M395.27 270.3H299a8.83 8.83 0 0 0-8.83 8.83v96.25a8.83 8.83 0 0 0 8.83 8.82h96.25a8.83 8.83 0 0 0 8.83-8.83v-96.24a8.83 8.83 0 0 0-8.81-8.83z m-8.83 96.25h-78.58V288h78.59z" p-id="602"></path><path d="M429.62 493.6l282.77 0 0 57.39-282.77 0 0-57.39Z" p-id="603"></path><path d="M336.49 542.93a4.48 4.48 0 0 0 3.52 1.31 4.42 4.42 0 0 0 3.51-1.31l34.62-34.85a4.56 4.56 0 0 0 0-6.45c-1.71-1.73-4.69-1.73-7.85 0l-31.74 32-12.47-14a4.61 4.61 0 0 0-6.4 0 4.55 4.55 0 0 0 0 6.45z" p-id="604"></path><path d="M395.27 465.35H299a8.83 8.83 0 0 0-8.83 8.83v96.25a8.83 8.83 0 0 0 8.83 8.83h96.25a8.83 8.83 0 0 0 8.83-8.83v-96.25a8.83 8.83 0 0 0-8.81-8.83z m-8.83 96.25h-78.58V483h78.59z" p-id="605"></path></svg>
\ No newline at end of file
diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue
index 17957901..0ec32336 100644
--- a/src/views/Inventory/PickingList/index.vue
+++ b/src/views/Inventory/PickingList/index.vue
@@ -8,26 +8,15 @@
     </el-card>
 
     <el-card>
-      <el-table
-        v-loading="listLoading2"
-        :data="tableData1"
-        border
-        style="width: 100%;"
-        size="mini"
-        height="200"
-        @row-click = "chooseListinfor">
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-          width="50"/>
+      <el-table v-loading="listLoading2" :data="tableData1" border style="width: 100%;" size="mini" height="300" @row-click="chooseListinfor">
+        <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="领料单编号" align="center" min-width="200">
           <template slot-scope="scope">
             {{ scope.row.领料单编号 }}
           </template>
         </el-table-column>
         <el-table-column label="领料时间" align="center" min-width="200" >
-          <template slot-scope="scope" value-format="yyyy-MM-dd">
+          <template slot-scope="scope">
             {{ scope.row.领料时间 }}
           </template>
         </el-table-column>
@@ -36,13 +25,13 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="200px">
+        <el-table-column label="操作" align="center" width="100px">
           <template slot-scope="scope" align="center">
             <el-button size="mini" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropListinfor(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px;">
+      <div class="block" style="margin: 10px 0;">
         <el-pagination
           :current-page="PageCurrent2"
           :page-sizes="[10, 20, 30, 40]"
@@ -52,18 +41,8 @@
           @size-change="handleSizeChange2"
           @current-change="handleCurrentChange2"/>
       </div>
-      <el-table
-        v-loading="listLoading3"
-        :data="tableDataPicking"
-        border
-        style="width: 100%;"
-        size="mini"
-        height="200">
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-          width="50"/>
+      <el-table v-loading="listLoading3" :data="tableDataPicking" border style="width: 100%;" size="mini" height="300">
+        <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.名称 }}
@@ -79,22 +58,22 @@
             {{ scope.row.物料规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="项目名称" align="center" min-width="130">
+        <el-table-column label="项目名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床图号" align="center" min-width="130">
+        <el-table-column label="机床图号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="组号" align="center" min-width="130">
+        <el-table-column label="组号" align="center" min-width="70">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="领用数量" align="center" min-width="50">
+        <el-table-column label="领用数量" align="center" min-width="70">
           <template slot-scope="scope">
             {{ scope.row.出库数量 }}
           </template>
@@ -114,10 +93,10 @@
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="200">
+        <el-table-column label="操作" align="center" width="200">
           <template slot-scope="scope">
-            <el-button :disabled="scope.row.是否出库" size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 10px 10px" @click="editListDetailx(scope.row)">编辑</el-button>
-            <el-button :disabled="scope.row.是否出库" size="mini" type="danger" icon="el-icon-delete" style="margin: 0 0 10px 10px" @click="dropListdetail(scope.row)">删除</el-button>
+            <el-button :disabled="scope.row.是否出库" size="mini" type="primary" icon="el-icon-edit" @click="editListDetailx(scope.row)">编辑</el-button>
+            <el-button :disabled="scope.row.是否出库" size="mini" type="danger" icon="el-icon-delete" @click="dropListdetail(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -148,22 +127,12 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchPartinfo()">查询</el-button><br>
+      <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchPartinfo()">查询</el-button>
     </el-card>
 
     <el-card>
-      <el-table
-        v-loading="listLoading"
-        :data="tableDataBasic"
-        border
-        style="width: 100%;"
-        size="mini"
-        height="200">
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-          width="50"/>
+      <el-table v-loading="listLoading" :data="tableDataBasic" border style="width: 100%;" size="mini" height="440">
+        <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="项目名称" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -174,7 +143,7 @@
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="组号" align="center" min-width="80">
+        <el-table-column label="组号" align="center" width="70">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
@@ -184,17 +153,17 @@
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="计划数量" align="center" min-width="40">
+        <el-table-column label="计划数量" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.批次数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="库存数量" align="center" min-width="40">
+        <el-table-column label="库存数量" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.可出库数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="待出库数量" align="center" min-width="40">
+        <el-table-column label="待出库数量" align="center" width="90">
           <template slot-scope="scope">
             {{ scope.row.待出库数量 }}
           </template>
@@ -214,18 +183,18 @@
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件类型" align="center" min-width="80">
+        <el-table-column label="零件类型" align="center" width="80">
           <template slot-scope="scope" align="center">
             {{ scope.row.零件类型名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="80">
+        <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope" align="center">
             <el-button :disabled="scope.row.是否禁用" size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="addBasicListDetailinfor(scope.row)">领料</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px;">
+      <div class="block" style="margin: 10px 0;">
         <el-pagination
           :current-page="PageCurrent"
           :page-sizes="[10, 20, 30, 40]"
@@ -235,34 +204,24 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"/>
       </div>
-      <el-table
-        v-loading="listLoading1"
-        :data="tableDataPurchase"
-        border
-        style="width: 100%;"
-        size="mini"
-        height="200">
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-          width="50"/>
+      <el-table v-loading="listLoading1" :data="tableDataPurchase" border style="width: 100%;" size="mini" height="440">
+        <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="名称" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料规格" align="center" min-width="80">
+        <el-table-column label="物料规格" align="center" min-width="120">
           <template slot-scope="scope">
             {{ scope.row.物料规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料型号" align="center" min-width="80">
+        <el-table-column label="物料型号" align="center" min-width="120">
           <template slot-scope="scope">
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" align="center" min-width="80">
+        <el-table-column label="零件图号" align="center" min-width="120">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
@@ -277,22 +236,22 @@
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="组号" align="center" min-width="80">
+        <el-table-column label="组号" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="合同数量" align="center" min-width="80">
+        <el-table-column label="合同数量" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件数量" align="center" min-width="80">
+        <el-table-column label="零件数量" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.货位存量 }}
           </template>
         </el-table-column>
-        <el-table-column label="待出库数量" align="center" min-width="80">
+        <el-table-column label="待出库数量" align="center" width="90">
           <template slot-scope="scope">
             {{ scope.row.待出库数量 }}
           </template>
@@ -302,18 +261,18 @@
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件类型" align="center" min-width="80">
+        <el-table-column label="零件类型" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.类型名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="80">
+        <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope" align="center">
-            <el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="addListDetailinfor(scope.row)">领料</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-edit" @click="addListDetailinfor(scope.row)">领料</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px;">
+      <div class="block" style="margin: 10px 0;">
         <el-pagination
           :current-page="PageCurrent1"
           :page-sizes="[10, 20, 30, 40]"
@@ -323,18 +282,8 @@
           @size-change="handleSizeChange1"
           @current-change="handleCurrentChange1"/>
       </div>
-      <el-table
-        v-loading="listLoadingx"
-        :data="tableDataHouse"
-        border
-        size="mini"
-        style="width: 100%;"
-        height="200">
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-          width="50"/>
+      <el-table v-loading="listLoadingx" :data="tableDataHouse" border size="mini" style="width: 100%;" height="440">
+        <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="名称" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
@@ -360,38 +309,38 @@
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="组号" align="center" min-width="80">
+        <el-table-column label="组号" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="合同数量" align="center" min-width="80">
+        <el-table-column label="合同数量" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.零件数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件数量" align="center" min-width="80">
+        <el-table-column label="零件数量" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.货位存量 }}
           </template>
         </el-table-column>
-        <el-table-column label="待出库数量" align="center" min-width="80">
+        <el-table-column label="待出库数量" align="center" width="90">
           <template slot-scope="scope">
             {{ scope.row.待出库数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件类型" align="center" min-width="80">
+        <el-table-column label="零件类型" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.类型名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="80">
+        <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope" align="center">
             <el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="addWorkshopDetailinfor(scope.row)">领料</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px;">
+      <div class="block" style="margin: 10px 0;">
         <el-pagination
           :current-page="PageCurrentx"
           :page-sizes="[10, 20, 30, 40]"
@@ -612,6 +561,7 @@ export default {
   created() {
     this.fetchData()
     this.getpeopleid()
+    this.searchListinfor()
   },
   methods: {
     fetchData() {
@@ -772,13 +722,21 @@ export default {
     },
     // 增加领料单
     addListinfor() {
-      addList(this.picikingPeople).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('增加成功')
-          this.searchListinfor()
-        } else {
-          this.$message.error('增加失败')
-        }
+      this.$confirm('确认创建新的领料单?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        addList(this.picikingPeople).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('增加成功')
+            this.searchListinfor()
+          } else {
+            this.$message.error('增加失败')
+          }
+        })
+      }).catch(() => {
+        this.$message('已取消操作')
       })
     },
     // 删除领料单
@@ -1035,5 +993,16 @@ export default {
 </script>
 
 <style scoped>
-
+  .el-card{
+    margin-bottom: 15px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  span{
+    margin: 10px 0 10px 10px;
+  }
 </style>
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index 8aa07dd5..179ec660 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -210,6 +210,7 @@ export default {
   },
   created() {
     this.fetchData()
+    this.searchTable()
   },
   methods: {
     fetchData() {
@@ -267,7 +268,6 @@ export default {
       this.searchTable2()
     },
     searchTable1() { // 查询标准件和外购件
-      this.total1 = 0
       let check1, check2
       this.machineNumberValue ? check1 = 1 : check1 = 0
       this.groupNumberValue ? check2 = 1 : check2 = 0
@@ -277,7 +277,6 @@ export default {
       })
     },
     searchTable2() { // 查询基本件
-      this.total2 = 0
       let check1, check2
       this.machineNumberValue ? check1 = 1 : check1 = 0
       this.groupNumberValue ? check2 = 1 : check2 = 0