diff --git a/src/api/WorkshopProcurement/ArrivalStateSearch.js b/src/api/WorkshopProcurement/ArrivalStateSearch.js
index 29211ee2..0f211745 100644
--- a/src/api/WorkshopProcurement/ArrivalStateSearch.js
+++ b/src/api/WorkshopProcurement/ArrivalStateSearch.js
@@ -16,7 +16,7 @@ export function initArrivalStateContact() {
   })
 }
 // 查询到货情况
-export function searchArrivalState(num) {
+export function searchArrivalState(check1, num1, check2, num2, num3, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
@@ -25,7 +25,8 @@ export function searchArrivalState(num) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间管理_到货情况_查询数据_新_成组采购',
-      param: `采购合同流水号=${num}`
+      param: `零件名_check=${check1}&零件名=${num1}&采购时间_check=${check2}&采购开始时间=${num2}&采购结束时间=${num3}`,
+      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
diff --git a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue b/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue
index 47939403..5b52da8a 100644
--- a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue
+++ b/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue
@@ -1,19 +1,32 @@
 <template>
   <div class="app-container">
     <el-card>
-      <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable @change="searchTable">
-        <el-option
-          v-for="item in contractNum"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-          <div style="float: left">{{ item.label }}</div>
-        </el-option>
-      </el-select>
+      <!--<el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable @change="searchTable">-->
+      <!--<el-option-->
+      <!--v-for="item in contractNum"-->
+      <!--:key="item.value"-->
+      <!--:label="item.label"-->
+      <!--:value="item.value">-->
+      <!--<div style="float: left">{{ item.label }}</div>-->
+      <!--</el-option>-->
+      <!--</el-select>-->
+      <el-input v-model="billNames" clearable filterable size="small" placeholder="合同号零件名称图号或型号" style="width: 200px;margin: 5px"/>
+      <el-date-picker
+        v-model="dateRange"
+        size="small"
+        type="daterange"
+        align="center"
+        style="width: 300px"
+        value-format="yyyy-MM-dd"
+        format="yyyy-MM-dd"
+        range-separator="～"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
+      <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=50;searchTable()">查询</el-button>
     </el-card>
 
     <el-card>
-      <el-table v-loading="" :data="tableData" stripe border style="width: 980px;margin-top: 10px" height="600px" size="mini">
+      <el-table v-loading="loading1" :data="tableData" stripe border style="width: 980px;margin-top: 10px" height="600px" size="mini">
         <el-table-column label="采购合同编号" align="center" width="140">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
@@ -55,6 +68,17 @@
           </template>
         </el-table-column>
       </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="pageCurrent1"
+          :page-sizes="[50, 100, 150, 200]"
+          :page-size="pageSize1"
+          :total="total1"
+          style="display:inline-block;width:50%"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange1"
+          @current-change="handleCurrentChange1"/>
+      </div>
     </el-card>
   </div>
 </template>
@@ -64,16 +88,17 @@ import { initArrivalStateContact, searchArrivalState } from '@/api/WorkshopProcu
 import { mapGetters } from 'vuex'
 
 export default {
-  name: '', // 项目总价查询
   data() {
     return {
-      check1: 0,
-      contractNumValue: '',
+      billNames: '',
+      dateRange: '', // 日期
+      contractNumValue: '', // 已屏蔽下拉框
       contractNum: [],
-      supplierName: '',
       tableData: [],
-      arrival: [],
-      judge: []
+      total1: 0,
+      pageCurrent1: 1,
+      pageSize1: 50,
+      loading1: false
     }
   },
   computed: {
@@ -85,7 +110,7 @@ export default {
     ])
   },
   created() {
-    this.fetchData()
+    // this.fetchData()
   },
   methods: {
     fetchData() {
@@ -99,34 +124,35 @@ export default {
       })
     },
     searchTable() {
-      searchArrivalState(this.contractNumValue).then(response => {
+      this.loading1 = true
+      var check1, check2
+      this.billNames ? check1 = 1 : check1 = 0
+      this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
+      searchArrivalState(check1, this.billNames, check2, this.dateRange[0], this.dateRange[1], this.pageCurrent1, this.pageSize1).then(response => {
         console.log(response.data)
-        for (let i = 0; i < response.data.length; i++) {
-          if (response.data[i].物料型号 === '' || response.data[i].物料型号 === null) {
-            response.data[i].物料型号 = response.data[i].零件图号
+        for (let i = 0; i < response.data.rows.length; i++) {
+          if (!response.data.rows[i].物料型号) {
+            response.data.rows[i].物料型号 = response.data.rows[i].零件图号
           }
         }
-        this.tableData = response.data
+        this.tableData = response.data.rows
+        this.total1 = response.data.total
+        this.loading1 = false
       })
+    },
+    handleSizeChange1(val) {
+      this.pageCurrent1 = 1
+      this.pageSize1 = val
+      this.searchTable()
+    },
+    handleCurrentChange1(val) {
+      this.pageCurrent1 = val
+      this.searchTable()
     }
   }
 }
 </script>
 
 <style scoped>
-  .el-select{
-    width:200px
-  }
-  .el-input{
-    width:200px
-  }
-  span{
-    margin: 10px 0 10px 10px;
-  }
-  .searchForm .el-form-item{
-    margin-bottom: 5px;
-  }
-  .el-tag{
-    margin: 0
-  }
+
 </style>