diff --git a/src/api/PurchasingCenter/PurchaseSituationSearch.js b/src/api/PurchasingCenter/PurchaseSituationSearch.js
index 2d4cbd39..8c7d0931 100644
--- a/src/api/PurchasingCenter/PurchaseSituationSearch.js
+++ b/src/api/PurchasingCenter/PurchaseSituationSearch.js
@@ -39,7 +39,7 @@ export function searchTable1(...params) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '采购管理_采购部采购_查询物料_分配后_加供应商_新_LLJ',
-      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]}&时间_check=${params[13]}&开始时间=${params[14]}&结束时间=${params[15]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&PageCount=1=int=output&ItemCount=1=int=output`
+      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]}&时间_check=${params[13]}&开始时间=${params[14]}&结束时间=${params[15]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&排序方式=${params[16]}&排序名称=${params[17]}&PageCount=1=int=output&ItemCount=1=int=output`
       // Pagination: params[4] + '&' + params[5]
     }
   })
@@ -54,7 +54,7 @@ export function searchTable2(...params) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_新_LLJ',
-      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]}&时间_check=${params[12]}&开始时间=${params[13]}&结束时间=${params[14]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&PageCount=1=int=output&ItemCount=1=int=output`
+      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]}&时间_check=${params[12]}&开始时间=${params[13]}&结束时间=${params[14]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&排序方式=${params[15]}&排序名称=${params[16]}&PageCount=1=int=output&ItemCount=1=int=output`
       // Pagination: params[4] + '&' + params[5]
     }
   })
diff --git a/src/api/PurchasingCenter/ReceiveCheck.js b/src/api/PurchasingCenter/ReceiveCheck.js
index 170f47b5..a84e067d 100644
--- a/src/api/PurchasingCenter/ReceiveCheck.js
+++ b/src/api/PurchasingCenter/ReceiveCheck.js
@@ -44,7 +44,7 @@ export function searchGroup(num) {
   })
 }
 // 初始化项目金额统计表
-export function searchReceiveCheck(check1, num1, check2, num2, check3, num3, check4, num4, pageCurrent, pageSize) {
+export function searchReceiveCheck(check1, num1, check2, num2, check3, num3, check4, num4, pageCurrent, pageSize, order, partName) {
   return request({
     url: '',
     method: 'post',
@@ -53,7 +53,7 @@ export function searchReceiveCheck(check1, num1, check2, num2, check3, num3, che
       ModularID: router.currentRoute.path,
       type: '1',
       name: '采购管理_领用核算_查询数据',
-      param: `项目流水号_check=${check1}&项目流水号=${num1}&机床流水号_check=${check2}&机床流水号=${num2}&组件流水号_check=${check3}&组件流水号=${num3}&机床号物料名称_check=${check4}&机床号物料名称=${num4}&PageCurrent=${pageCurrent}=int&PageSize=${pageSize}=int&PageCount=1=int=output&ItemCount=1=int=output`
+      param: `项目流水号_check=${check1}&项目流水号=${num1}&机床流水号_check=${check2}&机床流水号=${num2}&组件流水号_check=${check3}&组件流水号=${num3}&机床号物料名称_check=${check4}&机床号物料名称=${num4}&PageCurrent=${pageCurrent}=int&PageSize=${pageSize}=int&排序方式=${order}=int&排序名称=${partName}=int&PageCount=1=int=output&ItemCount=1=int=output`
     }
   })
 }
diff --git a/src/api/WorkshopProcurement/RequestOutsourcingMaterials.js b/src/api/WorkshopProcurement/RequestOutsourcingMaterials.js
index 03a0e2d7..501adfe2 100644
--- a/src/api/WorkshopProcurement/RequestOutsourcingMaterials.js
+++ b/src/api/WorkshopProcurement/RequestOutsourcingMaterials.js
@@ -87,4 +87,17 @@ export function cancelRequestFund(num) {
     }
   })
 }
-
+// 取消请款明细
+export function deleteRequsetFundMX(num, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: '备料管理_请款明细_删除数据',
+      param: `采购计划请款明细流水号=${num}&发票流水号=${num1}`
+    }
+  })
+}
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index cd5952c9..a1178e23 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <el-select v-model="machineNumberValue" filterable placeholder="选择机床图号" size="small" style="margin-left: 10px;width: 180px;margin-top: 5px" clearable @change="machineChange()">
+        <el-select v-model="machineNumberValue" filterable placeholder="机床图号" size="small" style="margin-left: 10px;width: 180px;margin-top: 5px" clearable @change="machineChange()">
           <el-option
             v-for="item in machineNumber"
             :key="item.value"
@@ -12,14 +12,14 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <el-select v-model="groupNumberValue" filterable placeholder="选择组号" size="small" style="margin-left: 10px;width:100px" clearable>
+        <el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" style="margin-left: 10px;width:100px" clearable>
           <el-option
             v-for="item in groupNumber"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 150px;margin-left: 10px" size="small" clearable/>
+        <el-input v-model="SpareParts" filterable placeholder="零件图号或零件名称" style="width: 150px;margin-left: 10px" size="small" clearable/>
         <el-select v-model="QualityTypeValue" filterable placeholder="质检类型" style="margin-left: 10px;width:150px" size="small" clearable>
           <el-option
             v-for="item in QualityTypeNumber"
@@ -424,7 +424,7 @@
         </el-table-column>
         <el-table-column align="center" label="操作工">
           <template slot-scope="scope">
-            {{ scope.row.员工姓名 }}
+            {{ scope.row.操作员 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="工艺是否完成" width="120">
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index e4214918..8df72284 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -6,16 +6,16 @@
           <el-row>
             <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:180px;margin: 3px 0"/>
             <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
-            <el-tooltip :open-delay="1200" effect="dark" content="已导出和未导出备料单" placement="top">
-              <el-checkbox v-model="all" size="small">查询全部</el-checkbox>
-            </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top"/>
             <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为外购备料" placement="top">
-              <el-button type="primary" size="small" icon="el-icon-s-shop" plain style="margin-left:0px" @click="edit2()">外购备料</el-button>
+              <el-button type="primary" size="small" icon="el-icon-s-shop" plain style="margin-left:10px" @click="edit2()">外购备料</el-button>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为自家备料" placement="top">
               <el-button type="distribution" size="small" icon="el-icon-setting" style="margin-left:10px" @click="edit('BL')">自家备料</el-button>
             </el-tooltip>
+            <el-tooltip :open-delay="1200" effect="dark" content="已导出和未导出备料单" placement="top">
+              <el-checkbox v-model="all" size="small">查询全部</el-checkbox>
+            </el-tooltip>
             <!--<el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top">-->
             <!--<el-button class="button111" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>-->
             <!--</el-tooltip>-->
diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
index b4596e77..98b17c56 100644
--- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
+++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
@@ -14,7 +14,9 @@
         end-placeholder="结束日期"/>
       <el-input v-model="name" size="small" placeholder="操作工" style="width: 150px" clearable/>
       <el-input v-model="partNumber" size="small" placeholder="零件图号" style="width: 150px" clearable/>
-      <el-checkbox v-model="check" class="remeberPassword">查询全部</el-checkbox>
+      <el-tooltip :open-delay="600" effect="dark" content="筛选掉备料、热及外协工序" placement="top">
+        <el-checkbox v-model="check" class="remeberPassword">筛选</el-checkbox>
+      </el-tooltip>
       <el-button size="small" type="primary" icon="el-icon-search" style="margin-left: 5px" plain @click="pageCurrent=1;pageSize=50;searchTable()">查询</el-button>
       <el-button size="small" type="success" icon="el-icon-download" plain @click="exportExcel">导出</el-button>
     </el-card>
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index 2a30ef8d..ec3597ce 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -3,7 +3,7 @@
     <el-card>
       <el-input v-model="partNumber" size="small" placeholder="零件号" clearable style="width:160px;margin-top: 3px"/>
       <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:20px" plain @click="getList()">查询</el-button>
-      <el-button type="danger" plain size="mini" icon="el-icon-caret-right" style="float: right;margin-right:10px" @click="getBack()">打回车间</el-button>
+      <el-button type="danger" plain size="mini" icon="el-icon-caret-right" style="float: right;margin-right:10px" @click="getBack()">打回</el-button>
       <el-table v-loading="loading1" ref="multipleTable" :data="List1" border size="mini" stripe highlight-current-row height="265" style="width: 100%;margin-top: 3px" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"/>
         <el-table-column label="项目名称" prop="项目名称" align="center" show-overflow-tooltip>
@@ -52,8 +52,12 @@
           </el-table-column>
           <el-table-column label="操作" align="center" min-width="100px">
             <template slot-scope="scope">
-              <el-button type="text" size="mini" icon="el-icon-edit" plain style="margin-left:10px" @click="handleEdit(scope.row)"/>
-              <el-button :disabled="scope.row.单据状态==='成交'" plain type="text" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)"/>
+              <div style="display: inline-block">
+                <el-button type="text" size="mini" icon="el-icon-edit" style="margin-left:10px" @click="handleEdit(scope.row)"/>
+              </div>
+              <div style="display: inline-block">
+                <el-button :disabled="scope.row.单据状态==='成交'" type="text" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)"/>
+              </div>
             </template>
           </el-table-column>
         </el-table>
@@ -102,7 +106,7 @@
           </el-table-column>
           <el-table-column label="操作" align="center" width="80px">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" plain icon="el-icon-right" @click="handleDelete1(scope.row)">移出</el-button>
+              <el-button size="mini" type="text" icon="el-icon-right" @click="handleDelete1(scope.row)">移出</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -615,7 +619,19 @@ export default {
             this.loading = true
             this.List3 = []
             getParts(this.Number).then(response => {
-              this.List3 = response.data
+              if (response.data.length !== 0) {
+                for (let i = 0; i < response.data.length; i++) {
+                  this.List3.push({
+                    外协加工任务单明细流水号: response.data[i].外协加工任务单明细流水号,
+                    加工价格_成交: response.data[i].加工价格_成交.toFixed(2),
+                    机加工开始时间: response.data[i].机加工开始时间 ? response.data[i].机加工开始时间.split(' ')[0] : '',
+                    零件图号: response.data[i].零件图号,
+                    零件名称: response.data[i].零件名称,
+                    批次数量: response.data[i].批次数量,
+                    外协工序: response.data[i].外协工序
+                  })
+                }
+              }
               this.loading = false
             })
           } else { this.$message.error('移除失败') }
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index aa22e3de..3d1c9ba5 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -2,7 +2,7 @@
   <div>
     <el-col style="width: auto">
       <el-card>
-        <el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 180px" placeholder="机床号" @change="typeChange1()">
+        <el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 180px" placeholder="机床号" @change="typeChange1();searchTable()">
           <el-option
             v-for="item in toolNum"
             :key="item.value"
@@ -12,7 +12,7 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
           </el-option>
         </el-select>
-        <el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px;width: 120px" placeholder="组号">
+        <el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px;width: 120px" placeholder="组号" @change="searchTable">
           <el-option
             v-for="item in Num"
             :key="item.value"
@@ -125,7 +125,6 @@ export default {
   },
   created() {
     this.typeChange()
-    this.searchTable()
   },
   methods: {
     fetchData() {
@@ -168,35 +167,39 @@ export default {
       })
     },
     searchTable() {
-      this.loading1 = true
-      this.tableData1 = []
-      this.tableData2 = []
-      if (this.entryNameValue !== null && this.entryNameValue !== '') {
-        this.check_entryNameValue = 1
+      if (this.NumValue || this.toolNumValue || this.partName) {
+        this.loading1 = true
+        this.tableData1 = []
+        this.tableData2 = []
+        if (this.entryNameValue !== null && this.entryNameValue !== '') {
+          this.check_entryNameValue = 1
+        } else {
+          this.check_entryNameValue = 0
+        }
+        if (this.toolNumValue !== null && this.toolNumValue !== '') {
+          this.check_toolNumValue = 1
+        } else {
+          this.check_toolNumValue = 0
+        }
+        if (this.NumValue !== null && this.NumValue !== '') {
+          this.check_NumValue = 1
+        } else {
+          this.check_NumValue = 0
+        }
+        if (this.partName !== null && this.partName !== '') {
+          this.check_partName = 1
+        } else {
+          this.check_partName = 0
+        }
+        searchTable(this.check_entryNameValue, this.entryNameValue, this.check_toolNumValue, this.toolNumValue, this.check_NumValue, this.NumValue, this.check_partName, this.partName, this.pageCurrent1, this.pageSize1).then(response => {
+          this.tableData1 = response.data.rows
+          this.total1 = response.data.total
+        }).then(() => {
+          this.loading1 = false
+        })
       } else {
-        this.check_entryNameValue = 0
+        this.$message.warning('请输入查询条件')
       }
-      if (this.toolNumValue !== null && this.toolNumValue !== '') {
-        this.check_toolNumValue = 1
-      } else {
-        this.check_toolNumValue = 0
-      }
-      if (this.NumValue !== null && this.NumValue !== '') {
-        this.check_NumValue = 1
-      } else {
-        this.check_NumValue = 0
-      }
-      if (this.partName !== null && this.partName !== '') {
-        this.check_partName = 1
-      } else {
-        this.check_partName = 0
-      }
-      searchTable(this.check_entryNameValue, this.entryNameValue, this.check_toolNumValue, this.toolNumValue, this.check_NumValue, this.NumValue, this.check_partName, this.partName, this.pageCurrent1, this.pageSize1).then(response => {
-        this.tableData1 = response.data.rows
-        this.total1 = response.data.total
-      }).then(() => {
-        this.loading1 = false
-      })
     },
     searchTable2(row) {
       this.loading2 = true
diff --git a/src/views/PurchasingCenter/PurchaseContractReview/index.vue b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
index 0dc3c1f4..ec14f4d0 100644
--- a/src/views/PurchasingCenter/PurchaseContractReview/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
@@ -38,38 +38,38 @@
     <!--    </el-card>-->
 
     <el-card>
-      <el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 60%; max-height: 500px" height="150px" highlight-current-row @row-click="searchTable2">
-        <el-table-column type="expand" label="详情">
-          <template slot-scope="scope">
-            <el-form id="table" label-position="left" inline class="demo-table-expand">
-              <el-row>
-                <el-form-item label="交货日期">
-                  {{ scope.row.交货日期 }}
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="支付日期">
-                  {{ scope.row.支付日期 }}
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="支付方式">
-                  {{ scope.row.支付方式 }}
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="开票信息">
-                  {{ scope.row.开票信息 }}
-                </el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="其他说明">
-                  {{ scope.row.其他说明 }}
-                </el-form-item>
-              </el-row>
-            </el-form>
-          </template>
-        </el-table-column>
+      <el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 60%;" height="210px" highlight-current-row @row-click="searchTable2">
+        <!--        <el-table-column type="expand" label="详情">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-form id="table" label-position="left" inline class="demo-table-expand">-->
+        <!--              <el-row>-->
+        <!--                <el-form-item label="交货日期">-->
+        <!--                  {{ scope.row.交货日期 }}-->
+        <!--                </el-form-item>-->
+        <!--              </el-row>-->
+        <!--              <el-row>-->
+        <!--                <el-form-item label="支付日期">-->
+        <!--                  {{ scope.row.支付日期 }}-->
+        <!--                </el-form-item>-->
+        <!--              </el-row>-->
+        <!--              <el-row>-->
+        <!--                <el-form-item label="支付方式">-->
+        <!--                  {{ scope.row.支付方式 }}-->
+        <!--                </el-form-item>-->
+        <!--              </el-row>-->
+        <!--              <el-row>-->
+        <!--                <el-form-item label="开票信息">-->
+        <!--                  {{ scope.row.开票信息 }}-->
+        <!--                </el-form-item>-->
+        <!--              </el-row>-->
+        <!--              <el-row>-->
+        <!--                <el-form-item label="其他说明">-->
+        <!--                  {{ scope.row.其他说明 }}-->
+        <!--                </el-form-item>-->
+        <!--              </el-row>-->
+        <!--            </el-form>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column label="采购合同号" align="center" min-width="130">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
@@ -80,7 +80,7 @@
         <!--            {{ scope.row.采购合同名称 }}-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column label="供应商" align="center" min-width="150">
+        <el-table-column label="供应商" align="center" min-width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
index 152156d0..1f2d2a5b 100644
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -80,6 +80,7 @@
               plain
               @click="download()">打印</el-button>
           </el-tooltip>
+          <el-button type="success" size="small" icon="el-icon-download" plain style="float: right; margin-right: 130px;" @click="exportExcel">导出</el-button>
         </el-row>
       </div>
       <el-table
@@ -377,6 +378,38 @@ export default {
         })
       })
     },
+    exportExcel() { // 采购合同导出
+      this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
+      this.contractNumValue ? this.check2 = 1 : this.check2 = 0
+      this.personValue ? this.check3 = 1 : this.check3 = 0
+      this.supplierName ? this.check4 = 1 : this.check4 = 0
+      if (this.approvalValue === '' || this.approvalValue === 0) {
+        this.check5 = 0
+      } else {
+        this.check5 = 1
+      }
+      let check, check2
+      this.contractNumber ? check = 1 : check = 0
+      this.revieweValue ? check2 = 1 : check2 = 0
+      var param = []
+      param[0] = ['时间段_check', this.check1]
+      param[1] = ['开始时间', this.dateRange[0]]
+      param[2] = ['结束时间', this.dateRange[1]]
+      param[3] = ['采购合同流水号_check', this.check2]
+      param[4] = ['采购合同流水号', this.contractNumValue]
+      param[5] = ['人员编号_check', this.check3]
+      param[6] = ['人员编号', this.personValue]
+      param[7] = ['供应商名称_check', this.check4]
+      param[8] = ['供应商名称', this.supplierName]
+      param[9] = ['审批情况流水号_check', this.check5]
+      param[10] = ['审批情况流水号', this.approvalValue]
+      param[11] = ['采购合同编号_check', check]
+      param[12] = ['采购合同编号', this.contractNumber]
+      param[13] = ['审核情况流水号_check', check2]
+      param[14] = ['审核情况流水号', this.revieweValue]
+      var Data = this.CreateData('2001', '报表_采购合同信息', param)
+      this.exportExcel_NPOI(Data)
+    },
     deleteContract(row) { // 删除合同
       this.$confirm('此操作将永久删除合同所有内容，确定删除?', '提示', {
         confirmButtonText: '确定',
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index a7e1bd7e..4588e0e0 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -48,7 +48,7 @@
 
     <el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()">
       <el-tab-pane label="标准件" name="标准件">
-        <el-table v-loading="loading0" :data="tableData0" size="mini" height="700px" border stripe>
+        <el-table v-loading="loading0" :data="tableData0" size="mini" height="700px" border stripe @sort-change="sortChange0">
           <el-table-column align="center" prop="询价状态编号" label="采购状态" width="90px">
             <template slot-scope="scope">
               <!--<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>-->
@@ -66,12 +66,12 @@
               {{ scope.row.机床图号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="组号" prop="组号" width="70px">
+          <el-table-column align="center" label="组号" prop="组号" width="80px" sortable="custom">
             <template slot-scope="scope">
               {{ scope.row.组号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="名称" prop="物料名称" width="153px" show-overflow-tooltip>
+          <el-table-column align="center" label="名称" prop="物料名称" width="153px" show-overflow-tooltip sortable="custom">
             <template slot-scope="scope">
               {{ scope.row.物料名称 }}
             </template>
@@ -81,12 +81,12 @@
               {{ scope.row.物料型号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="规格" prop="物料规格" width="128px" show-overflow-tooltip>
+          <el-table-column align="center" label="规格" prop="物料规格" width="128px" show-overflow-tooltip sortable="custom">
             <template slot-scope="scope">
               {{ scope.row.物料规格 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="供货商" prop="供货商" width="132px" show-overflow-tooltip>
+          <el-table-column align="center" label="供货商" prop="供货商" width="132px" show-overflow-tooltip sortable="custom">
             <template slot-scope="scope">
               {{ scope.row.供货商 || '—' }}
             </template>
@@ -117,7 +117,7 @@
               <span v-else>未到货</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="供应商" prop="供应商名称" min-width="150px" show-overflow-tooltip>
+          <el-table-column align="center" label="供应商" prop="供应商名称" min-width="150px" show-overflow-tooltip sortable="custom">
             <template slot-scope="scope">
               {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }}
             </template>
@@ -156,7 +156,7 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="外购件" name="外购件">
-        <el-table v-loading="loading1" :data="tableData1" size="mini" height="700px" border stripe>
+        <el-table v-loading="loading1" :data="tableData1" size="mini" height="700px" border stripe @sort-change="sortChange1">
           <el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px">
             <template slot-scope="scope">
               <el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
@@ -170,12 +170,12 @@
               {{ scope.row.机床图号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="组号" prop="组号" width="70px">
+          <el-table-column align="center" label="组号" prop="组号" width="70px" sortable="custom">
             <template slot-scope="scope">
               {{ scope.row.组号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="名称" prop="物料名称" width="153px" show-overflow-tooltip>
+          <el-table-column align="center" label="名称" prop="物料名称" width="153px" show-overflow-tooltip sortable="custom">
             <template slot-scope="scope">
               {{ scope.row.物料名称 }}
             </template>
@@ -185,12 +185,12 @@
               {{ scope.row.物料型号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="规格" prop="物料规格" width="128px" show-overflow-tooltip>
+          <el-table-column align="center" label="规格" prop="物料规格" width="128px" show-overflow-tooltip sortable="custom">
             <template slot-scope="scope">
               {{ scope.row.物料规格 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="供货商" prop="供货商" width="132px" show-overflow-tooltip>
+          <el-table-column align="center" label="供货商" prop="供货商" width="132px" show-overflow-tooltip sortable="custom">
             <template slot-scope="scope">
               {{ scope.row.供货商 || '—' }}
             </template>
@@ -221,7 +221,7 @@
               <span v-else>未到货</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="供应商" prop="供应商名称" min-width="150px" show-overflow-tooltip>
+          <el-table-column align="center" label="供应商" prop="供应商名称" min-width="150px" show-overflow-tooltip sortable="custom">
             <template slot-scope="scope">
               {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }}
             </template>
@@ -260,7 +260,7 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="基本件" name="基本件">
-        <el-table v-loading="loading2" :data="tableData2" size="mini" height="700px" border stripe>
+        <el-table v-loading="loading2" :data="tableData2" size="mini" height="700px" border stripe @sort-change="sortChange2">
           <el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px">
             <template slot-scope="scope">
               <span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
@@ -274,12 +274,12 @@
               {{ scope.row.机床图号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="组号" prop="组号" width="70px">
+          <el-table-column align="center" label="组号" prop="组号" width="70px" sortable="custom">
             <template slot-scope="scope">
               {{ scope.row.组号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="名称" prop="物料名称" width="153px" show-overflow-tooltip>
+          <el-table-column align="center" label="名称" prop="物料名称" width="153px" show-overflow-tooltip sortable="custom">
             <template slot-scope="scope">
               {{ scope.row.零件名称 }}
             </template>
@@ -289,7 +289,7 @@
               {{ scope.row.零件图号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="规格" prop="规格" width="128px" show-overflow-tooltip>
+          <el-table-column align="center" label="规格" prop="规格" width="128px" show-overflow-tooltip sortable="custom">
             <template slot-scope="scope">
               {{ scope.row.规格 }}
             </template>
@@ -299,7 +299,7 @@
               {{ scope.row.材料 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="供货商" prop="供货商" width="132px" show-overflow-tooltip>
+          <el-table-column align="center" label="供货商" prop="供货商" width="132px" show-overflow-tooltip sortable="custom">
             <template slot-scope="scope">
               {{ scope.row.供货商 || '—' }}
             </template>
@@ -332,7 +332,7 @@
               <span v-else>未到货</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="供应商" prop="供应商名称" min-width="100px" show-overflow-tooltip>
+          <el-table-column align="center" label="供应商" prop="供应商名称" min-width="100px" show-overflow-tooltip sortable="custom">
             <template slot-scope="scope">
               {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || '—' }}
             </template>
@@ -613,6 +613,27 @@ export default {
       this.pageCurrent2 = val
       this.searchTable2()
     },
+    sortChange0(column, prop, order) {
+      console.log(column + '-' + column.prop + '-' + column.order, 11111)
+      if (column.prop === '组号') {
+        this.partName = 1
+      } else if (column.prop === '物料名称') { this.partName = 2 } else if (column.prop === '物料规格') {
+        this.partName = 3
+      } else if (column.prop === '供货商') {
+        this.partName = 4
+      } else if (column.prop === '供应商名称') {
+        this.partName = 5
+      } else {
+        this.partName = ''
+      }
+      console.log(this.ordername, 9990999)
+      if (column.order === 'ascending') {
+        this.order = 1
+      } else if (column.order === 'descending') { this.order = 2 } else {
+        this.order = ''
+      }
+      this.searchTable0()
+    },
     searchTable0() { // 查询标准件
       this.tableData0 = []
       let check1, check2, check3, check4, check5, check6
@@ -623,7 +644,7 @@ export default {
       this.model ? check5 = 1 : check5 = 0
       this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '')
       this.loading0 = true
-      searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => {
+      searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1], this.order, this.partName).then(response => {
         if (response.data.result !== 0) {
           for (let i = 0; i < response.data.result.length; i++) {
             this.tableData0.push({
@@ -659,6 +680,27 @@ export default {
         this.loading0 = false
       })
     },
+    sortChange1(column, prop, order) {
+      console.log(column + '-' + column.prop + '-' + column.order, 11111)
+      if (column.prop === '组号') {
+        this.partName = 1
+      } else if (column.prop === '物料名称') { this.partName = 2 } else if (column.prop === '物料规格') {
+        this.partName = 3
+      } else if (column.prop === '供货商') {
+        this.partName = 4
+      } else if (column.prop === '供应商名称') {
+        this.partName = 5
+      } else {
+        this.partName = ''
+      }
+      console.log(this.ordername, 9990999)
+      if (column.order === 'ascending') {
+        this.order = 1
+      } else if (column.order === 'descending') { this.order = 2 } else {
+        this.order = ''
+      }
+      this.searchTable1()
+    },
     searchTable1() { // 查询外购件
       this.tableData1 = []
       let check1, check2, check3, check4, check5, check6
@@ -669,7 +711,7 @@ export default {
       this.model ? check5 = 1 : check5 = 0
       this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '')
       this.loading1 = true
-      searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => {
+      searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1], this.order, this.partName).then(response => {
         console.log(response.data.result.length, 222)
         // this.total02 = parseInt(response.data.output[0].ItemCount)
 
@@ -708,6 +750,27 @@ export default {
         this.loading1 = false
       })
     },
+    sortChange2(column, prop, order) {
+      console.log(column + '-' + column.prop + '-' + column.order, 11111)
+      if (column.prop === '组号') {
+        this.partName = 1
+      } else if (column.prop === '物料名称') { this.partName = 2 } else if (column.prop === '物料规格') {
+        this.partName = 3
+      } else if (column.prop === '供货商') {
+        this.partName = 4
+      } else if (column.prop === '供应商名称') {
+        this.partName = 5
+      } else {
+        this.partName = ''
+      }
+      console.log(this.ordername, 9990999)
+      if (column.order === 'ascending') {
+        this.order = 1
+      } else if (column.order === 'descending') { this.order = 2 } else {
+        this.order = ''
+      }
+      this.searchTable2()
+    },
     searchTable2() { // 查询基本件
       let check1, check2, check3, check4, check5, check6
       this.machineNumberValue ? check1 = 1 : check1 = 0
@@ -717,7 +780,7 @@ export default {
       this.model ? check5 = 1 : check5 = 0
       this.loading2 = true
       this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '')
-      searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => {
+      searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1], this.order, this.partName).then(response => {
         this.tableData2 = response.data.result
         this.total2 = parseInt(response.data.output[0].ItemCount)
         this.loading2 = false
diff --git a/src/views/PurchasingCenter/ReceiveCheck/index.vue b/src/views/PurchasingCenter/ReceiveCheck/index.vue
index c853570e..f2f64913 100644
--- a/src/views/PurchasingCenter/ReceiveCheck/index.vue
+++ b/src/views/PurchasingCenter/ReceiveCheck/index.vue
@@ -39,19 +39,21 @@
         </el-select>
         <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="searchProject()">查询</el-button>
         <el-tooltip v-show="true" :open-delay="1000" effect="dark" content="导出领用核算表" placement="top">
-          <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 410px" @click="exportExcel">导出</el-button>
+          <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 50px 0px 10px" @click="exportExcel">导出</el-button>
         </el-tooltip>
+        <span>领用合计（元）：</span>
+        <span>{{ totalPrice }}</span>
       </div>
       <el-table
         v-loading="loading"
         :data="tableData1"
         :summary-method="getSummaries"
-        style="width: 990px"
+        style="width: 1040px"
         height="650"
         size="mini"
-        show-summary
         stripe
-        border>
+        border
+        @sort-change="sortChange">
         <!--<el-table-column align="center" label="序号" type="index"/>-->
         <!--<el-table-column align="center" label="项目名称">-->
         <!--<template slot-scope="scope">-->
@@ -78,18 +80,17 @@
             {{ scope.row.物料规格 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="物料型号" width="100px" show-overflow-tooltip>
+        <el-table-column align="center" label="物料型号" width="150px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
-
         <el-table-column label="采购数量" align="center" width="80px">
           <template slot-scope="scope">
             {{ scope.row.数量 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="采购单价(元)" width="105px">
+        <el-table-column align="center" label="采购单价(元)" width="110px">
           <template slot-scope="scope">
             {{ Number(scope.row.单价).toFixed(2) }}
           </template>
@@ -104,7 +105,7 @@
             {{ scope.row.小计 ? scope.row.小计.toFixed(2) : 0.00 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="领用时间" width="110px" show-overflow-tooltip>
+        <el-table-column align="center" label="领用时间" prop="领用时间" width="110px" sortable="custom" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.出库时间.substr(0,10) }}
           </template>
@@ -145,7 +146,10 @@ export default {
       pageSize: 50,
       total: 0,
       sum: 0,
-      machinenum: ''
+      machinenum: '',
+      totalPrice: 0.00,
+      partName: '',
+      order: ''
     }
   },
   created() {
@@ -250,6 +254,20 @@ export default {
       })
       return sums
     },
+    sortChange(column, prop, order) {
+      console.log(column + '-' + column.prop + '-' + column.order, 11111)
+      if (column.prop === '领用时间') {
+        this.partName = 1
+      } else {
+        this.partName = ''
+      }
+      if (column.order === 'ascending') {
+        this.order = 1
+      } else if (column.order === 'descending') { this.order = 2 } else {
+        this.order = ''
+      }
+      this.searchProject()
+    },
     searchProject() { // 查询
       // if (!this.projectValue) {
       //   this.$message.error('请选择项目')
@@ -259,14 +277,17 @@ export default {
       this.groupValue ? check3 = 1 : check3 = 0
       this.machinenum ? check4 = 1 : check4 = 0
       this.loading = true
-      searchReceiveCheck(0, this.projectValue, check2, this.machine, check3, this.groupValue, check4, this.machinenum, this.pageCurrent, this.pageSize).then(response => {
+      searchReceiveCheck(0, this.projectValue, check2, this.machine, check3, this.groupValue, check4, this.machinenum, this.pageCurrent, this.pageSize, this.order, this.partName).then(response => {
         this.tableData1 = response.data.result
+        // for (let i = 0; i <= response.data.rows.length; i++) {
+        //   this.totalPrice = (Number(this.totalPrice) + Number(response.data.rows[i].数量) * Number(response.data.rows[i].单价)).toFixed(2)
+        // }
         this.total = parseInt(response.data.output[0].ItemCount)
         this.loading = false
       }).then(() => {
         searchsum(0, this.projectValue, check2, this.machine, check3, this.groupValue, check4, this.machinenum).then(res => {
-          console.log(res.data)
-          this.sum = Number(res.data[0].合计).toFixed(2)
+          console.log(res.data, 121)
+          this.totalPrice = Number(res.data[0].合计).toFixed(2)
         })
       }).catch(() => {})
       this.loading = false
diff --git a/src/views/PurchasingCenter/SupplierManagement/index.vue b/src/views/PurchasingCenter/SupplierManagement/index.vue
index 14a41cee..dfb575ba 100644
--- a/src/views/PurchasingCenter/SupplierManagement/index.vue
+++ b/src/views/PurchasingCenter/SupplierManagement/index.vue
@@ -3,10 +3,10 @@
     <el-card>
       <el-form ref="form1" :model="form1" label-position="right" label-width="70px" class="searchForm">
         <el-row>
-          <el-col style="width: 250px">
-            <el-form-item label="供应商">
-              <el-input v-model="supplierName" placeholder="供应商名称" size="small" clearable/>
-            </el-form-item>
+          <el-col style="width: 180px">
+            <!--            <el-form-item label="供应商">-->
+            <el-input v-model="supplierName" placeholder="供应商名称" size="small" clearable @change="fetchData"/>
+            <!--            </el-form-item>-->
           </el-col>
           <!--          <el-col style="width: 250px">-->
           <!--            <el-form-item label="法人">-->
@@ -63,16 +63,16 @@
           <!--              <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="primary" size="small" icon="el-icon-search" plain @click="pageCurrent = 1;fetchData()">查询</el-button>
-            <el-button type="warning" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px" @click="handleAdd()">新增供应商</el-button>
+          <el-col style="width: 250px;margin:0px 0 0 15px">
+            <!--            <el-button type="primary" size="small" icon="el-icon-search" plain @click="pageCurrent = 1;fetchData()">查询</el-button>-->
+            <el-button type="warning" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px" @click="handleAdd()">供应商</el-button>
           </el-col>
         </el-row>
       </el-form>
     </el-card>
 
     <el-card>
-      <div style="display: inline-block;margin-bottom: 5px">供应商列表</div>
+      <!--      <div style="display: inline-block;margin-bottom: 5px">供应商列表</div>-->
       <el-table v-loading="loading" :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">
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index b7bca57f..53852391 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -4,7 +4,7 @@
       <div style="white-space: nowrap">
         <el-card style="margin-left: 0px;width:740px; display: inline-block;">
           <el-col>
-            <el-input v-model="partDrawingNumber" placeholder="零件图号" size="small" clearable style="margin: 3px 0;width: 180px" @keyup.enter.native="searchTable1"/>
+            <el-input v-model="partDrawingNumber" placeholder="机床号或零件图号或零件名称" size="small" clearable style="margin: 3px 0;width: 200px" @keyup.enter.native="searchTable1"/>
             <el-tooltip :open-delay="1200" effect="dark" content="查询备料零件" placement="top">
               <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
             </el-tooltip>
@@ -70,7 +70,11 @@
         <el-card style="margin-left: 1px;width:1120px; display: inline-block;">
           <div> <!--slot="header"-->
             <!--<el-input v-model="purchasingOrder" placeholder="采购计划单号" size="small" style="margin: 3px 0;width: 155px" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()"/>-->
-            <el-select v-model="supplierName0" placeholder="供应商" style="width: 220px" size="small" filterable clearable @change="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">
+            <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addPurchaseOrder">外购备料</el-button>
+            <el-tooltip :open-delay="1200" effect="dark" content="向选择的采购计划里添加采购零件" placement="top">
+              <el-button :disabled="Number(采购计划状态)===3 || Number(采购计划状态)===4" type="primary" plain size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button>
+            </el-tooltip>
+            <el-select v-model="supplierName0" placeholder="供应商" style="width: 220px;margin-left: 10px" size="small" filterable clearable @change="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">
               <el-option
                 v-for="item in supplierName0s"
                 :key="item.value"
@@ -94,10 +98,6 @@
             <!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>-->
             <!--</el-tooltip>-->
             <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable2">查询</el-button>
-            <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addPurchaseOrder">外购备料</el-button>
-            <el-tooltip :open-delay="1200" effect="dark" content="向选择的采购计划里添加采购零件" placement="top">
-              <el-button :disabled="Number(采购计划状态)===3 || Number(采购计划状态)===4" type="primary" plain size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button>
-            </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">
               <el-button :disabled="Number(采购计划状态)===3 || Number(采购计划状态)===4" type="success" size="small" icon="el-icon-tickets" plain style="margin-top: 3px;margin-left: 90px" @click="saveMateriel">保存</el-button>
             </el-tooltip>
@@ -108,12 +108,12 @@
             :header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}"
             border
             stripe
-            style="max-height: 460px;width: 930px"
+            style="max-height: 460px;width: 1120px"
             height="230px"
             size="mini"
             highlight-current-row
             @row-click="searchTable3">
-            <el-table-column label="进程" prop="采购计划状态" align="center" width="60" fixed="left">
+            <el-table-column label="进程" prop="采购计划状态" align="center" width="80" fixed="left">
               <template slot-scope="scope">
                 <span v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">编辑中</span>
                 <span v-if="Number(scope.row.采购计划状态)===1" type="primary" size="mini">已保存</span>
@@ -121,33 +121,33 @@
                 <span v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</span>
               </template>
             </el-table-column>
-            <el-table-column label="外购备料单号" prop="采购单号" align="center" width="130">
+            <el-table-column label="外购备料单号" prop="采购单号" align="center" width="180">
               <template slot-scope="scope">
                 {{ scope.row.采购单号 }}
               </template>
             </el-table-column>
-            <el-table-column label="外购备料单名称" prop="采购单名称" align="center" width="160">
+            <el-table-column label="外购备料单名称" prop="采购单名称" align="center" width="180">
               <template slot-scope="scope">
                 {{ scope.row.采购单名称 }}
               </template>
             </el-table-column>
             <!--<el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" width="200" show-overflow-tooltip>-->
-            <el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" width="190" show-overflow-tooltip>
+            <el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" width="250" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.供应商名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="采购员" prop="姓名" align="center" width="70" show-overflow-tooltip>
+            <el-table-column label="采购员" prop="姓名" align="center" width="110" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.姓名 }}
               </template>
             </el-table-column>
-            <el-table-column label="计划完成" align="center" width="110">
+            <el-table-column label="计划完成" align="center" width="120">
               <template slot-scope="scope">
                 {{ scope.row.计划完成日期.split(' ')[0] }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="190px">
+            <el-table-column label="操作" align="center" width="170px">
               <template slot-scope="scope">
                 <el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top">
                   <div style="display: inline-block">
@@ -203,7 +203,7 @@
                 <span v-if="Number(scope.row.是否到货)===2" type="info" size="mini">已结算</span>
               </template>
             </el-table-column>
-            <el-table-column label="物料编码" prop="物料零件编码" align="center" width="140" show-overflow-tooltip>
+            <el-table-column label="物料编码" prop="物料零件编码" align="center" width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.物料零件编码 }}
               </template>
@@ -213,17 +213,17 @@
                 {{ scope.row.零件名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="材料" prop="材料" align="center" width="80">
+            <el-table-column label="材料" prop="材料" align="center" width="140">
               <template slot-scope="scope">
                 {{ scope.row.材料 }}
               </template>
             </el-table-column>
-            <el-table-column label="数量" align="center" width="115">
+            <el-table-column label="数量" align="center" width="135">
               <template slot-scope="scope">
                 <el-input-number :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.采购数量" :min="0" size="mini" style="width: 100%" @change="saveWeight(scope.$index, scope.row)"/>
               </template>
             </el-table-column>
-            <el-table-column label="成品尺寸（长、宽、高）" align="center" min-width="120px">
+            <el-table-column label="成品尺寸（长、宽、高）" align="center" width="180px">
               <template slot-scope="scope">
                 <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.成品尺寸" size="mini" style="width:100%" @change="saveWeight(scope.$index, scope.row)"/>
               </template>
@@ -233,7 +233,7 @@
                 <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.单位" size="mini" style="width:100%" @change="saveMoney(scope.$index, scope.row)"/>
               </template>
             </el-table-column>
-            <el-table-column label="备注" align="center" prop="备注" min-width="100px">
+            <el-table-column label="备注" align="center" prop="备注" width="130px">
               <template slot-scope="scope">
                 <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.备注1" size="mini" style="width:100%" @change="saveRemarks(scope.$index, scope.row)"/>
               </template>
diff --git a/src/views/WorkshopProcurement/OfflineProcurement/index.vue b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
index 7e0191bd..03bf156f 100644
--- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue
+++ b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
@@ -516,6 +516,7 @@ export default {
     submitAddPurchaseOrder() { // 新建采购单
       this.$refs['form2'].validate((valid) => {
         if (valid) {
+          this.supplierName = this.form2.supplierNameValue
           addPurchaseOrder(this.form2.计划名称, this.form2.supplierNameValue).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('新建离线外购备料成功')
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
index 59faa355..fb69c62e 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -79,6 +79,11 @@
             {{ scope.row.开票金额.toFixed(2) }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="到货金额(元)" width="110px">
+          <template slot-scope="scope">
+            {{ Number(scope.row.到货金额).toFixed(2) }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="供应商" prop="供应商名称" min-width="190px" width="190px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -142,7 +147,7 @@
     </el-card>
     <el-card style="float: left;margin-left: 5px">
       <el-table :data="gridData" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" :summary-method="getSummaries" class="subTableHeader" show-summary border size="mini" style="width: 100%">
-        <el-table-column width="50" align="center" type="index" label="序号"/>
+        <el-table-column width="55" align="center" type="index" label="序号"/>
         <el-table-column label="到货单编号" align="center" width="120px">
           <template slot-scope="scope">
             {{ scope.row.到货单编号 }}
@@ -499,6 +504,15 @@ export default {
                 this.$message.success('增加成功')
                 this.dialogVisible1 = false
                 this.searchTable1()
+                this.gongyingshang = []
+                getGongyingshang().then(response => {
+                  for (let i = 0; i < response.data.length; i++) {
+                    this.gongyingshang.push({
+                      label: response.data[i].供应商名称,
+                      value: response.data[i].供应商
+                    })
+                  }
+                })
               } else {
                 this.$message.error('增加失败')
               }
@@ -553,6 +567,15 @@ export default {
           if (response.data[0].result === '1') {
             this.$message.success('删除成功')
             this.searchTable1()
+            this.gongyingshang = []
+            getGongyingshang().then(response => {
+              for (let i = 0; i < response.data.length; i++) {
+                this.gongyingshang.push({
+                  label: response.data[i].供应商名称,
+                  value: response.data[i].供应商
+                })
+              }
+            })
           } else { this.$message.error('删除失败') }
         })
       }).catch(() => {
@@ -589,6 +612,7 @@ export default {
           if (response.data[0].result === '1') {
             this.$message.success('关联成功')
             this.dialogVisible = false
+            this.searchTable1()
             searchInvoiceDetail(this.发票流水号).then(response => {
               this.gridData = response.data
             })
@@ -597,15 +621,15 @@ export default {
       }
     },
     deleteTable10(row) {
-      this.$confirm('确认删除吗?', '提示', {
+      this.$confirm('确认取消关联吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         deleteInvoiceMX(row.发票明细流水号, row.到货单流水号).then(response => {
-          console.log(response.data)
           if (response.data[0].result === '1') {
             this.$message.success('取消成功')
+            this.searchTable1()
             searchInvoiceDetail(this.发票流水号).then(response => {
               this.gridData = response.data
             })
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
index 89d4eb7a..deb4c2ad 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
@@ -81,17 +81,17 @@
             {{ scope.row.采购数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="备料时间" align="center" prop="下单日期" sortable="custom" width="120">
-          <template slot-scope="scope">
-            {{ scope.row.下单日期 ? scope.row.下单日期.split(' ')[0] : '' }}
-          </template>
-        </el-table-column>
         <el-table-column
           label="到货件数"
           align="center"
           width="100">
           <template slot-scope="scope">{{ scope.row.到货数量 }}</template>
         </el-table-column>
+        <el-table-column label="备料时间" align="center" prop="下单日期" sortable="custom" width="120">
+          <template slot-scope="scope">
+            {{ scope.row.下单日期 ? scope.row.下单日期.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
         <el-table-column
           label="到货时间"
           align="center"
diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
index 3513bda8..a54a15d1 100644
--- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
@@ -11,7 +11,7 @@
               size="small"
               type="daterange"
               align="center"
-              style="width: 240px;margin: 3px 0"
+              style="width: 240px;margin-top: 5px;margin-bottom: 5px"
               value-format="yyyy-MM-dd"
               format="yyyy-MM-dd"
               range-separator="～"
@@ -32,11 +32,11 @@
               <el-button class="button111" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
             </el-tooltip>
             <el-tooltip :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
-              <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 130px" @click="exportExcel">导出</el-button>
+              <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 290px" @click="exportExcel">导出</el-button>
             </el-tooltip>
           </el-col>
         </el-card>
-        <el-card style="margin-left: 0px;width: 1135px;margin-left: 0px;display: inline-block" >
+        <el-card style="margin-left: 0px;width: 1185px;margin-left: 0px;display: inline-block" >
           <el-table
             v-loading=""
             :data="tableData1"
@@ -52,7 +52,7 @@
             show-summary
             highlight-current-row
             @row-click="searchTable02">
-            <el-table-column label="供应商" prop="供应商名称" align="center" min-width="180" width="350" show-overflow-tooltip>
+            <el-table-column label="供应商" prop="供应商名称" align="center" min-width="180" width="320" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.供应商名称 }}
               </template>
@@ -62,16 +62,21 @@
                 {{ scope.row.请款时间 | formatTime }}
               </template>
             </el-table-column>
-            <el-table-column label="请款人" align="center" min-width="80" width="100">
+            <el-table-column label="请款人" align="center" min-width="80" width="90">
               <template slot-scope="scope">
                 {{ scope.row.姓名 }}
               </template>
             </el-table-column>
-            <el-table-column label="请款金额(元)" align="center" min-width="90" width="90" prop="请款金额">
+            <el-table-column label="请款金额(元)" align="center" min-width="90" width="105" prop="请款金额">
               <template slot-scope="scope">
                 {{ parseFloat(scope.row.请款金额).toFixed(2) }}
               </template>
             </el-table-column>
+            <el-table-column label="到票金额(元)" align="center" min-width="90" width="105" prop="到票金额">
+              <template slot-scope="scope">
+                {{ parseFloat(scope.row.到票金额).toFixed(2) }}
+              </template>
+            </el-table-column>
             <el-table-column label="审批进程" width="80" align="center">
               <template slot-scope="scope">
                 <span v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</span>
@@ -84,7 +89,7 @@
                 {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
               </template>
             </el-table-column>
-            <el-table-column label="付款情况" width="100" align="center">
+            <el-table-column label="付款情况" width="80" align="center">
               <template slot-scope="scope">
                 <span v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</span>
                 <span v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</span>
@@ -96,7 +101,7 @@
                 {{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="80">
+            <el-table-column label="操作" align="center" width="70">
               <template slot-scope="scope">
                 <el-tooltip effect="dark" content="取消请款" placement="top">
                   <div style="display: inline-block">
@@ -118,24 +123,37 @@
               @current-change="handleCurrentChange1"/>
           </div>
         </el-card>
-        <el-card style="margin-left: 0px;width:524px; margin-left: 1px; display: inline-block;vertical-align: top">
+        <el-card style="margin-left: 0px;width:474px; margin-left: 1px; display: inline-block;vertical-align: top">
           <el-table :data="gridData" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" :summary-method="getSummaries" border class="subTableHeader" size="mini" show-summary style="">
             <el-table-column width="50" align="center" type="index" label="序号"/>
-            <el-table-column min-width="120" align="center" label="发票号">
+            <el-table-column width="200" align="center" label="发票号">
               <template slot-scope="scope">
                 {{ scope.row.发票号 }}
               </template>
             </el-table-column>
-            <el-table-column width="100" align="center" label="开票日期" show-overflow-tooltip>
+            <el-table-column width="100" align="center" label="到票日期" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.开票时间 ? scope.row.开票时间.split(' ')[0] : '' }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="开票金额" width="100px" prop="开票金额">
+            <el-table-column align="center" label="开票金额" width="100px" prop="到票金额">
               <template slot-scope="scope">
                 {{ scope.row.开票金额.toFixed(2) }}
               </template>
             </el-table-column>
+            <!--<el-table-column min-width="100" width="60" align="center" label="操作">-->
+            <!--<template slot-scope="scope">-->
+            <!--<el-tooltip effect="dark" content="取消关联" placement="top">-->
+            <!--<div style="display: inline-block">-->
+            <!--<el-button-->
+            <!--type="text"-->
+            <!--size="mini"-->
+            <!--icon="el-icon-right"-->
+            <!--@click="deleteTable10(scope.row)"/>-->
+            <!--</div>-->
+            <!--</el-tooltip>-->
+            <!--</template>-->
+            <!--</el-table-column>-->
           </el-table>
         </el-card>
         <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="外购备料请款" center style="min-height: 300px" width="800px">
@@ -159,12 +177,12 @@
                 {{ scope.row.供应商名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="开票金额" align="center" min-width="70">
+            <el-table-column label="到票金额" align="center" min-width="70">
               <template slot-scope="scope">
                 {{ Number(scope.row.开票金额).toFixed(2) }}
               </template>
             </el-table-column>
-            <el-table-column label="开票时间" align="center" min-width="70">
+            <el-table-column label="到票时间" align="center" min-width="70">
               <template slot-scope="scope">
                 {{ scope.row.开票时间 | formatTime }}
               </template>
@@ -177,7 +195,7 @@
     </div>
   </div>
 </template>
-<script>import { searchRequestFund, searchOfflineContract, searchOfflineContract1, submitRequestFund, searchRequsetFundDetail, cancelRequestFund } from '@/api/WorkshopProcurement/RequestOutsourcingMaterials'
+<script>import { searchRequestFund, searchOfflineContract, searchOfflineContract1, submitRequestFund, searchRequsetFundDetail, cancelRequestFund, deleteRequsetFundMX } from '@/api/WorkshopProcurement/RequestOutsourcingMaterials'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -188,6 +206,7 @@ export default {
       check2: 0,
       dateRange: '',
       expands: [],
+      requestNumber: '',
       pickerOptions: {
         shortcuts: [{
           text: '上季度',
@@ -404,11 +423,35 @@ export default {
       //     this.b = row.采购计划请款流水号
       //   }
       // }
+      this.requestNumber = row.采购计划请款流水号
       searchRequsetFundDetail(row.采购计划请款流水号).then(response => {
         this.gridData = response.data
         console.log(response.data, 2222)
       })
     },
+    deleteTable10(row) {
+      this.$confirm('确认取消关联吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteRequsetFundMX(row.采购计划请款明细流水号, row.发票流水号).then(response => {
+          console.log(response.data)
+          if (response.data[0].result === '1') {
+            this.$message.success('取消成功')
+            this.searchTable1()
+            searchRequsetFundDetail(this.requestNumber).then(response => {
+              this.gridData = response.data
+            })
+          } else { this.$message.error('取消失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
+      })
+    },
     getRowKeys(row) {
       return row.采购计划请款流水号
     },
diff --git a/src/views/layout/components/TagsView.vue b/src/views/layout/components/TagsView.vue
index 32c40202..5014b9d9 100644
--- a/src/views/layout/components/TagsView.vue
+++ b/src/views/layout/components/TagsView.vue
@@ -76,6 +76,9 @@ export default {
         case 'RequestOutsourcingMaterials': // 外购备料请款
           document.getElementById('app-main').style.width = '1710px'
           break
+        case 'OutsourcingMaterialsInvoice': // 外购备料到票
+          document.getElementById('app-main').style.width = '1480px'
+          break
         case 'OfflineProcurement': // 外购备料(离线)
           document.getElementById('app-main').style.width = '1950px'
           break