diff --git a/src/api/PurchasingCenter/InvoiceSettlementApplication.js b/src/api/PurchasingCenter/InvoiceSettlementApplication.js
index 198aeb3b..0d765617 100644
--- a/src/api/PurchasingCenter/InvoiceSettlementApplication.js
+++ b/src/api/PurchasingCenter/InvoiceSettlementApplication.js
@@ -30,8 +30,8 @@ export function searchTable1(...group) {
     data: {
       type: '1',
       name: '采购管理_发票结算申请单_查询数据',
-      param: `发票号_check=${group[0]}&发票号=${group[1]}`,
-      Pagination: group[2] + '&' + group[3]
+      param: `发票号_check=${group[0]}&发票号=${group[1]}&供应商名称_check=${group[2]}&供应商名称=${group[3]}`,
+      Pagination: group[4] + '&' + group[5]
     }
   })
 }
diff --git a/src/api/PurchasingCenter/ReceiveCheck.js b/src/api/PurchasingCenter/ReceiveCheck.js
index ad68cd63..01b99b33 100644
--- a/src/api/PurchasingCenter/ReceiveCheck.js
+++ b/src/api/PurchasingCenter/ReceiveCheck.js
@@ -47,3 +47,15 @@ export function searchReceiveCheck(check1, num1, check2, num2, check3, num3) {
     }
   })
 }
+// 机床名称
+export function getMachines() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
+      param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
+    }
+  })
+}
diff --git a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue
index c0a5f1f5..c7da031a 100644
--- a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue
+++ b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue
@@ -2,6 +2,8 @@
   <div class="app-container">
     <el-card>
       <div slot="header">
+        <span>供应商:</span>
+        <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
         <span>合同号:</span>
         <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>
           <el-option
@@ -13,8 +15,6 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <span>供应商:</span>
-        <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
         <el-button
           type="success"
           size="small"
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
index cc514220..e5ab3fcd 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
@@ -2,13 +2,16 @@
   <div class="app-container">
     <el-card>
       <div slot="header">
+        <span>供应商:</span>
+        <el-input v-model="supperiler" placeholder="供应商" size="small" clearable/>
         <span>发票号:</span>
         <el-input v-model="invoiceNum" placeholder="发票号" size="small" clearable/>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=100000;searchTable1()">查询</el-button>
         <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">创建</el-button>
+        <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
       </div>
-      <h4 style="margin-top: 5px">发票结算申请单</h4>
-      <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%" height="350px" size="mini" @row-click="searchTable2">
+      <h4 style="margin-top: 5px;margin-bottom: 0px">发票结算申请单</h4>
+      <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%;max-height: 350px" size="mini" @row-click="searchTable2">
         <el-table-column type="expand">
           <template slot-scope="scope">
             <el-form label-position="left" inline class="demo-table-expand">
@@ -51,77 +54,76 @@
             {{ scope.row.发票号 }}
           </template>
         </el-table-column>
-        <el-table-column label="发票金额" align="center" width="100">
+        <el-table-column label="发票金额" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.发票金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="申请人" prop="申请人姓名" align="center" min-width="80">
+        <el-table-column label="申请人" prop="申请人姓名" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
           </template>
         </el-table-column>
-        <el-table-column label="申请时间" prop="申请时间" align="center" min-width="115" show-overflow-tooltip>
+        <el-table-column label="申请时间" prop="申请时间" align="center" min-width="90" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
+            {{ scope.row.申请时间 ? scope.row.申请时间.substr(0,10) : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="采购审批" align="center" min-width="60">
+        <el-table-column label="审核" align="center" min-width="60">
           <template slot-scope="scope">
-            {{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }}
+            {{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审核' }}
           </template>
         </el-table-column>
-        <el-table-column label="审批时间" align="center" min-width="115" show-overflow-tooltip>
+        <el-table-column label="审批时间" align="center" min-width="90" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }}
+            {{ scope.row.审批1时间 ? scope.row.审批1时间.substr(0,10) : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="总经理审批" align="center" min-width="70">
+        <el-table-column label="审批" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.审批人4姓名 ? scope.row.审批人4姓名 : '未审批' }}
           </template>
         </el-table-column>
-        <el-table-column label="审批时间" align="center" min-width="115" show-overflow-tooltip>
+        <el-table-column label="审批时间" align="center" min-width="90" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.审批4时间 ? scope.row.审批4时间 : '—' }}
+            {{ scope.row.审批4时间 ? scope.row.审批4时间.substr(0,10) : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="财务审批" align="center" min-width="60">
+        <el-table-column label="财务" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
           </template>
         </el-table-column>
-        <el-table-column label="审批时间" align="center" min-width="115" show-overflow-tooltip>
+        <el-table-column label="审批时间" align="center" min-width="90" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
+            {{ scope.row.审批3时间 ? scope.row.审批3时间.substr(0,10) : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="300" fixed="right">
+        <el-table-column label="操作" align="center" width="200" fixed="right">
           <template slot-scope="scope">
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="warning" icon="el-icon-edit" plain size="mini" style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="danger" icon="el-icon-delete" plain size="mini" style="margin-left:10px" @click="handleDelete(scope.row)">删除</el-button>
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="warning" plain size="mini" style="margin-left:10px" @click="submitApply(scope.row)">提交申请</el-button>
+            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" size="mini" style="margin-left:10px" @click="submitApply(scope.row)">提交申请</el-button>
+            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-edit" size="mini" style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
+            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-delete" size="mini" style="margin-left:10px" @click="handleDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent1"
-          :page-sizes="[10, 20, 30, 40]"
-          :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>
+      <!--      <div class="block" style="margin-top: 10px;">-->
+      <!--        <el-pagination-->
+      <!--          :current-page="pageCurrent1"-->
+      <!--          :page-sizes="[10, 20, 30, 40]"-->
+      <!--          :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>
 
     <el-card>
-      <h4 style="margin-top: 5px;display: inline-block;width: 150px;">发票结算申请单明细</h4>
-      <span>发票号：</span>
-      <el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/>
-      <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
+      <!--      <h4 style="margin-top: 5px;margin-bottom: 0px;display: inline-block;width: 150px;">发票结算申请单明细</h4>-->
+      <!--      <span>发票号：</span>-->
+      <!--      <el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/>-->
       <el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
         <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
@@ -138,11 +140,11 @@
             {{ scope.row.采购物料规格 || scope.row.离线物料规格 || scope.row.采购零件规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
+        <!--        <el-table-column label="供应商" align="center" min-width="150">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.供应商名称 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column label="合同编号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 || scope.row.离线合同编号 }}
@@ -324,12 +326,13 @@ export default {
   name: '', // 发票结算申请
   data() {
     return {
+      supperiler: '',
       disabled: false,
       contractType: '采购合同',
       invoiceNum: '',
       total1: 0,
       pageCurrent1: 1,
-      pageSize1: 10,
+      pageSize1: 100000,
       tableData1: [],
       applyOrderNum: '',
       invoiceNumber: '',
@@ -410,9 +413,10 @@ export default {
       this.dialogVisible1 = true
     },
     searchTable1() {
-      let check1
+      let check1, check2
       this.invoiceNum ? check1 = 1 : check1 = 0
-      searchTable1(check1, this.invoiceNum, this.pageCurrent1, this.pageSize1).then(response => {
+      this.supperiler ? check2 = 1 : check2 = 0
+      searchTable1(check1, this.invoiceNum, check2, this.supperiler, this.pageCurrent1, this.pageSize1).then(response => {
         this.tableData1 = response.data.rows
         this.tableData1.map(v => {
           this.$set(v, 'scanSrc', '')
@@ -431,7 +435,8 @@ export default {
             if (response.data[0].result === '1') {
               this.$message.success('增加成功')
               this.dialogVisible1 = false
-              this.searchTable1()
+              this.invoiceNum = this.form1.invoiceNum
+              this.searchTable1(this.invoiceNum)
             } else {
               this.$message.error('增加失败')
             }
diff --git a/src/views/PurchasingCenter/OfflineContractSearch/index.vue b/src/views/PurchasingCenter/OfflineContractSearch/index.vue
index 579a15b4..648715ea 100644
--- a/src/views/PurchasingCenter/OfflineContractSearch/index.vue
+++ b/src/views/PurchasingCenter/OfflineContractSearch/index.vue
@@ -3,10 +3,8 @@
     <el-card>
       <div slot="header">
         <el-row>
-          <span>合同编号:</span>
-          <el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:180px"/>
-          <span>供应商:</span>
-          <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/>
+          <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px;margin: 0px 10px"/>
+          <el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:180px;margin: 0px 10px"/>
           <el-button
             type="success"
             size="small"
@@ -15,92 +13,98 @@
             @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
         </el-row>
       </div>
-      <el-table
-        v-loading="loading1"
-        id="expandTable"
-        :data="tableData1"
-        size="mini"
-        border
-        style="width: 100%"
-        height="500px"
-        highlight-current-row
-        @row-click="searchTable2">
-        <el-table-column label="供应商" align="center" min-width="220">
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
-        <!--        <el-table-column label="离线合同名称" align="center" min-width="150">-->
-        <!--          <template slot-scope="scope">-->
-        <!--            {{ scope.row.离线合同名称 }}-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
-        <el-table-column label="离线合同编号" align="center" min-width="160">
-          <template slot-scope="scope">
-            {{ scope.row.离线合同编号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="采购员" align="center" min-width="60">
-          <template slot-scope="scope">
-            {{ scope.row.采购员 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="总金额" align="center" min-width="60">
-          <template slot-scope="scope">
-            {{ scope.row.合同总额 }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent1"
-          :page-sizes="[10, 20, 30, 40]"
-          :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 id="offlineContract" style="background-color:white;min-height:500px;margin: 0 auto;width: 800px;border:1px solid black">
-      <table v-show="contractDetail.length > 0" 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"/>
-        </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 width="50px">序号</td>
-          <td colspan="2">名称</td>
-          <td>规格</td>
-          <td colspan="2">型号</td>
-          <td>数量</td>
-          <td colspan="2">单价</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-row>
+      <el-card style="width: 40%; float: left">
+        <el-table
+          v-loading="loading1"
+          id="expandTable"
+          :data="tableData1"
+          size="mini"
+          border
+          style="width: 100%"
+          height="700px"
+          highlight-current-row
+          @row-click="searchTable2">
+          <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="150">-->
+          <!--          <template slot-scope="scope">-->
+          <!--            {{ scope.row.离线合同名称 }}-->
+          <!--          </template>-->
+          <!--        </el-table-column>-->
+          <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="60">-->
+          <!--          <template slot-scope="scope">-->
+          <!--            {{ scope.row.采购员 }}-->
+          <!--          </template>-->
+          <!--        </el-table-column>-->
+          <el-table-column label="总金额" align="center" min-width="75">
+            <template slot-scope="scope">
+              {{ Number(scope.row.合同总额).toFixed(2) }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block" style="margin-top: 10px;">
+          <el-pagination
+            :current-page="pageCurrent1"
+            :page-sizes="[10, 20, 30, 40]"
+            :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>
+      <el-card style="width: 58%">
+        <!--          <div id="offlineContract" style="background-color:white;min-height:500px;margin: 0 auto;width: 800px;border:1px solid black">-->
+        <table v-show="contractDetail.length > 0" class="offlineContract" cellspacing="0px" align="center" border="1 solid black" width="700px">
+          <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"/>
+          </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 width="50px">序号</td>
+            <td colspan="2">名称</td>
+            <td>规格</td>
+            <td colspan="2">型号</td>
+            <td>数量</td>
+            <td colspan="2">单价</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-card>
+    </el-row>
   </div>
 </template>
 
@@ -164,7 +168,7 @@ export default {
       }
       const tr = []
       let length = 0
-      this.contractDetail.length < 15 ? length = 15 : length = this.contractDetail.length
+      length = this.contractDetail.length
       for (let i = 0; i < length; i++) {
         tr[i] = document.createElement('tr')
         tr[i].setAttribute('class', 'tableData')
@@ -215,7 +219,7 @@ export default {
 
 <style scoped>
   .el-card{
-    margin-bottom: 15px;
+    margin-bottom: 0px;
   }
   .el-date-editor{
     width:200px
diff --git a/src/views/PurchasingCenter/PurchaseContractReview/index.vue b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
index 9c8fe0b1..82e9f7af 100644
--- a/src/views/PurchasingCenter/PurchaseContractReview/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
@@ -1,41 +1,41 @@
 <template>
   <div class="app-container">
-    <el-card>
-      <span>合同号:</span>
-      <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>
-        <el-option
-          v-for="item in contractNum"
-          :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="personValue" placeholder="采购员" clearable size="small" style="width: 100px">
-        <el-option
-          v-for="item in person"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span>供应商:</span>
-      <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/>
-      <el-button
-        type="success"
-        size="small"
-        icon="el-icon-search"
-        style="margin-left:10px"
-        @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
-      <el-button
-        type="warning"
-        size="small"
-        plain
-        icon="el-icon-search"
-        style="margin-left:10px"
-        @click="setting()">通知</el-button>
-    </el-card>
+    <!--    <el-card>-->
+    <!--      <span>合同号:</span>-->
+    <!--      <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>-->
+    <!--        <el-option-->
+    <!--          v-for="item in contractNum"-->
+    <!--          :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="personValue" placeholder="采购员" clearable size="small" style="width: 100px">-->
+    <!--        <el-option-->
+    <!--          v-for="item in person"-->
+    <!--          :key="item.value"-->
+    <!--          :label="item.label"-->
+    <!--          :value="item.value"/>-->
+    <!--      </el-select>-->
+    <!--      <span>供应商:</span>-->
+    <!--      <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/>-->
+    <!--      <el-button-->
+    <!--        type="success"-->
+    <!--        size="small"-->
+    <!--        icon="el-icon-search"-->
+    <!--        style="margin-left:10px"-->
+    <!--        @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>-->
+    <!--      <el-button-->
+    <!--        type="warning"-->
+    <!--        size="small"-->
+    <!--        plain-->
+    <!--        icon="el-icon-search"-->
+    <!--        style="margin-left:10px"-->
+    <!--        @click="setting()">通知</el-button>-->
+    <!--    </el-card>-->
 
     <el-card>
       <el-table
@@ -43,8 +43,7 @@
         :data="tableData1"
         size="mini"
         border
-        style="width: 100%"
-        height="500px"
+        style="width: 60%; max-height: 500px"
         highlight-current-row
         @row-click="searchTable2">
         <el-table-column type="expand" label="详情">
@@ -83,11 +82,11 @@
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购合同名称" align="center" min-width="130">
-          <template slot-scope="scope">
-            {{ scope.row.采购合同名称 }}
-          </template>
-        </el-table-column>
+        <!--        <el-table-column label="采购合同名称" align="center" min-width="130">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.采购合同名称 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column label="供应商" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
index 152c41e6..0ecd7ac7 100644
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -23,10 +23,10 @@
           <!--<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>-->
           <!--</el-option>-->
           <!--</el-select>-->
-          <!--<span>合同编号:</span>-->
-          <el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:200px"/>
           <!--<span>供应商:</span>-->
           <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/>
+          <!--<span>合同编号:</span>-->
+          <el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:200px"/>
           <!--<span>采购员:</span>-->
           <el-select v-model="personValue" placeholder="采购员" size="small" clearable style="width: 100px">
             <el-option
@@ -182,13 +182,13 @@
         <!--            {{ scope.row.审批时间 ? scope.row.审核时间.substr(0,9) : '—' }}-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column label="处理" align="center" width="110">
-          <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否未通过)===1&&Number(scope.row.不通过处理)===1" type="success" size="small">处理完成</el-tag>
-            <el-button v-else-if="Number(scope.row.是否未通过)===1&&Number(scope.row.不通过处理)===0" plain type="primary" size="mini" @click="done(scope.row)">点击处理</el-button>
-            <span v-else>—</span>
-          </template>
-        </el-table-column>
+        <!--        <el-table-column label="处理" align="center" width="110">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag v-if="Number(scope.row.是否未通过)===1&&Number(scope.row.不通过处理)===1" type="success" size="small">处理完成</el-tag>-->
+        <!--            <el-button v-else-if="Number(scope.row.是否未通过)===1&&Number(scope.row.不通过处理)===0" plain type="primary" size="mini" @click="done(scope.row)">点击处理</el-button>-->
+        <!--            <span v-else>—</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <!--        <el-table-column label="到货进度" align="center" min-width="150">-->
         <!--          <template slot-scope="scope">-->
         <!--            <el-progress-->
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index ae9d3ce9..3d59ff66 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -12,16 +12,16 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <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-input v-model="Name" placeholder="名称" size="small" clearable/>
-        <el-input v-model="spec" placeholder="规格" size="small" clearable/>
-        <el-input v-model="model" placeholder="型号" size="small" clearable/>
+        <!--        <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-input v-model="Name" placeholder="名称规格型号" size="small" clearable/>
+        <!--        <el-input v-model="spec" placeholder="规格" size="small" clearable/>-->
+        <!--        <el-input v-model="model" placeholder="型号" size="small" clearable/>-->
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>
         <el-tooltip :open-delay="1000" effect="dark" content="将全部采购件导出到表格" placement="top">
           <el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 15px" @click="exportDetail()">导出</el-button>
diff --git a/src/views/PurchasingCenter/ReceiveCheck/index.vue b/src/views/PurchasingCenter/ReceiveCheck/index.vue
index 37ca9118..d32345c2 100644
--- a/src/views/PurchasingCenter/ReceiveCheck/index.vue
+++ b/src/views/PurchasingCenter/ReceiveCheck/index.vue
@@ -2,22 +2,32 @@
   <div class="app-container receiveCheck">
     <el-card>
       <div slot="header">
-        <span>项目名称:</span>
-        <el-select v-model="projectValue" style="width:200px" placeholder="请选择" size="small" clearable filterable @change="projectChange">
+        <el-select v-model="machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 180px;" placeholder="机床号" @change="machineChange">
           <el-option
-            v-for="item in project"
+            v-for="item in machines"
             :key="item.value"
             :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <span>机床图号:</span>
-        <el-select v-model="machineValue" style="width:190px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
-          <el-option
-            v-for="item in machine"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
+          </el-option>
         </el-select>
+        <!--        <span>项目名称:</span>-->
+        <!--        <el-select v-model="projectValue" style="width:200px" placeholder="请选择" size="small" clearable filterable @change="projectChange">-->
+        <!--          <el-option-->
+        <!--            v-for="item in project"-->
+        <!--            :key="item.value"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value"/>-->
+        <!--        </el-select>-->
+        <!--        <span>机床图号:</span>-->
+        <!--        <el-select v-model="machineValue" style="width:190px" placeholder="请选择" size="small" clearable filterable @change="machineChange">-->
+        <!--          <el-option-->
+        <!--            v-for="item in machine"-->
+        <!--            :key="item.value"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value"/>-->
+        <!--        </el-select>-->
         <span>组号:</span>
         <el-select v-model="groupValue" style="width:140px" placeholder="请选择" size="small" clearable filterable>
           <el-option
@@ -63,7 +73,7 @@
             {{ scope.row.物料规格 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="物料型号">
+        <el-table-column align="center" label="物料型号" min-width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料型号 }}
           </template>
@@ -85,7 +95,7 @@
         </el-table-column>
         <el-table-column align="center" label="领用时间" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.出库时间 }}
+            {{ scope.row.出库时间.substr(0,10) }}
           </template>
         </el-table-column>
       </el-table>
@@ -94,14 +104,15 @@
 </template>
 
 <script>
-import { initProject, searchMachine, searchGroup, searchReceiveCheck } from '@/api/PurchasingCenter/ReceiveCheck'
+import { initProject, searchGroup, searchReceiveCheck, getMachines } from '@/api/PurchasingCenter/ReceiveCheck'
+import Cookie from 'js-cookie'
 export default {
   data() {
     return {
       projectValue: '', // 项目名称
       project: [],
-      machineValue: '',
-      machine: [],
+      machine: '',
+      machines: [],
       groupValue: '',
       group: [],
       tableData1: [],
@@ -113,29 +124,69 @@ export default {
   },
   created() {
     this.fetchData()
+    this.getMachine()
   },
   methods: {
+    getMachine() {
+      if (Cookie.get('machineValue') !== undefined) {
+        this.machine = ''
+        this.machines = []
+        getMachines().then(response => {
+          console.log(response, 343434)
+          for (let i = 0; i < response.data.length; i++) {
+            this.machines.push({
+              label: response.data[i].机床图号,
+              value: response.data[i].机床流水号,
+              value2: response.data[i].项目名称
+            })
+          }
+          if (Cookie.get('group') !== undefined) {
+            this.machine = parseInt(Cookie.get('machineValue'))
+            this.Group = parseInt(Cookie.get('group'))
+            // this.getTableData()
+            Cookie.remove('machineValue')
+            Cookie.remove('group')
+          } else {
+            // this.getTableData()
+            Cookie.remove('machineValue')
+            Cookie.remove('group')
+          }
+        })
+      } else {
+        this.Machine = ''
+        this.Machines = []
+        getMachines().then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.machines.push({
+              label: response.data[i].机床图号,
+              value: response.data[i].机床流水号,
+              value2: response.data[i].项目名称
+            })
+          }
+        })
+      }
+    },
     fetchData() {
       this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
     },
-    projectChange() {
-      this.machine = []
-      this.machineValue = ''
-      this.group = []
-      this.groupValue = ''
-      searchMachine(this.projectValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.machine.push({
-            value: response.data[i].机床流水号,
-            label: response.data[i].机床图号
-          })
-        }
-      })
-    },
+    // projectChange() {
+    //   this.machines = []
+    //   this.machine = ''
+    //   this.group = []
+    //   this.groupValue = ''
+    //   searchMachine(this.projectValue).then(response => {
+    //     for (let i = 0; i < response.data.length; i++) {
+    //       this.machines.push({
+    //         value: response.data[i].机床流水号,
+    //         label: response.data[i].机床图号
+    //       })
+    //     }
+    //   })
+    // },
     machineChange() {
       this.group = []
       this.groupValue = ''
-      searchGroup(this.machineValue).then(response => {
+      searchGroup(this.machine).then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.group.push({
             value: response.data[i].组件流水号,
@@ -171,18 +222,18 @@ export default {
       return sums
     },
     searchProject() { // 查询
-      if (!this.projectValue) {
-        this.$message.error('请选择项目')
-      } else {
-        let check2, check3
-        this.machineValue ? check2 = 1 : check2 = 0
-        this.groupValue ? check3 = 1 : check3 = 0
-        searchReceiveCheck(1, this.projectValue, check2, this.machineValue, check3, this.groupValue).then(response => {
-          this.tableData1 = response.data
-        })
-      }
+      // if (!this.projectValue) {
+      //   this.$message.error('请选择项目')
+      // } else {
+      let check2, check3
+      this.machine ? check2 = 1 : check2 = 0
+      this.groupValue ? check3 = 1 : check3 = 0
+      searchReceiveCheck(0, this.projectValue, check2, this.machine, check3, this.groupValue).then(response => {
+        this.tableData1 = response.data
+      })
     }
   }
+  // }
 }
 </script>
 
diff --git a/src/views/PurchasingCenter/SupplierManagement/index.vue b/src/views/PurchasingCenter/SupplierManagement/index.vue
index bccf5d5b..b70f5f5f 100644
--- a/src/views/PurchasingCenter/SupplierManagement/index.vue
+++ b/src/views/PurchasingCenter/SupplierManagement/index.vue
@@ -8,61 +8,61 @@
               <el-input v-model="supplierName" placeholder="供应商名称" size="small" clearable/>
             </el-form-item>
           </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="法人">
-              <el-input v-model="businessNature" placeholder="法人" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="受托人">
-              <el-input v-model="registeredCapital" placeholder="受托人" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="邮编">
-              <el-input v-model="deliveryPeriod" placeholder="邮编" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="税号">
-              <el-input v-model="taxNumber" placeholder="税号" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="电子信箱">
-              <el-input v-model="email" placeholder="电子信箱" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="电话号码">
-              <el-input v-model="telephone" placeholder="电话号码" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="开户行">
-              <el-input v-model="bank" placeholder="开户行" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="帐号">
-              <el-input v-model="account" placeholder="帐号" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="地址">
-              <el-input v-model="address" placeholder="地址" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="传真">
-              <el-input v-model="fax" placeholder="传真" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="主要产品">
-              <el-input v-model="mainProduction" placeholder="主要产品" size="small" clearable/>
-            </el-form-item>
-          </el-col>
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="法人">-->
+          <!--              <el-input v-model="businessNature" placeholder="法人" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="受托人">-->
+          <!--              <el-input v-model="registeredCapital" placeholder="受托人" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="邮编">-->
+          <!--              <el-input v-model="deliveryPeriod" placeholder="邮编" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="税号">-->
+          <!--              <el-input v-model="taxNumber" placeholder="税号" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="电子信箱">-->
+          <!--              <el-input v-model="email" placeholder="电子信箱" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="电话号码">-->
+          <!--              <el-input v-model="telephone" placeholder="电话号码" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="开户行">-->
+          <!--              <el-input v-model="bank" placeholder="开户行" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="帐号">-->
+          <!--              <el-input v-model="account" placeholder="帐号" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="地址">-->
+          <!--              <el-input v-model="address" placeholder="地址" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="传真">-->
+          <!--              <el-input v-model="fax" placeholder="传真" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="主要产品">-->
+          <!--              <el-input v-model="mainProduction" placeholder="主要产品" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
           <el-col style="width: 250px;margin:2px 0 0 15px">
             <el-button type="success" size="small" icon="el-icon-search" @click="pageCurrent = 1;fetchData()">查询</el-button>
             <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增供应商</el-button>
@@ -72,8 +72,8 @@
     </el-card>
 
     <el-card>
-      <div style="display: inline-block;margin-bottom: 20px">供应商列表</div>
-      <el-table :data="List" stripe highlight-current-row border style="width: 100%;max-height: 600px;" height="600" size="mini" @row-click="rowClick">
+      <div style="display: inline-block;margin-bottom: 5px">供应商列表</div>
+      <el-table :data="List" stripe highlight-current-row border style="width: 100%;max-height: 600px;" height="500" size="mini" @row-click="rowClick">
         <el-table-column label="供应商名称" align="center" fixed="left" min-width="250">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -144,7 +144,7 @@
       <div class="block" style="margin-top: 10px;">
         <el-pagination
           :current-page="pageCurrent"
-          :page-sizes="[10, 20, 30, 40]"
+          :page-sizes="[10, 20, 30, 40, 100]"
           :page-size="pageSize"
           :total="total"
           layout="total, sizes, prev, pager, next, jumper"
@@ -372,7 +372,7 @@ export default {
       check12: 0,
       List: [],
       pageCurrent: 1,
-      pageSize: 10,
+      pageSize: 100,
       total: 0,
       title: '',
       dialogFormVisible: false,
@@ -466,7 +466,7 @@ export default {
               this.$message.success('增加成功')
               this.dialogFormVisible = false
               this.pageCurrent = 1
-              this.pageSize = 10
+              this.pageSize = 100
               this.fetchData()
             } else { this.$message.error('增加失败') }
           })
@@ -505,7 +505,7 @@ export default {
               this.$message.success('编辑成功')
               this.dialogFormVisible = false
               this.pageCurrent = 1
-              this.pageSize = 10
+              this.pageSize = 100
               this.fetchData()
             } else { this.$message.error('编辑失败') }
           })
@@ -528,7 +528,7 @@ export default {
           if (response.data[0].result === '1') {
             this.$message.success('删除成功')
             this.pageCurrent = 1
-            this.pageSize = 10
+            this.pageSize = 100
             this.fetchData()
           } else { this.$message.error('删除失败') }
         })