diff --git a/src/api/PurchasingCenter/PurchaseSituationSearch.js b/src/api/PurchasingCenter/PurchaseSituationSearch.js
index b2fcf305..0445867b 100644
--- a/src/api/PurchasingCenter/PurchaseSituationSearch.js
+++ b/src/api/PurchasingCenter/PurchaseSituationSearch.js
@@ -31,7 +31,7 @@ export function searchTable1(...params) {
     data: {
       type: '1',
       name: '采购管理_采购部采购_查询物料_分配后_加供应商',
-      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}`,
+      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}&物料名称_check=${params[7]}&物料名称=${params[8]}&物料规格_check=${params[9]}&物料规格=${params[10]}&物料型号_check=${params[11]}&物料型号=${params[12]}`,
       Pagination: params[4] + '&' + params[5]
     }
   })
@@ -44,7 +44,7 @@ export function searchTable2(...params) {
     data: {
       type: '1',
       name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商',
-      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`,
+      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[6]}&零件名称=${params[7]}&零件规格_check=${params[8]}&零件规格=${params[9]}&零件图号_check=${params[10]}&零件图号=${params[11]}`,
       Pagination: params[4] + '&' + params[5]
     }
   })
diff --git a/src/utils/request.js b/src/utils/request.js
index 39e0294c..05ba122c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -26,65 +26,4 @@ const service = axios.create({
   timeout: 1500000 // 请求超时时间
 })
 
-// request拦截器
-// service.interceptors.request.use(
-//   config => {
-//     if (store.getters.token) {
-//       config.headers['X-Token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-//     }
-//     return config
-//   },
-//   error => {
-//     // Do something with request error
-//     console.log(error) // for debug
-//     Promise.reject(error)
-//   }
-// )
-
-// response 拦截器
-// service.interceptors.response.use(
-//   response => {
-//     /**
-//      * code为非20000是抛错 可结合自己业务进行修改
-//      */
-//     const res = response.data
-//     if (res.code !== 20000) {
-//       Message({
-//         message: res.message,
-//         type: 'error',
-//         duration: 5 * 1000
-//       })
-//
-//       // 50008:非法的token; 50012:其他客户端登录了;  50014:Token 过期了;
-//       if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
-//         MessageBox.confirm(
-//           '你已被登出，可以取消继续留在该页面，或者重新登录',
-//           '确定登出',
-//           {
-//             confirmButtonText: '重新登录',
-//             cancelButtonText: '取消',
-//             type: 'warning'
-//           }
-//         ).then(() => {
-//           store.dispatch('FedLogOut').then(() => {
-//             location.reload() // 为了重新实例化vue-router对象 避免bug
-//           })
-//         })
-//       }
-//       return Promise.reject('error')
-//     } else {
-//       return response.data
-//     }
-//   },
-//   error => {
-//     console.log('err' + error) // for debug
-//     Message({
-//       message: error.message,
-//       type: 'error',
-//       duration: 5 * 1000
-//     })
-//     return Promise.reject(error)
-//   }
-// )
-
 export default service
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index cc37de06..17ddc5c9 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -1,27 +1,37 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>机床编号:</span>
-      <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange">
-        <el-option
-          v-for="item in machineNumber"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-          <div style="float: left">{{ item.label }}</div>
-          <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
-        </el-option>
-      </el-select>
-      <span>组号:</span>
-      <el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable>
-        <el-option
-          v-for="item in groupNumber"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>
-      <el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 15px" @click="exportDetail()">导出</el-button>
+      <el-row>
+        <span>机床编号:</span>
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange">
+          <el-option
+            v-for="item in machineNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+          </el-option>
+        </el-select>
+        <span>组&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号:</span>
+        <el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable>
+          <el-option
+            v-for="item in groupNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>名&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;称:</span>
+        <el-input v-model="name" placeholder="名称" size="small" clearable style="width:200px"/>
+      </el-row>
+      <el-row style="margin-top:10px">
+        <span>规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格:</span>
+        <el-input v-model="spec" placeholder="规格" size="small" clearable style="width:200px"/>
+        <span>型&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号:</span>
+        <el-input v-model="model" placeholder="型号" size="small" clearable style="width:200px"/>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>
+        <el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 15px" @click="exportDetail()">导出</el-button>
+      </el-row>
     </el-card>
 
     <el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()">
@@ -305,6 +315,9 @@ export default {
   name: '', // 采购件采购查询
   data() {
     return {
+      name: '',
+      spec: '',
+      model: '',
       machineNumberValue: '',
       machineNumber: [],
       groupNumberValue: '',
@@ -486,28 +499,37 @@ export default {
       this.searchTable2()
     },
     searchTable0() { // 查询标准件
-      let check1, check2
+      let check1, check2, check3, check4, check5
       this.machineNumberValue ? check1 = 1 : check1 = 0
       this.groupNumberValue ? check2 = 1 : check2 = 0
-      searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1).then(response => {
+      this.name ? check3 = 1 : check3 = 0
+      this.spec ? check4 = 1 : check4 = 0
+      this.model ? check5 = 1 : check5 = 0
+      searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.name, check4, this.spec, check5, this.model).then(response => {
         this.tableData0 = response.data.rows
         this.total0 = response.data.total
       })
     },
     searchTable1() { // 查询外购件
-      let check1, check2
+      let check1, check2, check3, check4, check5
       this.machineNumberValue ? check1 = 1 : check1 = 0
       this.groupNumberValue ? check2 = 1 : check2 = 0
-      searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2).then(response => {
+      this.name ? check3 = 1 : check3 = 0
+      this.spec ? check4 = 1 : check4 = 0
+      this.model ? check5 = 1 : check5 = 0
+      searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.name, check4, this.spec, check5, this.model).then(response => {
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
       })
     },
     searchTable2() { // 查询基本件
-      let check1, check2
+      let check1, check2, check3, check4, check5
       this.machineNumberValue ? check1 = 1 : check1 = 0
       this.groupNumberValue ? check2 = 1 : check2 = 0
-      searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2).then(response => {
+      this.name ? check3 = 1 : check3 = 0
+      this.spec ? check4 = 1 : check4 = 0
+      this.model ? check5 = 1 : check5 = 0
+      searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, check3, this.name, check4, this.spec, check5, this.model).then(response => {
         this.tableData2 = response.data.rows
         this.total2 = response.data.total
       })