diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/api/PurchasingCenter/OfflineContract.js
index b0fee696..7b437320 100644
--- a/src/api/PurchasingCenter/OfflineContract.js
+++ b/src/api/PurchasingCenter/OfflineContract.js
@@ -215,7 +215,7 @@ export function searchMaterial1(pageCurrent, pageSize, num1, check1, val1, check
     data: {
       type: '1',
       name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存',
-      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
+      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/views/PurchasingCenter/MaterialMProcure/index.vue b/src/views/PurchasingCenter/MaterialMProcure/index.vue
index 1bdd18b6..0b86ba3f 100644
--- a/src/views/PurchasingCenter/MaterialMProcure/index.vue
+++ b/src/views/PurchasingCenter/MaterialMProcure/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-card>
-      <el-row>
+      <el-row v-if="false">
         <el-select
           v-model="MaterialCategoryValue"
           placeholder="物料类别"
@@ -85,6 +85,13 @@
           @click="pageCurrent=1;searchMaterial()">查询</el-button>
         <el-button type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">新增采购物料申请</el-button>
       </el-row>
+      <el-row>
+        <el-input v-model="MaterialName" placeholder="物料名称" size="small" clearable/>
+        <el-input v-model="MaterialSpecification" placeholder="物料规格" size="small" clearable/>
+        <el-input v-model="MaterialModel" placeholder="物料型号" size="small" clearable/>
+        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;searchMaterial()">查询</el-button>
+        <el-button type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">新增采购物料申请</el-button>
+      </el-row>
     </el-card>
 
     <el-card>
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index 3865e6eb..9b6d9f80 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -32,7 +32,7 @@
               <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="width: 120px; margin: 0px 10px"/>
             </el-row>
             <el-row>
-              <!--              <span>物料状态:</span>-->
+              <!--<span>物料状态:</span>-->
               <el-date-picker
                 v-model="startTime"
                 size="small"
@@ -44,12 +44,7 @@
                 style="width:250px;margin-left: 0px"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"/>
-              <el-button
-                type="success"
-                size="small"
-                icon="el-icon-search"
-                style="margin:10px 10px 0px 10px"
-                @click="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()">查询</el-button>
+              <el-button type="success" size="small" icon="el-icon-search" style="margin:10px 10px 0px 10px" @click="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()">查询</el-button>
               <el-popover v-model="visible1" placement="top" width="140">
                 <div style="text-align: right; margin: 0">
                   <el-select v-model="PersonValue" style="width:100px;margin: 10px 0px" placeholder="人员" size="small" filterable clearable>
@@ -74,7 +69,7 @@
               size="mini"
               @selection-change="handleSelectionChange1">
               <el-table-column :selectable="selectable" align="center" width="50" type="selection"/>
-              <el-table-column label="采购状态" prop="询价状态编号" align="center" width="80">
+              <el-table-column label="物料状态" prop="询价状态编号" align="center" width="80">
                 <template slot-scope="scope">
                   <el-tag v-if="parseInt(scope.row.询价状态编号)===1" type="warning" size="small">未询价</el-tag>
                   <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
@@ -198,7 +193,7 @@
               <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="width: 120px; margin: 0px 10px"/>
             </el-row>
             <el-row>
-              <!--              <span>物料状态:</span>-->
+              <!--<span>物料状态:</span>-->
               <el-date-picker
                 v-model="startTime"
                 size="small"
@@ -210,12 +205,7 @@
                 style="width:250px;margin: 10px 10px 0px 0px"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"/>
-              <el-button
-                type="success"
-                size="small"
-                icon="el-icon-search"
-                style="margin-left: 10px"
-                @click="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()">查询</el-button>
+              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()">查询</el-button>
               <el-popover v-model="visible" placement="top" width="140">
                 <div style="text-align: right; margin: 0">
                   <el-select v-model="PersonValue" style="width:100px;margin: 10px 0px" placeholder="人员" size="small" filterable clearable>
@@ -372,7 +362,7 @@
               <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="width: 120px;margin: 0px 10px"/>
             </el-row>
             <el-row>
-              <!--              <span style="margin-right: -10px">物料状态:</span>-->
+              <!--<span style="margin-right: -10px">物料状态:</span>-->
               <el-date-picker
                 v-model="startTime"
                 size="small"
@@ -630,7 +620,7 @@
         </el-tooltip>
         <el-input v-model="taxRate" style="float:right;width:100px" placeholder="税率" size="mini"/>
         <h4 style="float:right;width: 40px;margin: 5px">税率:</h4>
-        <el-button v-if="quickChangePrice" size="mini" style="float:right; width：80px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>
+        <el-button v-if="quickChangePrice" size="mini" style="float:right; width: 80px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>
         <el-button v-else size="mini" style="float:right;" @click="quickChangePrice=!quickChangePrice">还原</el-button>
       </div>
       <el-table v-loading="" :data="tableData2" border style="max-height: 460px;" size="mini" highlight-current-row @row-click="searchTable3">
@@ -702,15 +692,6 @@
           @size-change="handleSizeChange2"
           @current-change="handleCurrentChange2"/>
       </div>
-      <el-dialog v-el-drag-dialog :visible.sync="dialogVisible4" title="使用滞货" center style="min-height: 300px;" width="400px">
-        <span>使用滞货数量：</span>
-        <el-input-number :min="0" :max="maxUseNumber" v-model="useNumber" controls-position="right"/>
-        <div style="margin: 10px 0 0 10px;color: red">注意：确定后将不可取消使用滞货</div>
-        <div slot="footer" class="dialog-footer">
-          <el-button size="small" @click="dialogVisible4=false">取消</el-button>
-          <el-button :disabled="Number(useNumber)===0" type="primary" size="small" @click="submitUseInventory">确定</el-button>
-        </div>
-      </el-dialog>
       <!--<h3>合同详细信息</h3>-->
       <el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border style="max-height: 500px;" height="450px" size="mini" show-summary>
         <!--        <el-table-column label="离线合同编号" align="center" width="110">-->
@@ -796,6 +777,45 @@
         </el-table-column>
       </el-table>
     </el-card>
+    <div id="offlineContract" style="width: 800px;margin: 0 auto;display: none">
+      <table class="offlineContract" cellspacing="0px" align="center" border="1 solid black" width="100%">
+        <tr>
+          <th colspan="14"><h1>离线合同</h1></th>
+        </tr>
+        <tr>
+          <td colspan="3" rowspan="2" style="text-align:center;font-size: 30px;font-weight: bold">GAOJING</td>
+          <td width="80px">合同名称</td>
+          <td id="contractName" colspan="2" style="text-align: left;"/>
+          <td width="80px">供应商</td>
+          <td id="supplier" colspan="5" style="text-align: left;"/>
+          <td id="qrCode" colspan="2" rowspan="2">二维码粘贴处</td>
+        </tr>
+        <tr>
+          <td width="80px">合同编号</td>
+          <td id="contractNum" colspan="2" style="text-align: left;"/>
+          <td width="80px">采购员</td>
+          <td id="buyer" colspan="5" style="text-align: left;"/>
+        </tr>
+        <tr id="tablehead">
+          <td>序号</td>
+          <td colspan="2">名称</td>
+          <td>规格</td>
+          <td colspan="2">型号</td>
+          <td>数量</td>
+          <td>单价</td>
+          <td>单位</td>
+          <td colspan="2">合计</td>
+          <td>交货期</td>
+          <td colspan="2">备注</td>
+        </tr>
+        <tr>
+          <td>总计</td>
+          <td id="remark" colspan="10"/>
+          <td id="total" colspan="2" style="text-align: left;"/>
+          <td/>
+        </tr>
+      </table>
+    </div>
 
     <el-dialog v-el-drag-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px" width="700px">
       <el-form ref="form1" :model="form1" label-position="left" label-width="90px" class="searchForm">
@@ -902,7 +922,6 @@
         </el-table>
       </el-form>
     </el-dialog>
-
     <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="750px">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="right" label-width="120px">
         <el-row>
@@ -969,46 +988,15 @@
           @click="submitEditOfflineContract">确定</el-button>
       </div>
     </el-dialog>
-
-    <div id="offlineContract" style="width: 800px;margin: 0 auto;display: none">
-      <table class="offlineContract" cellspacing="0px" align="center" border="1 solid black" width="100%">
-        <tr>
-          <th colspan="14"><h1>离线合同</h1></th>
-        </tr>
-        <tr>
-          <td colspan="3" rowspan="2" style="text-align:center;font-size: 30px;font-weight: bold">GAOJING</td>
-          <td width="80px">合同名称</td>
-          <td id="contractName" colspan="2" style="text-align: left;"/>
-          <td width="80px">供应商</td>
-          <td id="supplier" colspan="5" style="text-align: left;"/>
-          <td id="qrCode" colspan="2" rowspan="2">二维码粘贴处</td>
-        </tr>
-        <tr>
-          <td width="80px">合同编号</td>
-          <td id="contractNum" colspan="2" style="text-align: left;"/>
-          <td width="80px">采购员</td>
-          <td id="buyer" colspan="5" style="text-align: left;"/>
-        </tr>
-        <tr id="tablehead">
-          <td>序号</td>
-          <td colspan="2">名称</td>
-          <td>规格</td>
-          <td colspan="2">型号</td>
-          <td>数量</td>
-          <td>单价</td>
-          <td>单位</td>
-          <td colspan="2">合计</td>
-          <td>交货期</td>
-          <td colspan="2">备注</td>
-        </tr>
-        <tr>
-          <td>总计</td>
-          <td id="remark" colspan="10"/>
-          <td id="total" colspan="2" style="text-align: left;"/>
-          <td/>
-        </tr>
-      </table>
-    </div>
+    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible4" title="使用滞货" center style="min-height: 300px;" width="400px">
+      <span>使用滞货数量：</span>
+      <el-input-number :min="0" :max="maxUseNumber" v-model="useNumber" controls-position="right"/>
+      <div style="margin: 10px 0 0 10px;color: red">注意：确定后将不可取消使用滞货</div>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisible4=false">取消</el-button>
+        <el-button :disabled="Number(useNumber)===0" type="primary" size="small" @click="submitUseInventory">确定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -1234,7 +1222,6 @@ export default {
     initDirection() {
       const direction = this.$getDirection()
       direction.on('keyup', function(e, val) {
-        console.log(val)
         if (e.keyCode === 39) {
           direction.next()
         }
@@ -1927,10 +1914,8 @@ export default {
       this.machineValue ? check5 = 1 : check5 = 0
       this.groupValue ? check6 = 1 : check6 = 0
       this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
-      console.log(this.tabName)
       if (this.tabName === '外购件') { this.partType = 2 }
       if (this.tabName === '标准件') { this.partType = 1 }
-      console.log(this.partType)
       searchMaterial1(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, this.partType, check7, this.startTime[0], this.startTime[1]).then(response => {
         this.tableData00 = response.data.rows
         console.log(this.tableData00, 111222)