From ea3bf600f3db602bbd3d3a874baf27763c7feaee Mon Sep 17 00:00:00 2001
From: bryan sun <hitsjt@gmail.com>
Date: Wed, 23 Oct 2019 19:04:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreateWarehousePurchasing.js              |  34 +
 src/api/ManufacturingCenter/StatusQuery.js    |   5 +-
 src/utils/request.js                          |   2 +-
 .../AssemblyQualityInspection/index.vue       |  12 +-
 .../index.vue                                 |  32 +-
 .../SparePartsOutStockRecord/index.vue        |  10 +-
 .../Inventory/CreatePickingList/index.vue     |  52 +-
 src/views/Inventory/InventoryCheck/index.vue  |  12 +-
 src/views/Inventory/MaterialOut/index.vue     |  12 +-
 src/views/Inventory/OfflinePartOut/index.vue  |   8 +-
 .../Inventory/OfflinePartsStorage/index.vue   |   6 +-
 src/views/Inventory/OutPartSelect/index.vue   |  12 +-
 .../Inventory/PurchaseInRecord/index.vue      |  20 +-
 .../Inventory/PurchasePartsStorage/index.vue  |   6 +-
 src/views/Inventory/StockInquiry/index.vue    |  12 +-
 .../ActualTimeSupplement/index.vue            |  12 +-
 .../CreatePreparationBill/index.vue           |   6 +-
 .../CreateWarehousePurchasing/index.vue       |  74 +-
 .../InitialProduction/index.vue               |   9 +-
 .../InventoryQuery/index.vue                  |  10 +-
 .../MaterialArrivalManagement/index.vue       |   8 +-
 .../PartAssignment/index.vue                  |  10 +-
 .../PartWorkCraftSelect_rdlc/index.vue        |  10 +-
 .../ProcessTaskAssignment/index.vue           |   4 +-
 .../ProductionCapacityBalance/index.vue       |   4 +-
 .../SparePartsForScrap/index.vue              |   2 -
 .../ManufacturingCenter/StatusQuery/index.vue |  83 +--
 .../WorkshopEquipmentManagement/index.vue     |   8 +-
 src/views/MarketingCenter/BidBond/index.vue   |   6 +-
 src/views/MarketingCenter/CRM/index.vue       |   2 +-
 .../ComprehensiveInquiryMS/index.vue          |   8 +-
 .../ContractCapitalManagement/index.vue       |   8 +-
 .../ContractInformationManagement/index.vue   |   6 +-
 .../MarketingCenter/CreateProject/index.vue   |   6 +-
 .../MarketingCenter/InvoiceRecord/index.vue   |   4 +-
 .../MarketingCenter/PerformanceBond/index.vue |   8 +-
 .../MarketingCenter/SafetyMargin/index.vue    |   8 +-
 .../InterBudgetaryBudgets/index.vue           |   8 +-
 .../OutsourcingDataMaintenance/index.vue      |   1 -
 .../index.vue                                 |  16 +-
 .../Outsourcing/OutsourcingQCSearch/index.vue |   4 +-
 .../OutsourcingTaskExecution/index.vue        |  16 +-
 .../OutsourcingTaskQuery/index.vue            |  10 +-
 .../Outsourcing/PreorderAssociation/index.vue |   8 +-
 .../ArrivalStateSearch/index.vue              |   8 +-
 .../BacklogGoodsAnalysis/index.vue            |  16 +-
 .../InvoiceSettlementApplication/index.vue    |   8 +-
 .../MaterialManagement/index.vue              |   8 +-
 .../OfflineContract/index.vue                 | 700 ++++++++++++++----
 .../OfflineContractRequestFund/index.vue      |   6 +-
 .../PurchasingCenter/PayStateSearch/index.vue |  14 +-
 .../PurchaseContractRequestFund/index.vue     |  14 +-
 .../PurchaseContractSearch/index.vue          |  10 +-
 .../PurchaseSituationSearch/index.vue         |  42 +-
 .../PurchaseTaskAllocate/index.vue            |  52 +-
 .../PurchasingCenter/SetPayPlan/index.vue     |   6 +-
 .../TechnologyCenter/QueryParts/index.vue     |  34 +-
 .../CreatingPurchasingMaterials/index.vue     |  24 +-
 .../InvoiceSettlementApplication1/index.vue   |  14 +-
 .../NewArrivalList/index.vue                  |  12 +-
 .../OutsourcingMaterialsInvoice/index.vue     |   8 +-
 .../PurchaseContractRequestFund1/index.vue    |   6 +-
 .../RequestOutsourcingMaterials/index.vue     |   2 +-
 63 files changed, 1031 insertions(+), 547 deletions(-)

diff --git a/src/api/ManufacturingCenter/CreateWarehousePurchasing.js b/src/api/ManufacturingCenter/CreateWarehousePurchasing.js
index b4485499..08f2eb1d 100644
--- a/src/api/ManufacturingCenter/CreateWarehousePurchasing.js
+++ b/src/api/ManufacturingCenter/CreateWarehousePurchasing.js
@@ -109,3 +109,37 @@ export function updateNumber(...params) {
     }
   })
 }
+export function getperson(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: 'select * from dbo.人事档案管理_人员名单 inner join dbo.菜单系统模块_人员与角色 ' +
+        'on 人事档案管理_人员名单.人员编号=菜单系统模块_人员与角色.人员编号 ' +
+        'where 角色编号=3 or 角色编号=2'
+    }
+  })
+}
+export function tiaozheng(formNumber, PersonValue) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_仓库采购_表单_采购分配',
+      param: `表单流水号=${formNumber}&采购员编号=${PersonValue}`
+    }
+  })
+}
+export function deletematerial(id) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_仓库采购_表单明细_删除',
+      param: `id=${id}`
+    }
+  })
+}
diff --git a/src/api/ManufacturingCenter/StatusQuery.js b/src/api/ManufacturingCenter/StatusQuery.js
index e27efdec..d7f4f7ed 100644
--- a/src/api/ManufacturingCenter/StatusQuery.js
+++ b/src/api/ManufacturingCenter/StatusQuery.js
@@ -44,15 +44,14 @@ export function searchgroup(num, pageCurrent, pageSize) {
     }
   })
 }
-export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, check3, partNumber, check4, partStateValue, check5, partTypeValue, pageSize, pageCurrent) {
+export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, check3, partNumber, check4, partStateValue, check5, partTypeValue) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int',
-      pagination: pageCurrent + '&' + pageSize
+      param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int'
     }
   })
 }
diff --git a/src/utils/request.js b/src/utils/request.js
index e9cf8a39..56ffd77d 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue
index 44c6d4ca..66f033bf 100644
--- a/src/views/Assembly/AssemblyQualityInspection/index.vue
+++ b/src/views/Assembly/AssemblyQualityInspection/index.vue
@@ -41,34 +41,34 @@
     </el-card>
     <el-card>
       <el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="600px">
-        <el-table-column align="center" sortable prop="是否合格" label="检验情况" width="80px">
+        <el-table-column align="center" prop="是否合格" label="检验情况" width="80px">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.是否合格)===0||scope.row.是否合格===''" type="primary" size="small" @click="approvalPass(scope.row)">未检验</el-tag>
             <el-tag v-if="parseInt(scope.row.是否合格)===1" type="success" size="small">合格</el-tag>
             <el-tag v-if="parseInt(scope.row.是否合格)===2" type="error" size="small">不合格</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="机床图号" sortable prop="机床图号" align="center" width="120px">
+        <el-table-column label="机床图号" prop="机床图号" align="center" width="120px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" sortable prop="机床名称" align="center" width="260px">
+        <el-table-column label="机床名称" prop="机床名称" align="center" width="260px">
           <template slot-scope="scope">
             {{ scope.row.机床名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="组号" sortable prop="组号" align="center" width="100px">
+        <el-table-column label="组号" prop="组号" align="center" width="100px">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="部件名称" sortable prop="组件名称" align="center" width="100px">
+        <el-table-column label="部件名称" prop="组件名称" align="center" width="100px">
           <template slot-scope="scope">
             {{ scope.row.组件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="检测项" sortable prop="检测项" align="center" width="100px">
+        <el-table-column label="检测项" prop="检测项" align="center" width="100px">
           <template slot-scope="scope">
             {{ scope.row.检测项 }}
           </template>
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index 431b6412..3de576d4 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -256,27 +256,27 @@
     <el-card>
       <h4 style="margin-left: 45%;">正在加工零件列表</h4>
       <el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
-        <el-table-column label="机床图号" sortable prop="机床图号" align="center">
+        <el-table-column label="机床图号" prop="机床图号" align="center">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" sortable prop="机床名称" align="center" min-width="200px">
+        <el-table-column label="机床名称" prop="机床名称" align="center" min-width="200px">
           <template slot-scope="scope">
             {{ scope.row.机床名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="组号" sortable prop="组号" align="center">
+        <el-table-column label="组号" prop="组号" align="center">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" sortable prop="零件图号" align="center" min-width="110px">
+        <el-table-column label="零件图号" prop="零件图号" align="center" min-width="110px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" sortable prop="零件名称" align="center">
+        <el-table-column label="零件名称" prop="零件名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
@@ -286,17 +286,17 @@
             {{ scope.row.批次数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="工序名称" sortable prop="工艺名称" align="center">
+        <el-table-column label="工序名称" prop="工艺名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.工艺名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="工位" sortable prop="终端编号" align="center" width="100px">
+        <el-table-column label="工位" prop="终端编号" align="center" width="100px">
           <template slot-scope="scope">
             {{ scope.row.终端编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作工" sortable prop="姓名" align="center">
+        <el-table-column label="操作工" prop="姓名" align="center">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
@@ -326,27 +326,27 @@
     <el-card>
       <h4 style="margin-left: 45%;">待加工零件列表</h4>
       <el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
-        <el-table-column label="机床图号" sortable prop="机床图号" align="center" width="110px">
+        <el-table-column label="机床图号" prop="机床图号" align="center" width="110px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" sortable prop="机床名称" align="center" min-width="200px">
+        <el-table-column label="机床名称" prop="机床名称" align="center" min-width="200px">
           <template slot-scope="scope">
             {{ scope.row.机床名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="组号" sortable prop="组号" align="center" width="70px">
+        <el-table-column label="组号" prop="组号" align="center" width="70px">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" sortable prop="零件图号" align="center" width="140px">
+        <el-table-column label="零件图号" prop="零件图号" align="center" width="140px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" sortable prop="零件名称" align="center" min-width="120px">
+        <el-table-column label="零件名称" prop="零件名称" align="center" min-width="120px">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
@@ -356,17 +356,17 @@
             {{ scope.row.批次数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="工序名称" sortable prop="工艺名称" align="center">
+        <el-table-column label="工序名称" prop="工艺名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.工艺名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="工位" sortable prop="mes终端编号" align="center" width="80px">
+        <el-table-column label="工位" prop="mes终端编号" align="center" width="80px">
           <template slot-scope="scope">
             {{ scope.row.mes终端编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作工" sortable prop="姓名" align="center">
+        <el-table-column label="操作工" prop="姓名" align="center">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue
index e24dca01..cfb78bea 100644
--- a/src/views/Assembly/SparePartsOutStockRecord/index.vue
+++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue
@@ -46,27 +46,27 @@
     </el-card>
     <el-card>
       <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 3px" height="550px">
-        <el-table-column label="项目名称" sortable prop="项目名称" align="center">
+        <el-table-column label="项目名称" prop="项目名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床图号" sortable prop="机床图号" align="center">
+        <el-table-column label="机床图号" prop="机床图号" align="center">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" sortable prop="零件图号" align="center">
+        <el-table-column label="零件图号" prop="零件图号" align="center">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" sortable prop="零件名称" align="center">
+        <el-table-column label="零件名称" prop="零件名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="出库时间" sortable prop="出库时间" align="center">
+        <el-table-column label="出库时间" prop="出库时间" align="center">
           <template slot-scope="scope">
             {{ scope.row.出库时间 }}
           </template>
diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue
index dc5aeb53..e161c9ec 100644
--- a/src/views/Inventory/CreatePickingList/index.vue
+++ b/src/views/Inventory/CreatePickingList/index.vue
@@ -37,27 +37,27 @@
         <el-tab-pane label="标准件" name="标准件">
           <el-table ref="multipleTable" :data="tableData0" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50"/>
-            <el-table-column align="center" sortable prop="机床图号" label="机床图号" min-width="100px">
+            <el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="组号" label="组号" min-width="80px">
+            <el-table-column align="center" prop="组号" label="组号" min-width="80px">
               <template slot-scope="scope">
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="物料名称" label="名称" min-width="100px">
+            <el-table-column align="center" prop="物料名称" label="名称" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.物料名称 }}
               </template>date
             </el-table-column>
-            <el-table-column align="center" sortable prop="型号" label="型号" min-width="100px">
+            <el-table-column align="center" prop="型号" label="型号" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.物料型号 || '—' }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="规格排序" label="规格" min-width="200px">
+            <el-table-column align="center" prop="规格排序" label="规格" min-width="200px">
               <template slot-scope="scope">
                 {{ scope.row.物料规格 || '—' }}
               </template>
@@ -98,27 +98,27 @@
         <el-tab-pane label="外购件" name="外购件">
           <el-table ref="multipleTable" :data="tableData1" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50"/>
-            <el-table-column align="center" sortable prop="机床图号" label="机床图号" min-width="100px">
+            <el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="组号" label="组号" min-width="80px">
+            <el-table-column align="center" prop="组号" label="组号" min-width="80px">
               <template slot-scope="scope">
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="物料名称" label="名称" min-width="100px">
+            <el-table-column align="center" prop="物料名称" label="名称" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.物料名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="型号" label="型号" min-width="100px">
+            <el-table-column align="center" prop="型号" label="型号" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.物料型号 || '—' }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="物料规格" label="规格" min-width="200px">
+            <el-table-column align="center" prop="物料规格" label="规格" min-width="200px">
               <template slot-scope="scope">
                 {{ scope.row.物料规格 || '—' }}
               </template>
@@ -154,27 +154,27 @@
         <el-tab-pane label="基本件" name="基本件">
           <el-table ref="multipleTable" :data="tableData2" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50"/>
-            <el-table-column align="center" sortable prop="机床图号" label="机床图号" min-width="100px">
+            <el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="组号" label="组号" min-width="80px">
+            <el-table-column align="center" prop="组号" label="组号" min-width="80px">
               <template slot-scope="scope">
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="零件名称" label="名称" min-width="100px">
+            <el-table-column align="center" prop="零件名称" label="名称" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.零件名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="图号" sortable prop="零件图号" min-width="100px">
+            <el-table-column align="center" label="图号" prop="零件图号" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="规格" label="规格" min-width="100px">
+            <el-table-column align="center" prop="规格" label="规格" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.规格 || '—' }}
               </template>
@@ -228,7 +228,7 @@
       </el-tooltip>
       <el-table :data="pickListTable1" highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="clickList">
         <el-table-column label="序号" align="center" type="index" width="50"/>
-        <el-table-column sortable prop="领料单编号" label="领料单编号" align="center" min-width="200">
+        <el-table-column prop="领料单编号" label="领料单编号" align="center" min-width="200">
           <template slot-scope="scope">
             {{ scope.row.领料单编号 }}
           </template>
@@ -238,17 +238,17 @@
             {{ scope.row.操作日期.split(' ')[0] }}
           </template>
         </el-table-column>
-        <el-table-column label="领料人" sortable prop="领料人" align="center" min-width="130">
+        <el-table-column label="领料人" prop="领料人" align="center" min-width="130">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="领料单备注" sortable prop="领料单备注" align="center" min-width="130">
+        <el-table-column label="领料单备注" prop="领料单备注" align="center" min-width="130">
           <template slot-scope="scope">
             {{ scope.row.领料单备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="审批" sortable prop="审批" align="center" min-width="90">
+        <el-table-column label="审批" prop="审批" align="center" min-width="90">
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.是否审批)===1" type="success">已审批</el-tag>
             <el-tag v-else type="warning">未审批</el-tag>
@@ -280,27 +280,27 @@
       <h4>领料单明细：{{ pickingListNumberShow }}</h4>
       <el-table :data="pickListTable2" border style="width: 100%;" size="mini" height="300">
         <el-table-column label="序号" align="center" type="index" width="50"/>
-        <el-table-column label="名称" align="center" sortable prop="名称" min-width="100">
+        <el-table-column label="名称" align="center" prop="名称" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" align="center" sortable prop="图号或型号" min-width="100">
+        <el-table-column label="图号或型号" align="center" prop="图号或型号" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.图号或型号 || '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" align="center" sortable prop="规格" min-width="100">
+        <el-table-column label="规格" align="center" prop="规格" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.规格 || '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="机床图号" align="center" sortable prop="机床图号" min-width="100">
+        <el-table-column label="机床图号" align="center" prop="机床图号" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="组号" align="center" sortable prop="组号" min-width="70">
+        <el-table-column label="组号" align="center" prop="组号" min-width="70">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
@@ -320,13 +320,13 @@
             {{ scope.row.出库数量1 }}
           </template>
         </el-table-column>
-        <el-table-column v-if="true" label="备料确认" align="center" sortable prop="是否备料确认" width="100">
+        <el-table-column v-if="true" label="备料确认" align="center" prop="是否备料确认" width="100">
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.是否备料确认)===1" type="success" size="mini">已备料</el-tag>
             <el-tag v-else type="warning" size="mini">未备料</el-tag>
           </template>
         </el-table-column>
-        <el-table-column v-if="true" label="领料确认" align="center" sortable prop="是否领料确认" width="100">
+        <el-table-column v-if="true" label="领料确认" align="center" prop="是否领料确认" width="100">
           <template slot-scope="scope">
             <el-tag v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领料</el-tag>
             <el-tag v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">未领完</el-tag>
diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue
index b60372b0..cfc9a359 100644
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -32,32 +32,32 @@
         </el-row>
       </div>
       <el-table :data="tableData1" stripe highlight-current-row border style="max-height: 500px;" height="500px" size="mini" show-summary>
-        <el-table-column label="名称" sortable prop="物料名称" align="center" width="150" show-overflow-tooltip>
+        <el-table-column label="名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" sortable prop="物料型号" align="center" width="120" show-overflow-tooltip>
+        <el-table-column label="图号或型号" prop="物料型号" align="center" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" sortable prop="物料规格" align="center" width="130" show-overflow-tooltip>
+        <el-table-column label="规格" prop="物料规格" align="center" width="130" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料来源" sortable prop="物料来源" align="center" width="100">
+        <el-table-column label="物料来源" prop="物料来源" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.物料来源 }}
           </template>
         </el-table-column>
-        <el-table-column label="仓库" sortable prop="仓库名称" align="center" min-width="90">
+        <el-table-column label="仓库" prop="仓库名称" align="center" min-width="90">
           <template slot-scope="scope">
             {{ scope.row.仓库名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="货位" sortable prop="货位名称" align="center" min-width="90">
+        <el-table-column label="货位" prop="货位名称" align="center" min-width="90">
           <template slot-scope="scope">
             {{ scope.row.货位名称 }}
           </template>
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index 1637c170..3a4d2142 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -9,7 +9,7 @@
       <h4 style="margin-top:0">领料单</h4>
       <el-table :data="pickListTable1" stripe highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="clickList">
         <el-table-column label="序号" align="center" type="index" width="50"/>
-        <el-table-column label="领料单编号" sortable prop="领料单编号" align="center" min-width="200">
+        <el-table-column label="领料单编号" prop="领料单编号" align="center" min-width="200">
           <template slot-scope="scope">
             {{ scope.row.领料单编号 }}
           </template>
@@ -19,7 +19,7 @@
             {{ scope.row.操作日期.split(' ')[0] }}
           </template>
         </el-table-column>
-        <el-table-column label="领料人" sortable prop="姓名" align="center" min-width="130">
+        <el-table-column label="领料人" prop="姓名" align="center" min-width="130">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
@@ -62,22 +62,22 @@
       <el-table :data="pickListTable2" highlight-current-row stripe border style="width: 100%;" size="mini" height="400" @selection-change="handleSelectionChange">
         <el-table-column type="selection" align="center" width="55"/>
         <el-table-column label="序号" align="center" type="index" width="50"/>
-        <el-table-column label="名称" sortable prop="名称" align="center" min-width="100">
+        <el-table-column label="名称" prop="名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" sortable prop="图号或型号" align="center" min-width="100">
+        <el-table-column label="图号或型号" prop="图号或型号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.图号或型号 || '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" sortable prop="规格" align="center" min-width="100">
+        <el-table-column label="规格" prop="规格" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.规格 || '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="机床图号" sortable prop="机床图号" align="center" min-width="100">
+        <el-table-column label="机床图号" prop="机床图号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue
index 231d1dbc..e25a1121 100644
--- a/src/views/Inventory/OfflinePartOut/index.vue
+++ b/src/views/Inventory/OfflinePartOut/index.vue
@@ -15,22 +15,22 @@
     <el-card>
       <el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 100%;" height="440" @row-click="searchoutRecord">
         <el-table-column label="序号" align="center" type="index" width="50"/>
-        <el-table-column label="物料名称" sortable prop="物料名称" align="center" min-width="120">
+        <el-table-column label="物料名称" prop="物料名称" align="center" min-width="120">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料型号" sortable prop="物料型号" align="center" min-width="120">
+        <el-table-column label="物料型号" prop="物料型号" align="center" min-width="120">
           <template slot-scope="scope">
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料规格" sortable prop="物料规格" align="center" min-width="120">
+        <el-table-column label="物料规格" prop="物料规格" align="center" min-width="120">
           <template slot-scope="scope">
             {{ scope.row.物料规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="仓库名称" sortable prop="仓库名称" align="center" min-width="80">
+        <el-table-column label="仓库名称" prop="仓库名称" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.仓库名称 }}
           </template>
diff --git a/src/views/Inventory/OfflinePartsStorage/index.vue b/src/views/Inventory/OfflinePartsStorage/index.vue
index 477fc245..1cdd00e6 100644
--- a/src/views/Inventory/OfflinePartsStorage/index.vue
+++ b/src/views/Inventory/OfflinePartsStorage/index.vue
@@ -22,17 +22,17 @@
     <el-card>
       <el-table ref="multipleTable" :data="table1" border stripe size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px" @selection-change="handleSelectionChange">
         <el-table-column :selectable="selectable" type="selection" align="center" width="50px"/>
-        <el-table-column label="合同编号" sortable prop="离线合同编号" width="120px" align="center" show-overflow-tooltip>
+        <el-table-column label="合同编号" prop="离线合同编号" width="120px" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.离线合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="名称" sortable prop="物料名称" width="150px" align="center" show-overflow-tooltip>
+        <el-table-column label="名称" prop="物料名称" width="150px" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格型号" sortable prop="规格型号" width="180px" align="center" show-overflow-tooltip>
+        <el-table-column label="规格型号" prop="规格型号" width="180px" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.规格型号 }}
           </template>
diff --git a/src/views/Inventory/OutPartSelect/index.vue b/src/views/Inventory/OutPartSelect/index.vue
index 260b174e..5d513a9f 100644
--- a/src/views/Inventory/OutPartSelect/index.vue
+++ b/src/views/Inventory/OutPartSelect/index.vue
@@ -40,12 +40,12 @@
           align="center"
           width="55"
           type="index"/>
-        <el-table-column align="center" label="零件名称" sortable prop="零件名称" width="150px">
+        <el-table-column align="center" label="零件名称" prop="零件名称" width="150px">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件图号" sortable prop="零件图号" width="150px">
+        <el-table-column align="center" label="零件图号" prop="零件图号" width="150px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
@@ -55,22 +55,22 @@
             {{ scope.row.出库数量 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="机床图号" sortable prop="机床图号" width="120px">
+        <el-table-column align="center" label="机床图号" prop="机床图号" width="120px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="组号" sortable prop="组号" width="120px">
+        <el-table-column align="center" label="组号" prop="组号" width="120px">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="领料人" sortable prop="出库备注">
+        <el-table-column align="center" label="领料人" prop="出库备注">
           <template slot-scope="scope">
             {{ scope.row.出库备注 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="出库时间" sortable prop="出库时间">
+        <el-table-column align="center" label="出库时间" prop="出库时间">
           <template slot-scope="scope">
             {{ scope.row.出库时间 }}
           </template>
diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue
index 5c096ba6..d9a6b969 100644
--- a/src/views/Inventory/PurchaseInRecord/index.vue
+++ b/src/views/Inventory/PurchaseInRecord/index.vue
@@ -50,17 +50,17 @@
       </div>
       <h4 style="margin-top: 0">采购合同入库</h4>
       <el-table :data="tableData1" border stripe size="mini" style="width: 100%;" height="400">
-        <el-table-column label="名称" sortable prop="名称" align="center" width="100" show-overflow-tooltip>
+        <el-table-column label="名称" prop="名称" align="center" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" sortable prop="图号或型号" align="center" width="120" show-overflow-tooltip>
+        <el-table-column label="图号或型号" prop="图号或型号" align="center" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.图号或型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" sortable prop="规格" align="center" width="120" show-overflow-tooltip>
+        <el-table-column label="规格" prop="规格" align="center" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.规格 }}
           </template>
@@ -70,12 +70,12 @@
             {{ scope.row.入库数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="入库人" sortable prop="入库人" align="center" width="100" show-overflow-tooltip>
+        <el-table-column label="入库人" prop="入库人" align="center" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.入库人 }}
           </template>
         </el-table-column>
-        <el-table-column label="入库时间" sortable prop="入库时间" align="center" min-width="100">
+        <el-table-column label="入库时间" prop="入库时间" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.入库时间 }}
           </template>
@@ -94,17 +94,17 @@
       </div>
       <h4>离线合同入库</h4>
       <el-table :data="tableData2" border stripe size="mini" style="width: 100%;" height="400">
-        <el-table-column label="名称" sortable prop="名称" align="center" width="120" show-overflow-tooltip>
+        <el-table-column label="名称" prop="名称" align="center" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" sortable prop="图号或型号" align="center" width="120" show-overflow-tooltip>
+        <el-table-column label="图号或型号" prop="图号或型号" align="center" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.图号或型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" sortable prop="规格" align="center" width="120" show-overflow-tooltip>
+        <el-table-column label="规格" prop="规格" align="center" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.规格 }}
           </template>
@@ -114,12 +114,12 @@
             {{ scope.row.入库数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="入库人" sortable prop="入库人" align="center" width="100">
+        <el-table-column label="入库人" prop="入库人" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.入库人 }}
           </template>
         </el-table-column>
-        <el-table-column label="入库时间" sortable prop="入库时间" align="center" min-width="100">
+        <el-table-column label="入库时间" prop="入库时间" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.入库时间 }}
           </template>
diff --git a/src/views/Inventory/PurchasePartsStorage/index.vue b/src/views/Inventory/PurchasePartsStorage/index.vue
index 368ba7c7..a02e2cfa 100644
--- a/src/views/Inventory/PurchasePartsStorage/index.vue
+++ b/src/views/Inventory/PurchasePartsStorage/index.vue
@@ -30,17 +30,17 @@
     <el-card>
       <el-table ref="multipleTable" :data="table1" border stripe size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px" @selection-change="handleSelectionChange">
         <el-table-column :selectable="selectable" type="selection" align="center" width="50px"/>
-        <el-table-column label="合同编号" sortable prop="合同编号" width="120px" align="center" show-overflow-tooltip>
+        <el-table-column label="合同编号" prop="合同编号" width="120px" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="名称" sortable prop="物料名称" width="150px" align="center" show-overflow-tooltip >
+        <el-table-column label="名称" prop="物料名称" width="150px" align="center" show-overflow-tooltip >
           <template slot-scope="scope">
             {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格型号" sortable prop="规格型号" width="180px" align="center" show-overflow-tooltip>
+        <el-table-column label="规格型号" prop="规格型号" width="180px" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料规格 ? scope.row.物料规格 : '-' + '&nbsp;' + scope.row.物料型号 ? scope.row.零件图号 : '-' }}
           </template>
diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue
index e0371333..b3f064ab 100644
--- a/src/views/Inventory/StockInquiry/index.vue
+++ b/src/views/Inventory/StockInquiry/index.vue
@@ -40,12 +40,12 @@
           align="center"
           width="55"
           type="index"/>
-        <el-table-column align="center" label="零件名称" sortable prop="零件名称" width="150px">
+        <el-table-column align="center" label="零件名称" prop="零件名称" width="150px">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件图号" sortable prop="零件图号" width="150px">
+        <el-table-column align="center" label="零件图号" prop="零件图号" width="150px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
@@ -55,12 +55,12 @@
             {{ scope.row.入库数量 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="机床图号" sortable prop="机床图号" width="120px">
+        <el-table-column align="center" label="机床图号" prop="机床图号" width="120px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="组号" sortable prop="组号" width="120px">
+        <el-table-column align="center" label="组号" prop="组号" width="120px">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
@@ -70,12 +70,12 @@
             {{ scope.row.仓库名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="货位名称" sortable prop="货位名称" width="120px">
+        <el-table-column align="center" label="货位名称" prop="货位名称" width="120px">
           <template slot-scope="scope">
             {{ scope.row.货位名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="入库时间" sortable prop="入库时间">
+        <el-table-column align="center" label="入库时间" prop="入库时间">
           <template slot-scope="scope">
             {{ scope.row.入库时间 }}
           </template>
diff --git a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
index 5fbbb1a3..2f0ea333 100644
--- a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
+++ b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
@@ -59,12 +59,12 @@
         style="width: 100%;"
         border>
         <el-table-column label="序号" type="index" align="center" width="55"/>
-        <el-table-column label="零件图号" sortable prop="零件图号" align="center" min-width="150px">
+        <el-table-column label="零件图号" prop="零件图号" align="center" min-width="150px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" sortable prop="零件名称" align="center" min-width="120px">
+        <el-table-column label="零件名称" prop="零件名称" align="center" min-width="120px">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
@@ -74,12 +74,12 @@
             {{ scope.row.完成数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="工艺名称" sortable prop="工艺名称" align="center" min-width="90px">
+        <el-table-column label="工艺名称" prop="工艺名称" align="center" min-width="90px">
           <template slot-scope="scope">
             {{ scope.row.工艺名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作者" sortable prop="姓名" align="center" min-width="80px">
+        <el-table-column label="操作者" prop="姓名" align="center" min-width="80px">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
@@ -115,12 +115,12 @@
             <span v-else>{{ scope.row.修补工时 }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="修补操作时间" sortable prop="修补操作时间" align="center" min-width="160px">
+        <el-table-column label="修补操作时间" prop="修补操作时间" align="center" min-width="160px">
           <template slot-scope="scope">
             {{ scope.row.修补操作时间 || '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="修补人" sortable prop="修补人" align="center" min-width="100px">
+        <el-table-column label="修补人" prop="修补人" align="center" min-width="100px">
           <template slot-scope="scope">
             {{ scope.row.修补人 || '—' }}
           </template>
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index 33699390..b39857da 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -27,18 +27,18 @@
           type="selection"
           width="55"
           align="center"/>
-        <el-table-column label="打印状态" sortable prop="备料打印" align="center">
+        <el-table-column label="打印状态" prop="备料打印" align="center">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.备料打印!=='0'" type="success" size="mini">已导出</el-tag>
             <el-tag v-else type="warning" size="mini">未导出</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" sortable prop="零件名称" align="center" >
+        <el-table-column label="零件名称" prop="零件名称" align="center" >
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" sortable prop="零件图号" align="center" >
+        <el-table-column label="零件图号" prop="零件图号" align="center" >
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
diff --git a/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue b/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue
index c3a12a48..22f7cff4 100644
--- a/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue
+++ b/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue
@@ -128,6 +128,7 @@
           @click="addpurchasingDetailsForm">创建采购明细表</el-button>
         <el-tooltip :open-delay="1000" effect="dark" content="将勾选的物料库中物料选入到选中的采购明细表" placement="top">
           <el-button
+            :disabled="Number(whetherToAllocate) === 1"
             type="warning"
             size="small"
             style="margin-left: 10px"
@@ -160,12 +161,25 @@
             {{ scope.row.申请人 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="240" fixed="right">
+        <el-table-column label="操作" align="center" width="280" fixed="right">
           <template slot-scope="scope">
+            <el-popover v-model="scope.row.visible2" title="调整采购任务" placement="top" width="180">
+              <div style="text-align: right; margin: 0">
+                <el-select v-model="PersonValue" style="width:150px" placeholder="人员" size="small" filterable clearable>
+                  <el-option
+                    v-for="item in Person"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"/>
+                </el-select>
+                <el-button type="primary" size="mini" style="margin:10px 50px 0px 20px" @click="scope.row.visible2 = false;tiaoZheng()">确定</el-button>
+              </div>
+              <el-button v-if="!scope.row.edit" slot="reference" :disabled="Number(scope.row.是否分配)===1" type="primary" icon="el-icon-tickets" plain size="mini" style="margin-right:10px" @click="scope.row.visible2 = true;getPeople()">分配</el-button>
+            </el-popover>
             <el-button v-if="scope.row.edit" type="text" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
             <el-button v-if="scope.row.edit" class="cancel-btn" size="mini" type="text" @click="cancelEdit(scope.$index, scope.row)">取消</el-button>
-            <el-button v-else type="warning" size="mini" icon="el-icon-edit" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-            <el-button v-if="!scope.row.edit" type="danger" size="mini" icon="el-icon-delete" plain @click="openDelete(scope.row)">删除</el-button>
+            <el-button v-else :disabled="Number(scope.row.是否分配)===1" type="warning" size="mini" icon="el-icon-edit" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
+            <el-button v-if="!scope.row.edit" :disabled="Number(scope.row.是否分配)===1" type="danger" size="mini" icon="el-icon-delete" plain @click="openDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -205,17 +219,17 @@
         </el-table-column>
         <el-table-column label="数量" align="center" min-width="100">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.数量" size="mini" style="width:70px" @change="updateNumber(scope.row)"/>
+            <el-input v-model="scope.row.数量" :disabled="Number(whetherToAllocate) === 1" size="mini" style="width:70px" @change="updateNumber(scope.row)"/>
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" min-width="150" prop="备注">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.备注" size="mini" style="width:120px" @change="updateNumber(scope.row)"/>
+            <el-input v-model="scope.row.备注" :disabled="Number(whetherToAllocate) === 1" size="mini" style="width:120px" @change="updateNumber(scope.row)"/>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="100">
           <template slot-scope="scope">
-            <el-button type="danger" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
+            <el-button :disabled="Number(whetherToAllocate) === 1" type="danger" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -236,12 +250,13 @@
 </template>
 
 <script>
-import { searchInventoryNum, submitaddpurchasingdetailsform, searchpurchasingDetailsForm, confirmEditpurchasingDetailsForm, openDeletepurchasingDetailsForm, addmateriel, searchtable2, setSafeValue, updateNumber } from '@/api/ManufacturingCenter/CreateWarehousePurchasing'
+import { searchInventoryNum, submitaddpurchasingdetailsform, searchpurchasingDetailsForm, confirmEditpurchasingDetailsForm, openDeletepurchasingDetailsForm, addmateriel, searchtable2, setSafeValue, updateNumber, getperson, tiaozheng, deletematerial } from '@/api/ManufacturingCenter/CreateWarehousePurchasing'
 import { mapGetters } from 'vuex'
 export default {
   name: '', // 创建仓库采购
   data() {
     return {
+      visible2: false,
       dialogVisible: false, // 新增明细表弹出框
       title: '', // 新增明细表标题
       form: {
@@ -278,7 +293,10 @@ export default {
       applicant: '',
       formNumber: '', // 表单编号
       materielGroup: [], // 物料组
-      tableData2: [] // 采购明细
+      tableData2: [], // 采购明细
+      PersonValue: '', // 采购员编号
+      Person: [], // 采购员
+      whetherToAllocate: '' // 是否分配
     }
   },
   computed: {
@@ -292,6 +310,20 @@ export default {
     this.searchTable1()
   },
   methods: {
+    // 查询采购员
+    getPeople() {
+      this.PersonValue = ''
+      this.Person = []
+      getperson().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Person.push({
+            value: response.data[i].人员编号,
+            label: response.data[i].姓名
+          })
+        }
+        this.PersonValue = response.data[0].人员编号
+      })
+    },
     searchTable() { // 查询物料库物料
       this.loading = true
       let check2, check3
@@ -367,7 +399,8 @@ export default {
               表单名称_原: response.data.rows[i].表单名称,
               表单流水号: response.data.rows[i].表单流水号,
               是否分配: response.data.rows[i].是否分配,
-              edit: false
+              edit: false,
+              visible2: false
             })
           }
         }
@@ -426,11 +459,32 @@ export default {
     searchTable2(row) {
       this.formNumber = row.表单流水号
       this.tableData2 = []
+      this.whetherToAllocate = row.是否分配
       searchtable2(row.表单流水号).then(response => {
         console.log(response.data)
         this.tableData2 = response.data
       })
-    }, // 勾选物料
+    }, // 调整采购计划
+    tiaoZheng() {
+      tiaozheng(this.formNumber, this.PersonValue).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('分配成功')
+        } else {
+          this.$message.error('分配失败')
+        }
+      })
+      this.searchTable1()
+    }, // 移除物料明细
+    deleteMateriel(row) {
+      deletematerial(row.id).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('移除成功')
+        } else {
+          this.$message.error('移除失败')
+        }
+      })
+    },
+    // 勾选物料
     handleSelectionChange(val) {
       this.materielGroup = []
       for (let i = 0; i < val.length; i++) {
diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index 2d297c2a..ec47f960 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -102,17 +102,17 @@
             type="selection"
             align="center"
             width="35"/>
-          <el-table-column label="零件号" sortable prop="零件图号" align="center" min-width="220">
+          <el-table-column label="零件号" prop="零件图号" align="center" min-width="220">
             <template slot-scope="scope">
               {{ scope.row.零件图号 }}
             </template>
           </el-table-column>
-          <el-table-column label="零件名称" sortable prop="零件名称" align="center">
+          <el-table-column label="零件名称" prop="零件名称" align="center">
             <template slot-scope="scope">
               {{ scope.row.零件名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="规格" sortable prop="规格" align="center">
+          <el-table-column label="规格" prop="规格" align="center">
             <template slot-scope="scope">
               {{ scope.row.规格 }}
             </template>
@@ -137,7 +137,7 @@
               {{ scope.row.未投产数量 }}
             </template>
           </el-table-column>
-          <el-table-column label="零件类型" sortable prop="零件类型名称" align="center" width="120">
+          <el-table-column label="零件类型" prop="零件类型名称" align="center" width="120">
             <template slot-scope="scope">
               {{ scope.row.零件类型名称 }}
             </template>
@@ -219,7 +219,6 @@
             <template slot-scope="scope">{{ scope.row.零件图号 }}</template>
           </el-table-column>
           <el-table-column
-            sortable
             prop="零件名称"
             label="零件名称" >
             <template slot-scope="scope">{{ scope.row.零件名称 }}</template>
diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue
index facb157f..be0b4cd9 100644
--- a/src/views/ManufacturingCenter/InventoryQuery/index.vue
+++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue
@@ -13,27 +13,27 @@
         </el-row>
       </div>
       <el-table :data="tableData1" stripe border height="700px" size="mini" show-summary>
-        <el-table-column label="名称" sortable prop="物料名称" align="center" width="130" show-overflow-tooltip>
+        <el-table-column label="名称" prop="物料名称" align="center" width="130" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" sortable prop="物料型号" align="center" width="150" show-overflow-tooltip>
+        <el-table-column label="图号或型号" prop="物料型号" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" sortable prop="物料规格" align="center" width="200" show-overflow-tooltip>
+        <el-table-column label="规格" prop="物料规格" align="center" width="200" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料来源" sortable prop="物料来源" align="center" width="100">
+        <el-table-column label="物料来源" prop="物料来源" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.物料来源 }}
           </template>
         </el-table-column>
-        <el-table-column label="仓库" sortable prop="仓库名称" align="center" min-width="90">
+        <el-table-column label="仓库" prop="仓库名称" align="center" min-width="90">
           <template slot-scope="scope">
             {{ scope.row.仓库名称 }}
           </template>
diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
index 8017c6dd..46448adb 100644
--- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
@@ -35,12 +35,12 @@
     <el-card>
       <el-table v-loading="loading" :data="tableData" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange2">
         <el-table-column type="selection" width="55" align="center"/>
-        <el-table-column label="零件名称" sortable prop="零件名称" align="center" width="220px">
+        <el-table-column label="零件名称" prop="零件名称" align="center" width="220px">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" sortable prop="零件图号" align="center" width="280px">
+        <el-table-column label="零件图号" prop="零件图号" align="center" width="280px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
@@ -78,12 +78,12 @@
     <el-card>
       <el-table v-loading="loading2" :data="tableData2" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center"/>
-        <el-table-column label="零件名称" sortable prop="零件名称" align="center" width="220px">
+        <el-table-column label="零件名称" prop="零件名称" align="center" width="220px">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" sortable prop="零件图号" align="center" width="240px">
+        <el-table-column label="零件图号" prop="零件图号" align="center" width="240px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index 9a507aab..530cbc17 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -32,27 +32,27 @@
     </el-card>
     <el-card>
       <el-table :data="tableData" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="250px" @row-click="searchPart">
-        <el-table-column label="项目名称" sortable prop="项目名称" align="center">
+        <el-table-column label="项目名称" prop="项目名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床编号" sortable prop="机床图号" align="center">
+        <el-table-column label="机床编号" prop="机床图号" align="center">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" sortable prop="机床名称" align="center">
+        <el-table-column label="机床名称" prop="机床名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.机床名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="组号" sortable prop="组号" align="center">
+        <el-table-column label="组号" prop="组号" align="center">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="组件名称" sortable prop="组件名称" align="center">
+        <el-table-column label="组件名称" prop="组件名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.组件名称 }}
           </template>
diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
index 12a67f25..8df6ee89 100644
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -53,22 +53,22 @@
           type="selection"
           align="center"
           width="55"/>
-        <el-table-column label="机床号" sortable prop="机床图号" align="center">
+        <el-table-column label="机床号" prop="机床图号" align="center">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="组号" sortable prop="组号" align="center">
+        <el-table-column label="组号" prop="组号" align="center">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" sortable prop="零件图号" align="center">
+        <el-table-column label="零件图号" prop="零件图号" align="center">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" sortable prop="零件名称" align="center">
+        <el-table-column label="零件名称" prop="零件名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
@@ -78,7 +78,7 @@
             {{ scope.row.批次数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="工艺员" sortable prop="工艺员" align="center">
+        <el-table-column label="工艺员" prop="工艺员" align="center">
           <template slot-scope="scope">
             {{ scope.row.工艺员 }}
           </template>
diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index 1fdda857..b2166e5e 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
@@ -40,12 +40,12 @@
         stripe
         @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection"/>
-        <el-table-column align="center" label="零件号" sortable prop="零件号" min-width="160">
+        <el-table-column align="center" label="零件号" prop="零件号" min-width="160">
           <template slot-scope="scope">
             {{ scope.row.零件号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" sortable prop="零件名称" label="零件名称">
+        <el-table-column align="center" prop="零件名称" label="零件名称">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index 38bc30ec..6dca3f59 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -65,12 +65,12 @@
           type="selection"
           align="center"
           width="50"/>
-        <el-table-column label="零件图号" sortable prop="零件图号" align="center" width="200">
+        <el-table-column label="零件图号" prop="零件图号" align="center" width="200">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" sortable prop="零件名称" align="center" width="300">
+        <el-table-column label="零件名称" prop="零件名称" align="center" width="300">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
diff --git a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
index 82e62779..765ff781 100644
--- a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
+++ b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
@@ -49,7 +49,6 @@
         @current-change="fetchTableData2">
         <el-table-column
           align="center"
-          sortable
           prop="零件图号"
           label="零件号"
         >
@@ -57,7 +56,6 @@
         </el-table-column>
         <el-table-column
           align="center"
-          sortable
           prop="零件名称"
           label="零件名称"
         >
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index 08cedc2f..70f1731b 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -2,11 +2,11 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <span>项目名称:</span>
+        <!--        <span>项目名称:</span>-->
         <el-select
           v-model="entryNameValue"
           placeholder="项目名称"
-          style="width:200px;margin-top: 10px"
+          style="width:200px;margin: 10px 10px 0px 10px"
           size="small"
           clearable
           filterable
@@ -17,20 +17,18 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span>机床图号:</span>
-        <el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px" @change="empty1">
+        <!--        <span>机床图号:</span>-->
+        <el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px;margin: 10px 10px 0px 10px" @change="empty1">
           <el-button slot="append" icon="el-icon-search" @click="SearchMachine" />
         </el-input>
-        <span>组号:</span>
-        <el-input v-model="groupNumber" placeholder="组号" size="small" readonly clearable style="width:200px">
+        <!--        <span>组号:</span>-->
+        <el-input v-model="groupNumber" placeholder="组号" size="small" readonly clearable style="width:200px;margin: 10px 10px 0px 10px">
           <el-button slot="append" icon="el-icon-search" @click="searchGroupList" />
         </el-input>
-      </el-row>
-      <el-row>
-        <span>零件图号:</span>
-        <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px;margin-top: 10px"/>
-        <span>零件状态:</span>
-        <el-select v-model="partStateValue" placeholder="零件状态" size="small" clearable style="width:200px">
+        <!--        <span>零件图号:</span>-->
+        <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px;margin: 10px 10px 0px 10px"/>
+        <!--        <span>零件状态:</span>-->
+        <el-select v-model="partStateValue" placeholder="零件状态" size="small" clearable style="width:200px;margin: 10px 10px 0px 10px">
           <el-option
             v-for="item in partState"
             :key="item.value"
@@ -47,13 +45,15 @@
         <!--</el-select>-->
         <el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
       </el-row>
+      <!--      <el-row>-->
+      <!--      </el-row>-->
     </el-card>
     <el-card>
       <el-table
         v-loading="loading0"
         :data="tableData"
-        style="width: 100%;max-height: 600px"
-        height="600"
+        style="width: 100%"
+        height="780"
         stripe
         size="mini"
         highlight-current-row
@@ -112,16 +112,16 @@
         <!--</template>-->
         <!--</el-table-column>-->
       </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent"
-          :page-sizes="[10, 20, 30, 40, 50]"
-          :page-size="pageSize"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
+      <!--      <div class="block" style="margin-top: 10px;">-->
+      <!--        <el-pagination-->
+      <!--          :current-page="pageCurrent"-->
+      <!--          :page-sizes="[10, 20, 30, 40, 50]"-->
+      <!--          :page-size="pageSize"-->
+      <!--          :total="total"-->
+      <!--          layout="total, sizes, prev, pager, next, jumper"-->
+      <!--          @size-change="handleSizeChange"-->
+      <!--          @current-change="handleCurrentChange"/>-->
+      <!--      </div>-->
     </el-card>
     <el-dialog :title="title" :visible.sync="dialogFormVisible4" center style="min-height: 300px" width="400px">
       <el-form label-position="left" label-width="110px" class="demo-ruleForm">
@@ -272,8 +272,8 @@ export default {
       partState: [], // 零件状态数组
       partTypeValue: null, // 零件类型
       num: null,
-      pageCurrent: 1,
-      pageSize: 20,
+      // pageCurrent: 1,
+      // pageSize: 20,
       pageCurrent1: 1,
       pageSize1: 20,
       pageCurrent2: 1,
@@ -282,7 +282,7 @@ export default {
       tableData6: [],
       tableData: [],
       state: null,
-      total: null,
+      // total: null,
       total1: null,
       total2: null,
       title: '',
@@ -352,16 +352,15 @@ export default {
         this.check5 = 0
       }
       this.loading0 = true
-      searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue, this.pageSize, this.pageCurrent).then(response => {
-        for (let i = 0; i < response.data.rows.length; i++) {
-          response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2
-          if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) {
-            response.data.rows[i].传递时间 = response.data.rows[i].传递时间.split(' ', 2)[0]
+      searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          response.data[i].考核状态 = parseInt(response.data[i].考核状态) - 2
+          if (response.data[i].传递时间 !== undefined || response.data[i].hasOwnProperty('传递时间')) {
+            response.data[i].传递时间 = response.data[i].传递时间.split(' ', 2)[0]
           }
         }
         this.loading0 = false
-        this.tableData = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.tableData = response.data
       })
     },
     getList() { // 初始化项目名称
@@ -454,14 +453,14 @@ export default {
     cancel() { // 取消
       this.dialogFormVisible4 = false
     },
-    handleSizeChange(val) {
-      this.pageSize = val
-      this.searchData()
-    },
-    handleCurrentChange(val) {
-      this.pageCurrent = val
-      this.searchData()
-    },
+    // handleSizeChange(val) {
+    //   this.pageSize = val
+    //   this.searchData()
+    // },
+    // handleCurrentChange(val) {
+    //   this.pageCurrent = val
+    //   this.searchData()
+    // },
     handleSizeChange1(val) {
       this.pageSize1 = val
       this.SearchMachine()
diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
index eb8f0445..98f8ef2d 100644
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -11,17 +11,17 @@
 
     <el-card>
       <el-table :data="List" border size="small" stripe highlight-current-row height="500px">
-        <el-table-column label="设备名称" sortable prop="设备名称" align="center" >
+        <el-table-column label="设备名称" prop="设备名称" align="center" >
           <template slot-scope="scope">
             {{ scope.row.设备名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="设备编号" sortable prop="设备编号" align="center" >
+        <el-table-column label="设备编号" prop="设备编号" align="center" >
           <template slot-scope="scope">
             {{ scope.row.设备编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="设备型号" sortable prop="设备型号" align="center" >
+        <el-table-column label="设备型号" rop="设备型号" align="center" >
           <template slot-scope="scope">
             {{ scope.row.设备型号 }}
           </template>
@@ -32,7 +32,7 @@
           </template>
         </el-table-column>
         <el-table-column label="设备加工能力" align="center" >
-          <template slot-scope="scope">
+          <template slot-scope="scope">p
             {{ scope.row.设备加工能力工时 }}
           </template>
         </el-table-column>
diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue
index ba3ab758..531218a8 100644
--- a/src/views/MarketingCenter/BidBond/index.vue
+++ b/src/views/MarketingCenter/BidBond/index.vue
@@ -49,7 +49,7 @@
         border
         stripe
         size="mini">
-        <el-table-column align="center" label="投标结果" sortable prop="投标结果" width="200">
+        <el-table-column align="center" label="投标结果" prop="投标结果" width="200">
           <template slot-scope="scope">
             <el-radio-group v-model="scope.row.投标结果" @change="changeTenderResult(scope.row)">
               <el-radio :disabled="scope.row.是否禁用已中标" label="1">已中标</el-radio>
@@ -62,7 +62,7 @@
             {{ !scope.row.公布日期 ? '未公布' : scope.row.公布日期.substring(0 , scope.row.公布日期.length - 8) }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="招标企业" sortable prop="招标企业" width="180">
+        <el-table-column align="center" label="招标企业" prop="招标企业" width="180">
           <template slot-scope="scope">
             {{ scope.row.招标企业 }}
           </template>
@@ -103,7 +103,7 @@
             <el-tag v-else slot="reference" type="danger" size="mini" style="width: 66px">未收回</el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="投标人" sortable prop="投标人" width="100">
+        <el-table-column align="center" label="投标人" prop="投标人" width="100">
           <template slot-scope="scope">
             {{ scope.row.投标人 }}
           </template>
diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue
index 810e3ebf..286a3aec 100644
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -107,7 +107,7 @@
         <el-card>
           <el-button icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click = "addCustomer();flag1 = 1">新增客户</el-button>
           <el-table v-loading="loading2" :data="tableData2" highlight-current-row height="640" size="mini" stripe style="width: 100%;margin-top: 2px" border>
-            <el-table-column label="客户名称" sortable prop="客户名称" align="center" min-width="180" show-overflow-tooltip>
+            <el-table-column label="客户名称" prop="客户名称" align="center" min-width="180" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.客户名称 }}
               </template>
diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
index 5316e156..1158cc16 100644
--- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -66,14 +66,14 @@
             </el-table>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同编号" sortable prop="合同编号" width="130">
+        <el-table-column align="center" label="合同编号" prop="合同编号" width="130">
           <template slot-scope="scope">
             <template>
               <el-tag slot="reference" type="mini">{{ scope.row.合同编号 }}</el-tag>
             </template>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="项目名称" sortable prop="项目名称" width="150" show-overflow-tooltip>
+        <el-table-column align="center" label="项目名称" prop="项目名称" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
@@ -108,12 +108,12 @@
             {{ scope.row.安装调试节点&&scope.row.安装调试节点!=='1900/1/1' ? scope.row.安装调试节点 : '-' }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="销售经理" sortable prop="营销经理" width="100">
+        <el-table-column align="center" label="销售经理" prop="营销经理" width="100">
           <template slot-scope="scope">
             {{ scope.row.营销经理 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="客户名称" sortable prop="客户名称" width="230" show-overflow-tooltip>
+        <el-table-column align="center" label="客户名称" prop="客户名称" width="230" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index 3ca8a2a2..bde67018 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -52,12 +52,12 @@
             </el-table>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同编号" sortable prop="合同编号" width="140">
+        <el-table-column align="center" label="合同编号" prop="合同编号" width="140">
           <template slot-scope="scope">
             <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="项目名称" sortable prop="项目名称" width="100" show-overflow-tooltip>
+        <el-table-column align="center" label="项目名称" prop="项目名称" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
@@ -94,12 +94,12 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="营销经理" sortable prop="姓名" width="100">
+        <el-table-column align="center" label="营销经理" prop="姓名" width="100">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="客户名称" sortable prop="客户名称" width="160" show-overflow-tooltip>
+        <el-table-column align="center" label="客户名称" prop="客户名称" width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index a266be18..b0b639d1 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -94,7 +94,7 @@
             </el-table>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同编号" sortable prop="合同编号" width="130">
+        <el-table-column align="center" label="合同编号" prop="合同编号" width="130">
           <template slot-scope="scope">
             <template>
               <el-popover
@@ -114,12 +114,12 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="客户名称" sortable prop="客户名称" width="190" show-overflow-tooltip>
+        <el-table-column align="center" label="客户名称" prop="客户名称" width="190" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="项目名称" sortable prop="项目名称" width="140" show-overflow-tooltip>
+        <el-table-column align="center" label="项目名称" prop="项目名称" width="140" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index d063cd2f..d02ec422 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -83,19 +83,19 @@
             </el-table>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同编号" sortable prop="合同编号" width="150">
+        <el-table-column align="center" label="合同编号" prop="合同编号" width="150">
           <template slot-scope="scope">
             <template>
               <el-tag slot="reference">{{ scope.row.合同编号 }}</el-tag>
             </template>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="项目名称" sortable prop="项目名称" min-width="150">
+        <el-table-column align="center" label="项目名称" prop="项目名称" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="项目下达日期" sortable prop="合同签订日期" width="150">
+        <el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="150">
           <template slot-scope="scope">
             {{ scope.row.合同签订日期 }}
           </template>
diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue
index 036b401a..c0518427 100644
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -46,12 +46,12 @@
         stripe
         size="mini"
         @row-click="fetchTableData2">
-        <el-table-column align="center" label="合同编号" sortable prop="合同编号" width="140">
+        <el-table-column align="center" label="合同编号" prop="合同编号" width="140">
           <template slot-scope="scope">
             <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="项目名称" sortable prop="项目名称" width="150" show-overflow-tooltip>
+        <el-table-column align="center" label="项目名称" prop="项目名称" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue
index 7c0d5360..80892e18 100644
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -39,12 +39,12 @@
         size="mini"
         highlight-current-row
         @row-click="fetchTableData2">
-        <el-table-column align="center" label="合同编号" sortable prop="合同编号" width="150">
+        <el-table-column align="center" label="合同编号" prop="合同编号" width="150">
           <template slot-scope="scope">
             <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="项目名称" sortable prop="项目名称" width="150" show-overflow-tooltip>
+        <el-table-column align="center" label="项目名称" prop="项目名称" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
@@ -59,12 +59,12 @@
             {{ scope.row.合同签订日期 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="销售经理" sortable prop="姓名" width="100">
+        <el-table-column align="center" label="销售经理" prop="姓名" width="100">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="客户名称" sortable prop="客户名称" width="200" show-overflow-tooltip>
+        <el-table-column align="center" label="客户名称" prop="客户名称" width="200" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
diff --git a/src/views/MarketingCenter/SafetyMargin/index.vue b/src/views/MarketingCenter/SafetyMargin/index.vue
index a01d5131..c0876754 100644
--- a/src/views/MarketingCenter/SafetyMargin/index.vue
+++ b/src/views/MarketingCenter/SafetyMargin/index.vue
@@ -40,12 +40,12 @@
         size="mini"
         highlight-current-row
         @row-click="fetchTableData1">
-        <el-table-column align="center" label="合同编号" sortable prop="合同编号" width="150">
+        <el-table-column align="center" label="合同编号" prop="合同编号" width="150">
           <template slot-scope="scope">
             <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="项目名称" sortable prop="项目名称" width="160" show-overflow-tooltip>
+        <el-table-column align="center" label="项目名称" prop="项目名称" width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
@@ -60,12 +60,12 @@
             {{ scope.row.合同签订日期 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="销售经理" sortable prop="姓名" width="100">
+        <el-table-column align="center" label="销售经理" prop="姓名" width="100">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="客户名称" sortable prop="客户名称" width="250" show-overflow-tooltip>
+        <el-table-column align="center" label="客户名称" prop="客户名称" width="250" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
diff --git a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
index d83a42ec..26d63a9c 100644
--- a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
+++ b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
@@ -55,22 +55,22 @@
           type="index"
           align="center"
           width="50"/>
-        <el-table-column label="零件图号" sortable prop="零件图号" align="center" width="230px">
+        <el-table-column label="零件图号" prop="零件图号" align="center" width="230px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" sortable prop="零件名称" align="center" width="230px">
+        <el-table-column label="零件名称" prop="零件名称" align="center" width="230px">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="材料" sortable prop="材料" align="center" min-width="150px">
+        <el-table-column label="材料" prop="材料" align="center" min-width="150px">
           <template slot-scope="scope">
             {{ scope.row.材料 }}
           </template>
         </el-table-column>
-        <el-table-column label="种类" sortable prop="零件类型名称" align="center" width="150px">
+        <el-table-column label="种类" prop="零件类型名称" align="center" width="150px">
           <template slot-scope="scope">
             {{ scope.row.零件类型名称 }}
           </template>
diff --git a/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue b/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue
index 16905db6..ab434ab5 100644
--- a/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue
+++ b/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue
@@ -33,7 +33,6 @@
         <el-table-column
           align="center"
           label="工艺名称"
-          sortable
           prop="工艺名称"
           width="200">
           <template slot-scope="scope">{{ scope.row.工艺名称 }}</template>
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index ad890184..48ff366a 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -62,34 +62,34 @@
           align="center"
           fixed="left"
           width="50"/>
-        <el-table-column label="付款状态" sortable prop="实际付款时间" width="100" align="center" fixed="left">
+        <el-table-column label="付款状态" prop="实际付款时间" width="100" align="center" fixed="left">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small">已付</el-tag>
             <el-tag v-else type="info" size="small">未付</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="到货状态" sortable prop="单据状态" width="100" align="center" fixed="left">
+        <el-table-column label="到货状态" prop="单据状态" width="100" align="center" fixed="left">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.单据状态==='3'" type="success" size="small">已到</el-tag>
             <el-tag v-else type="info" size="small">未到</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="表单号" sortable prop="表单号" align="center" min-width="200px" fixed="left">
+        <el-table-column label="表单号" prop="表单号" align="center" min-width="200px" fixed="left">
           <template slot-scope="scope">
             {{ scope.row.表单号 }}
           </template>
         </el-table-column>
-        <el-table-column label="外协厂家" sortable prop="外协厂家名称" align="center" min-width="200px">
+        <el-table-column label="外协厂家" prop="外协厂家名称" align="center" min-width="200px">
           <template slot-scope="scope">
             {{ scope.row.外协厂家名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="任务下达日期" sortable prop="任务下达日期" align="center" min-width="125px">
+        <el-table-column label="任务下达日期" prop="任务下达日期" align="center" min-width="125px">
           <template slot-scope="scope">
             {{ scope.row.任务下达日期 }}
           </template>
         </el-table-column>
-        <el-table-column label="外协员" sortable prop="外协员姓名" align="center" width="90px">
+        <el-table-column label="外协员" prop="外协员姓名" align="center" width="90px">
           <template slot-scope="scope">
             {{ scope.row.外协员姓名 }}
           </template>
@@ -216,12 +216,12 @@
 
     <el-card>
       <el-table v-loading="loading2" :data="tableData2" :summary-method="getSummaries" size="mini" stripe height="370" show-summary style="width: 100%;" border element-loading-text="拼命加载中">
-        <el-table-column label="发票号" sortable prop="发票号" align="center" width="230px">
+        <el-table-column label="发票号" prop="发票号" align="center" width="230px">
           <template slot-scope="scope">
             {{ scope.row.发票号 }}
           </template>
         </el-table-column>
-        <el-table-column label="接收人" sortable prop="接收人" align="center" width="180px">
+        <el-table-column label="接收人" prop="接收人" align="center" width="180px">
           <template slot-scope="scope">
             {{ scope.row.接收人 }}
           </template>
diff --git a/src/views/Outsourcing/OutsourcingQCSearch/index.vue b/src/views/Outsourcing/OutsourcingQCSearch/index.vue
index 80c1f1bc..054cc9b6 100644
--- a/src/views/Outsourcing/OutsourcingQCSearch/index.vue
+++ b/src/views/Outsourcing/OutsourcingQCSearch/index.vue
@@ -8,12 +8,12 @@
       <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
       <el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 600px;" height="400px" size="mini" @row-click="searchTable2">
         <el-table-column label="序号" align="center" width="55" type="index"/>
-        <el-table-column label="外协到货单号" sortable prop="外协到货单编号" align="center" min-width="100">
+        <el-table-column label="外协到货单号" prop="外协到货单编号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.外协到货单编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="外协厂家" sortable prop="外协厂家名称" align="center" min-width="100">
+        <el-table-column label="外协厂家" prop="外协厂家名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.外协厂家名称 }}
           </template>
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index e7782b34..9e3878fa 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -30,28 +30,28 @@
     </el-card>
     <el-card>
       <el-table v-loading="loading2" :data="List" highlight-current-row height="350" size="mini" stripe border @row-click="searchProcess" >
-        <el-table-column label="单据状态" sortable prop="单据状态" width="100" align="center">
+        <el-table-column label="单据状态" prop="单据状态" width="100" align="center">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.单据状态==='成交'" type="success" size="small">成交</el-tag>
             <el-tag v-else type="info" size="small">未成交</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="表单号" sortable prop="表单号" align="center" min-width="200px">
+        <el-table-column label="表单号" prop="表单号" align="center" min-width="200px">
           <template slot-scope="scope">
             {{ scope.row.表单号 }}
           </template>
         </el-table-column>
-        <el-table-column label="外协厂家" sortable prop="外协厂家" align="center" min-width="200px">
+        <el-table-column label="外协厂家" prop="外协厂家" align="center" min-width="200px">
           <template slot-scope="scope">
             {{ scope.row.外协厂家 }}
           </template>
         </el-table-column>
-        <el-table-column label="任务下达日期" sortable prop="任务下达日期" align="center" min-width="100px">
+        <el-table-column label="任务下达日期" prop="任务下达日期" align="center" min-width="100px">
           <template slot-scope="scope">
             {{ scope.row.任务下达日期 }}
           </template>
         </el-table-column>
-        <el-table-column label="外协员" sortable prop="外协计划员" align="center" >
+        <el-table-column label="外协员" prop="外协计划员" align="center" >
           <template slot-scope="scope">
             {{ scope.row.外协计划员 }}
           </template>
@@ -99,17 +99,17 @@
         <el-table-column
           type="selection"
           width="55"/>
-        <el-table-column label="项目名称" sortable prop="项目名称" align="center" >
+        <el-table-column label="项目名称" prop="项目名称" align="center" >
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" sortable prop="零件图号" align="center" width="120px" >
+        <el-table-column label="零件图号" prop="零件图号" align="center" width="120px" >
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" sortable prop="零件名称" align="center" min-width="140px" >
+        <el-table-column label="零件名称" prop="零件名称" align="center" min-width="140px" >
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
diff --git a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
index 481b988e..289167ee 100644
--- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
@@ -20,28 +20,28 @@
 
     <el-card>
       <el-table v-loading="loading2" :data="List" highlight-current-row stripe size="mini" height="350" border @row-click="searchProcess" >
-        <el-table-column label="付款状态" sortable prop="实际付款时间" width="100" align="center">
+        <el-table-column label="付款状态" prop="实际付款时间" width="100" align="center">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small" style="margin: 0px">已付款</el-tag>
             <el-tag v-else type="info" size="small" style="margin: 0px">未付款</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="表单号" sortable prop="表单号" align="center" min-width="200px">
+        <el-table-column label="表单号" prop="表单号" align="center" min-width="200px">
           <template slot-scope="scope">
             {{ scope.row.表单号 }}
           </template>
         </el-table-column>
-        <el-table-column label="外协厂家" sortable prop="外协厂家" align="center" min-width="200px">
+        <el-table-column label="外协厂家" prop="外协厂家" align="center" min-width="200px">
           <template slot-scope="scope">
             {{ scope.row.外协厂家 }}
           </template>
         </el-table-column>
-        <el-table-column label="任务下达日期" sortable prop="任务下达日期" align="center" min-width="100px">
+        <el-table-column label="任务下达日期" prop="任务下达日期" align="center" min-width="100px">
           <template slot-scope="scope">
             {{ scope.row.任务下达日期 }}
           </template>
         </el-table-column>
-        <el-table-column label="外协员" sortable prop="外协计划员" align="center" >
+        <el-table-column label="外协员" prop="外协计划员" align="center" >
           <template slot-scope="scope">
             {{ scope.row.外协计划员 }}
           </template>
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index ae910cda..2f6b0c62 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -49,22 +49,22 @@
           type="index"
           align="center"
           width="50"/>
-        <el-table-column label="零件图号" sortable prop="零件图号" align="center" width="220px">
+        <el-table-column label="零件图号" prop="零件图号" align="center" width="220px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" sortable prop="零件名称" align="center" width="220px">
+        <el-table-column label="零件名称" prop="零件名称" align="center" width="220px">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="材料" sortable prop="材料" align="center">
+        <el-table-column label="材料" prop="材料" align="center">
           <template slot-scope="scope">
             {{ scope.row.材料 }}
           </template>
         </el-table-column>
-        <el-table-column label="种类" sortable prop="零件类型名臣" align="center" width="220px">
+        <el-table-column label="种类" prop="零件类型名臣" align="center" width="220px">
           <template slot-scope="scope">
             {{ scope.row.零件类型名称 }}
           </template>
diff --git a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue
index 992ad58d..c5c81bcc 100644
--- a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue
+++ b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue
@@ -31,7 +31,7 @@
         height="400px"
         size="mini"
         @row-click="searchTable2">
-        <el-table-column label="采购合同编号" sortable prop="采购合同编号" align="center" min-width="100">
+        <el-table-column label="采购合同编号" prop="采购合同编号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
@@ -41,17 +41,17 @@
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="交货日期" sortable prop="交货日期" align="center" min-width="100">
+        <el-table-column label="交货日期" prop="交货日期" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.交货日期 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="150">
+        <el-table-column label="供应商" prop="供应商名称" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购员" sortable prop="姓名" align="center" min-width="70">
+        <el-table-column label="采购员" prop="姓名" align="center" min-width="70">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
diff --git a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
index 062a27e9..2fb0105d 100644
--- a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
+++ b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
@@ -14,22 +14,22 @@
       </div>
       <h4 style="margin-top: 0">采购件列表</h4>
       <el-table :data="tableData1" size="mini" border style="width: 100%;" height="440">
-        <el-table-column label="名称" sortable prop="物料名称" align="center" min-width="100">
+        <el-table-column label="名称" prop="物料名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" sortable prop="物料型号" align="center" min-width="100">
+        <el-table-column label="图号或型号" prop="物料型号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" sortable prop="物料规格" align="center" min-width="150">
+        <el-table-column label="规格" prop="物料规格" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.物料规格 }}
           </template>
         </el-table-column>
-        <el-table-column props="仓库名称" sortable prop="仓库名称" label="仓库名称" align="center" min-width="80">
+        <el-table-column props="仓库名称" prop="仓库名称" label="仓库名称" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.仓库名称 }}
           </template>
@@ -83,22 +83,22 @@
       </div>
       <h4>滞货件列表</h4>
       <el-table :data="tableData2" size="mini" border style="width: 100%;" height="440">
-        <el-table-column label="名称" sortable prop="物料名称" align="center" min-width="100">
+        <el-table-column label="名称" prop="物料名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" sortable prop="物料型号" align="center" min-width="120" show-overflow-tooltip>
+        <el-table-column label="图号或型号" prop="物料型号" align="center" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" sortable prop="物料规格" align="center" min-width="120" show-overflow-tooltip>
+        <el-table-column label="规格" prop="物料规格" align="center" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="仓库名称" sortable prop="仓库名称" align="center" min-width="80">
+        <el-table-column label="仓库名称" prop="仓库名称" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.仓库名称 }}
           </template>
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
index 37992640..cc514220 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
@@ -41,12 +41,12 @@
             </el-form>
           </template>
         </el-table-column>
-        <el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="200" show-overflow-tooltip>
+        <el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="发票号" sortable prop="发票号" align="center" min-width="90">
+        <el-table-column label="发票号" prop="发票号" align="center" min-width="90">
           <template slot-scope="scope">
             {{ scope.row.发票号 }}
           </template>
@@ -56,12 +56,12 @@
             {{ scope.row.发票金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="申请人" sortable prop="申请人姓名" align="center" min-width="80">
+        <el-table-column label="申请人" prop="申请人姓名" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
           </template>
         </el-table-column>
-        <el-table-column label="申请时间" sortable prop="申请时间" align="center" min-width="115" show-overflow-tooltip>
+        <el-table-column label="申请时间" prop="申请时间" align="center" min-width="115" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
           </template>
diff --git a/src/views/PurchasingCenter/MaterialManagement/index.vue b/src/views/PurchasingCenter/MaterialManagement/index.vue
index 94d4a3fa..09737e4a 100644
--- a/src/views/PurchasingCenter/MaterialManagement/index.vue
+++ b/src/views/PurchasingCenter/MaterialManagement/index.vue
@@ -147,22 +147,22 @@
         highlight-current-row
         border
         stripe>
-        <el-table-column align="center" label="物料名称" sortable prop="物料名称">
+        <el-table-column align="center" label="物料名称" prop="物料名称">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="物料规格" sortable prop="物料规格">
+        <el-table-column align="center" label="物料规格" prop="物料规格">
           <template slot-scope="scope">
             {{ scope.row.物料规格 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="物料型号" sortable prop="物料型号">
+        <el-table-column align="center" label="物料型号" prop="物料型号">
           <template slot-scope="scope">
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="供货商" sortable prop="供货商">
+        <el-table-column align="center" label="供货商" prop="供货商">
           <template slot-scope="scope">
             {{ scope.row.供货商 }}
           </template>
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index 925dc19d..ca49661b 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -1,144 +1,555 @@
 <template>
   <div class="app-container">
-    <el-card>
-      <div slot="header">
-        <el-row style="margin-bottom: 10px">
-          <span>物料名称:</span>
-          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
-          <span>物料规格:</span>
-          <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
-          <span>物料型号:</span>
-          <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
-        </el-row>
-        <el-row style="">
-          <span>物料状态:</span>
-          <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin: 0px"/>
-          <el-button
-            type="success"
-            size="small"
-            icon="el-icon-search"
-            style="margin-left: 10px"
-            @click="pageCurrent00=1;pageSize00=10;total00=0;searchTable00()">查询</el-button>
-          <el-tooltip :open-delay="1000" effect="dark" content="更改选中的零件的询价状态" placement="top">
-            <el-button
-              type="primary"
-              size="small"
-              icon="el-icon-edit"
-              style="margin-left: 10px"
-              @click="changeInquiryStatus">变更询价状态</el-button>
-          </el-tooltip>
-          <el-tooltip :open-delay="1000" effect="dark" content="把选中的零件绑定到离线合同，将相同零件合并到一条记录采购" placement="top">
-            <el-button
-              type="warning"
-              size="small"
-              icon="el-icon-menu"
-              style="margin-left: 10px"
-              @click="bindOfflineContract">绑定离线合同</el-button>
-          </el-tooltip>
-        </el-row>
-      </div>
-      <el-table
-        v-loading=""
-        :data="tableData00"
-        :row-class-name="tableRowClassName"
-        border
-        show-summary
-        style="width: 100%;max-height: 500px;"
-        height="500px"
-        size="mini"
-        @selection-change="handleSelectionChange1">
-        <el-table-column :selectable="selectable" align="center" width="50" type="selection"/>
-        <el-table-column label="物料状态" sortable prop="询价状态编号" align="center" width="100">
-          <template slot-scope="scope">
-            <el-tag v-if="parseInt(scope.row.询价状态编号)===1" type="warning" size="small">未询价</el-tag>
-            <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
-            <el-tag v-if="parseInt(scope.row.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small" @click="unbindPart(scope.row)">已采购</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column :filters="supplierFilters" :filter-method="filterHandler" sortable prop="供货商" label="供货商" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.供货商 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="任务分配时间" sortable prop="任务分配时间" align="center" min-width="120">
-          <template slot-scope="scope">
-            {{ scope.row.任务分配时间.split(' ')[0] }}
-          </template>
-        </el-table-column>
-        <el-table-column label="机床图号" sortable prop="机床图号" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.机床图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="组号" sortable prop="组号" align="center" min-width="80">
-          <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.物料类别 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="物料品种" sortable prop="物料品种" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.物料品种 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="名称" align="center" sortable prop="物料名称" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="图号或型号" sortable prop="物料型号" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.物料型号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="规格" align="center" sortable prop="物料规格" min-width="200" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="分配数量" align="center" min-width="80" prop="零件数量">
-          <template slot-scope="scope">
-            {{ scope.row.零件数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="使用滞货数量" align="center" min-width="100" prop="使用滞货数量">
-          <template slot-scope="scope">
-            {{ Number(scope.row.使用滞货数量) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="待采购数量" align="center" min-width="80" prop="待采购数量">
-          <template slot-scope="scope">
-            {{ scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
-          </template>
-        </el-table-column>
-        <el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注筛选" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.备注 }}
-          </template>
-        </el-table-column>
-        <el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型筛选">
-          <template slot-scope="scope">
-            {{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin: 10px 0 0 0;">
-        <el-pagination
-          :current-page="pageCurrent00"
-          :page-sizes="[10, 20, 30, 40, 100]"
-          :page-size="pageSize00"
-          :total="total00"
-          style="display:inline-block;width:800px"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange00"
-          @current-change="handleCurrentChange00"/>
-      </div>
-    </el-card>
-
+    <el-row id="PurchasingCenter/OfflineContract">
+      <el-col :span="24">
+        <el-tabs v-model="tabName" type="border-card" @tab-click="tabClick">
+          <el-tab-pane label="外购件" name="外购件">
+            <el-row style="margin-bottom: 10px">
+              <span>物料名称:</span>
+              <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
+              <span>物料规格:</span>
+              <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
+              <span>物料型号:</span>
+              <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
+            </el-row>
+            <el-row style="">
+              <span>物料状态:</span>
+              <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin: 0px"/>
+              <el-button
+                type="success"
+                size="small"
+                icon="el-icon-search"
+                style="margin-left: 10px"
+                @click="pageCurrent00=1;pageSize00=10;total00=0;searchTable00()">查询</el-button>
+              <el-tooltip :open-delay="1000" effect="dark" content="更改选中的零件的询价状态" placement="top">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-edit"
+                  style="margin-left: 10px"
+                  @click="changeInquiryStatus">变更询价状态</el-button>
+              </el-tooltip>
+              <el-tooltip :open-delay="1000" effect="dark" content="把选中的零件绑定到离线合同，将相同零件合并到一条记录采购" placement="top">
+                <el-button
+                  type="warning"
+                  size="small"
+                  icon="el-icon-menu"
+                  style="margin-left: 10px"
+                  @click="bindOfflineContract">绑定离线合同</el-button>
+              </el-tooltip>
+            </el-row>
+            <el-table
+              v-loading=""
+              :data="tableData00"
+              :row-class-name="tableRowClassName"
+              border
+              show-summary
+              style="width: 100%;max-height: 500px;"
+              height="500px"
+              size="mini"
+              @selection-change="handleSelectionChange1">
+              <el-table-column :selectable="selectable" align="center" width="50" type="selection"/>
+              <el-table-column label="物料状态" prop="询价状态编号" align="center" width="100">
+                <template slot-scope="scope">
+                  <el-tag v-if="parseInt(scope.row.询价状态编号)===1" type="warning" size="small">未询价</el-tag>
+                  <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
+                  <el-tag v-if="parseInt(scope.row.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small" @click="unbindPart(scope.row)">已采购</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" min-width="100">
+                <template slot-scope="scope">
+                  {{ scope.row.供货商 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="任务分配时间" prop="任务分配时间" align="center" min-width="120">
+                <template slot-scope="scope">
+                  {{ scope.row.任务分配时间.split(' ')[0] }}
+                </template>
+              </el-table-column>
+              <el-table-column label="机床图号" prop="机床图号" align="center" min-width="100">
+                <template slot-scope="scope">
+                  {{ scope.row.机床图号 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="组号" prop="组号" align="center" min-width="80">
+                <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.物料类别 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="物料品种" prop="物料品种" align="center" min-width="100">
+                <template slot-scope="scope">
+                  {{ scope.row.物料品种 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="名称" align="center" prop="物料名称" min-width="100" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ scope.row.物料名称 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="图号或型号" prop="物料型号" align="center" min-width="100">
+                <template slot-scope="scope">
+                  {{ scope.row.物料型号 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="规格" align="center" prop="物料规格" min-width="200" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ scope.row.物料规格 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="分配数量" align="center" min-width="80" prop="零件数量">
+                <template slot-scope="scope">
+                  {{ scope.row.零件数量 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="使用滞货数量" align="center" min-width="100" prop="使用滞货数量">
+                <template slot-scope="scope">
+                  {{ Number(scope.row.使用滞货数量) }}
+                </template>
+              </el-table-column>
+              <el-table-column label="待采购数量" align="center" min-width="80" prop="待采购数量">
+                <template slot-scope="scope">
+                  {{ scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
+                </template>
+              </el-table-column>
+              <el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注筛选" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ scope.row.备注 }}
+                </template>
+              </el-table-column>
+              <el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型筛选">
+                <template slot-scope="scope">
+                  {{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="block" style="margin: 10px 0 0 0;">
+              <el-pagination
+                :current-page="pageCurrent00"
+                :page-sizes="[10, 20, 30, 40, 100]"
+                :page-size="pageSize00"
+                :total="total00"
+                style="display:inline-block;width:800px"
+                layout="total, sizes, prev, pager, next, jumper"
+                @size-change="handleSizeChange00"
+                @current-change="handleCurrentChange00"/>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="基本件" name="基本件">
+            <el-row style="margin-bottom: 10px">
+              <span>物料名称:</span>
+              <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
+              <span>物料规格:</span>
+              <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
+              <span>物料型号:</span>
+              <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
+            </el-row>
+            <el-row style="">
+              <span>物料状态:</span>
+              <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin: 0px"/>
+              <el-button
+                type="success"
+                size="small"
+                icon="el-icon-search"
+                style="margin-left: 10px"
+                @click="pageCurrent00=1;pageSize00=10;total00=0;searchTable00()">查询</el-button>
+              <el-tooltip :open-delay="1000" effect="dark" content="更改选中的零件的询价状态" placement="top">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-edit"
+                  style="margin-left: 10px"
+                  @click="changeInquiryStatus">变更询价状态</el-button>
+              </el-tooltip>
+              <el-tooltip :open-delay="1000" effect="dark" content="把选中的零件绑定到离线合同，将相同零件合并到一条记录采购" placement="top">
+                <el-button
+                  type="warning"
+                  size="small"
+                  icon="el-icon-menu"
+                  style="margin-left: 10px"
+                  @click="bindOfflineContract">绑定离线合同</el-button>
+              </el-tooltip>
+            </el-row>
+            <el-table
+              v-loading=""
+              :data="tableData00"
+              :row-class-name="tableRowClassName"
+              border
+              show-summary
+              style="width: 100%;max-height: 500px;"
+              height="500px"
+              size="mini"
+              @selection-change="handleSelectionChange1">
+              <el-table-column :selectable="selectable" align="center" width="50" type="selection"/>
+              <el-table-column label="物料状态" prop="询价状态编号" align="center" width="100">
+                <template slot-scope="scope">
+                  <el-tag v-if="parseInt(scope.row.询价状态编号)===1" type="warning" size="small">未询价</el-tag>
+                  <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
+                  <el-tag v-if="parseInt(scope.row.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small" @click="unbindPart(scope.row)">已采购</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" min-width="100">
+                <template slot-scope="scope">
+                  {{ scope.row.供货商 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="任务分配时间" prop="任务分配时间" align="center" min-width="120">
+                <template slot-scope="scope">
+                  {{ scope.row.任务分配时间.split(' ')[0] }}
+                </template>
+              </el-table-column>
+              <el-table-column label="机床图号" prop="机床图号" align="center" min-width="100">
+                <template slot-scope="scope">
+                  {{ scope.row.机床图号 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="组号" prop="组号" align="center" min-width="80">
+                <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.物料类别 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="物料品种" prop="物料品种" align="center" min-width="100">
+                <template slot-scope="scope">
+                  {{ scope.row.物料品种 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="名称" align="center" prop="物料名称" min-width="100" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ scope.row.物料名称 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="图号或型号" prop="物料型号" align="center" min-width="100">
+                <template slot-scope="scope">
+                  {{ scope.row.物料型号 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="规格" align="center" prop="物料规格" min-width="200" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ scope.row.物料规格 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="分配数量" align="center" min-width="80" prop="零件数量">
+                <template slot-scope="scope">
+                  {{ scope.row.零件数量 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="使用滞货数量" align="center" min-width="100" prop="使用滞货数量">
+                <template slot-scope="scope">
+                  {{ Number(scope.row.使用滞货数量) }}
+                </template>
+              </el-table-column>
+              <el-table-column label="待采购数量" align="center" min-width="80" prop="待采购数量">
+                <template slot-scope="scope">
+                  {{ scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
+                </template>
+              </el-table-column>
+              <el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注筛选" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ scope.row.备注 }}
+                </template>
+              </el-table-column>
+              <el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型筛选">
+                <template slot-scope="scope">
+                  {{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="block" style="margin: 10px 0 0 0;">
+              <el-pagination
+                :current-page="pageCurrent00"
+                :page-sizes="[10, 20, 30, 40, 100]"
+                :page-size="pageSize00"
+                :total="total00"
+                style="display:inline-block;width:800px"
+                layout="total, sizes, prev, pager, next, jumper"
+                @size-change="handleSizeChange00"
+                @current-change="handleCurrentChange00"/>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="标准件" name="标准件">
+            <el-row style="margin-bottom: 10px">
+              <span>物料名称:</span>
+              <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
+              <span>物料规格:</span>
+              <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
+              <span>物料型号:</span>
+              <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
+            </el-row>
+            <el-row style="">
+              <span>物料状态:</span>
+              <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin: 0px"/>
+              <el-button
+                type="success"
+                size="small"
+                icon="el-icon-search"
+                style="margin-left: 10px"
+                @click="pageCurrent00=1;pageSize00=10;total00=0;searchTable00()">查询</el-button>
+              <el-tooltip :open-delay="1000" effect="dark" content="更改选中的零件的询价状态" placement="top">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-edit"
+                  style="margin-left: 10px"
+                  @click="changeInquiryStatus">变更询价状态</el-button>
+              </el-tooltip>
+              <el-tooltip :open-delay="1000" effect="dark" content="把选中的零件绑定到离线合同，将相同零件合并到一条记录采购" placement="top">
+                <el-button
+                  type="warning"
+                  size="small"
+                  icon="el-icon-menu"
+                  style="margin-left: 10px"
+                  @click="bindOfflineContract">绑定离线合同</el-button>
+              </el-tooltip>
+            </el-row>
+            <el-table
+              v-loading=""
+              :data="tableData00"
+              :row-class-name="tableRowClassName"
+              border
+              show-summary
+              style="width: 100%;max-height: 500px;"
+              height="500px"
+              size="mini"
+              @selection-change="handleSelectionChange1">
+              <el-table-column :selectable="selectable" align="center" width="50" type="selection"/>
+              <el-table-column label="物料状态" prop="询价状态编号" align="center" width="100">
+                <template slot-scope="scope">
+                  <el-tag v-if="parseInt(scope.row.询价状态编号)===1" type="warning" size="small">未询价</el-tag>
+                  <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
+                  <el-tag v-if="parseInt(scope.row.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small" @click="unbindPart(scope.row)">已采购</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" min-width="100">
+                <template slot-scope="scope">
+                  {{ scope.row.供货商 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="任务分配时间" prop="任务分配时间" align="center" min-width="120">
+                <template slot-scope="scope">
+                  {{ scope.row.任务分配时间.split(' ')[0] }}
+                </template>
+              </el-table-column>
+              <el-table-column label="机床图号" prop="机床图号" align="center" min-width="100">
+                <template slot-scope="scope">
+                  {{ scope.row.机床图号 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="组号" prop="组号" align="center" min-width="80">
+                <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.物料类别 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="物料品种" prop="物料品种" align="center" min-width="100">
+                <template slot-scope="scope">
+                  {{ scope.row.物料品种 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="名称" align="center" prop="物料名称" min-width="100" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ scope.row.物料名称 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="图号或型号" prop="物料型号" align="center" min-width="100">
+                <template slot-scope="scope">
+                  {{ scope.row.物料型号 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="规格" align="center" prop="物料规格" min-width="200" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ scope.row.物料规格 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="分配数量" align="center" min-width="80" prop="零件数量">
+                <template slot-scope="scope">
+                  {{ scope.row.零件数量 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="使用滞货数量" align="center" min-width="100" prop="使用滞货数量">
+                <template slot-scope="scope">
+                  {{ Number(scope.row.使用滞货数量) }}
+                </template>
+              </el-table-column>
+              <el-table-column label="待采购数量" align="center" min-width="80" prop="待采购数量">
+                <template slot-scope="scope">
+                  {{ scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
+                </template>
+              </el-table-column>
+              <el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注筛选" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ scope.row.备注 }}
+                </template>
+              </el-table-column>
+              <el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型筛选">
+                <template slot-scope="scope">
+                  {{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="block" style="margin: 10px 0 0 0;">
+              <el-pagination
+                :current-page="pageCurrent00"
+                :page-sizes="[10, 20, 30, 40, 100]"
+                :page-size="pageSize00"
+                :total="total00"
+                style="display:inline-block;width:800px"
+                layout="total, sizes, prev, pager, next, jumper"
+                @size-change="handleSizeChange00"
+                @current-change="handleCurrentChange00"/>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="仓库" name="仓库">
+            <el-row style="margin-bottom: 10px">
+              <span>物料名称:</span>
+              <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
+              <span>物料规格:</span>
+              <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
+              <span>物料型号:</span>
+              <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
+            </el-row>
+            <el-row style="">
+              <span>物料状态:</span>
+              <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin: 0px"/>
+              <el-button
+                type="success"
+                size="small"
+                icon="el-icon-search"
+                style="margin-left: 10px"
+                @click="pageCurrent00=1;pageSize00=10;total00=0;searchTable00()">查询</el-button>
+              <el-tooltip :open-delay="1000" effect="dark" content="更改选中的零件的询价状态" placement="top">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-edit"
+                  style="margin-left: 10px"
+                  @click="changeInquiryStatus">变更询价状态</el-button>
+              </el-tooltip>
+              <el-tooltip :open-delay="1000" effect="dark" content="把选中的零件绑定到离线合同，将相同零件合并到一条记录采购" placement="top">
+                <el-button
+                  type="warning"
+                  size="small"
+                  icon="el-icon-menu"
+                  style="margin-left: 10px"
+                  @click="bindOfflineContract">绑定离线合同</el-button>
+              </el-tooltip>
+            </el-row>
+            <el-table
+              v-loading=""
+              :data="tableData00"
+              :row-class-name="tableRowClassName"
+              border
+              show-summary
+              style="width: 100%;max-height: 500px;"
+              height="500px"
+              size="mini"
+              @selection-change="handleSelectionChange1">
+              <el-table-column :selectable="selectable" align="center" width="50" type="selection"/>
+              <el-table-column label="物料状态" prop="询价状态编号" align="center" width="100">
+                <template slot-scope="scope">
+                  <el-tag v-if="parseInt(scope.row.询价状态编号)===1" type="warning" size="small">未询价</el-tag>
+                  <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
+                  <el-tag v-if="parseInt(scope.row.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small" @click="unbindPart(scope.row)">已采购</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" min-width="100">
+                <template slot-scope="scope">
+                  {{ scope.row.供货商 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="任务分配时间" prop="任务分配时间" align="center" min-width="120">
+                <template slot-scope="scope">
+                  {{ scope.row.任务分配时间.split(' ')[0] }}
+                </template>
+              </el-table-column>
+              <el-table-column label="机床图号" prop="机床图号" align="center" min-width="100">
+                <template slot-scope="scope">
+                  {{ scope.row.机床图号 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="组号" prop="组号" align="center" min-width="80">
+                <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.物料类别 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="物料品种" prop="物料品种" align="center" min-width="100">
+                <template slot-scope="scope">
+                  {{ scope.row.物料品种 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="名称" align="center" prop="物料名称" min-width="100" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ scope.row.物料名称 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="图号或型号" prop="物料型号" align="center" min-width="100">
+                <template slot-scope="scope">
+                  {{ scope.row.物料型号 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="规格" align="center" prop="物料规格" min-width="200" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ scope.row.物料规格 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="分配数量" align="center" min-width="80" prop="零件数量">
+                <template slot-scope="scope">
+                  {{ scope.row.零件数量 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="使用滞货数量" align="center" min-width="100" prop="使用滞货数量">
+                <template slot-scope="scope">
+                  {{ Number(scope.row.使用滞货数量) }}
+                </template>
+              </el-table-column>
+              <el-table-column label="待采购数量" align="center" min-width="80" prop="待采购数量">
+                <template slot-scope="scope">
+                  {{ scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
+                </template>
+              </el-table-column>
+              <el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注筛选" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ scope.row.备注 }}
+                </template>
+              </el-table-column>
+              <el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型筛选">
+                <template slot-scope="scope">
+                  {{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="block" style="margin: 10px 0 0 0;">
+              <el-pagination
+                :current-page="pageCurrent00"
+                :page-sizes="[10, 20, 30, 40, 100]"
+                :page-size="pageSize00"
+                :total="total00"
+                style="display:inline-block;width:800px"
+                layout="total, sizes, prev, pager, next, jumper"
+                @size-change="handleSizeChange00"
+                @current-change="handleCurrentChange00"/>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      </el-col>
+    </el-row>
     <el-card>
       <div slot="header">
         <el-row style="margin-bottom: 10px">
@@ -302,7 +713,7 @@
             <el-tag v-if="arrival(scope.row)" type="success" size="small">全部到货</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="离线合同编号" sortable prop="离线合同编号" align="center" min-width="170">
+        <el-table-column label="离线合同编号" prop="离线合同编号" align="center" min-width="170">
           <template slot-scope="scope">
             {{ scope.row.离线合同编号 }}
           </template>
@@ -312,17 +723,17 @@
             {{ scope.row.离线合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
+        <el-table-column label="供应商" prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购员" sortable prop="采购员" align="center" min-width="80">
+        <el-table-column label="采购员" prop="采购员" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.采购员 }}
           </template>
         </el-table-column>
-        <el-table-column label="创建日期" sortable prop="创建日期" align="center" width="100">
+        <el-table-column label="创建日期" prop="创建日期" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.创建日期.split(' ')[0] }}
           </template>
@@ -865,7 +1276,8 @@ export default {
       stipulateArrivalTime: '', // 规定到货时间
       离线合同状态: '',
       paramRow: '', // 参数row
-      disable: true // 其他的禁用
+      disable: true, // 其他的禁用
+      tabName: '外购件'
     }
   },
   computed: {
diff --git a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
index c5205a53..ad76fa90 100644
--- a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
@@ -33,17 +33,17 @@
       </div>
       <h3 style="margin-top: 0">请款表</h3>
       <el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe>
-        <el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
+        <el-table-column label="供应商" prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款时间" sortable prop="。请款时间" align="center" min-width="150">
+        <el-table-column label="请款时间" prop="。请款时间" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.请款时间 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款人" sortable prop="姓名" align="center" min-width="80">
+        <el-table-column label="请款人" prop="姓名" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
diff --git a/src/views/PurchasingCenter/PayStateSearch/index.vue b/src/views/PurchasingCenter/PayStateSearch/index.vue
index 5e01d065..6132d93b 100644
--- a/src/views/PurchasingCenter/PayStateSearch/index.vue
+++ b/src/views/PurchasingCenter/PayStateSearch/index.vue
@@ -54,7 +54,7 @@
             </el-form>
           </template>
         </el-table-column>
-        <el-table-column label="采购合同号" sortable prop="采购合同编号" align="center" min-width="100">
+        <el-table-column label="采购合同号" prop="采购合同编号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
@@ -64,32 +64,32 @@
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="150">
+        <el-table-column label="供应商" prop="供应商名称" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购员" sortable prop="姓名" align="center" min-width="60">
+        <el-table-column label="采购员" prop="姓名" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="合同总额" sortable prop="合同金额" align="center" min-width="70" fixed="right">
+        <el-table-column label="合同总额" prop="合同金额" align="center" min-width="70" fixed="right">
           <template slot-scope="scope">
             {{ scope.row.合同总额 }}
           </template>
         </el-table-column>
-        <el-table-column label="欠款金额" sortable prop="已付金额" align="center" min-width="70" fixed="right">
+        <el-table-column label="欠款金额" prop="已付金额" align="center" min-width="70" fixed="right">
           <template slot-scope="scope">
             {{ (Number(scope.row.合同总额)-Number(scope.row.已付金额)).toFixed(2) }}
           </template>
         </el-table-column>
-        <el-table-column label="已付金额" sortable prop="已付金额" align="center" min-width="70" fixed="right">
+        <el-table-column label="已付金额" prop="已付金额" align="center" min-width="70" fixed="right">
           <template slot-scope="scope">
             {{ Number(scope.row.已付金额).toFixed(2) }}
           </template>
         </el-table-column>
-        <el-table-column label="付款进度" sortable prop="付款进度" align="center" min-width="150" fixed="right">
+        <el-table-column label="付款进度" prop="付款进度" align="center" min-width="150" fixed="right">
           <template slot-scope="scope">
             <el-progress
               :text-inside="true"
diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
index a76df524..eeaf49ee 100644
--- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
@@ -19,7 +19,7 @@
       </div>
       <h3>付款计划</h3>
       <el-table :data="tableData0" size="mini" border style="max-height: 250px;" height="250px" highlight-current-row @row-click="searchContract">
-        <el-table-column label="计划状态" sortable prop="计划付款日期" width="100" align="center">
+        <el-table-column label="计划状态" prop="计划付款日期" width="100" align="center">
           <template slot-scope="scope">
             <el-tag v-if="timeToStamp(scope.row.计划付款日期) <= getDate" type="danger" size="small">已拖期</el-tag>
             <el-tag v-if="timeToStamp(scope.row.计划付款日期) > getDate" type="success" size="small">未拖期</el-tag>
@@ -40,17 +40,17 @@
             {{ scope.row.计划付款备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购合同编号" sortable prop="采购合同编号" min-width="100" align="center" show-overflow-tooltip>
+        <el-table-column label="采购合同编号" prop="采购合同编号" min-width="100" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购合同名称" sortable prop="采购合同名称" min-width="100" align="center">
+        <el-table-column label="采购合同名称" prop="采购合同名称" min-width="100" align="center">
           <template slot-scope="scope">
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" sortable prop="供应商名称" min-width="150" align="center">
+        <el-table-column label="供应商" prop="供应商名称" min-width="150" align="center">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -86,17 +86,17 @@
       </div>
       <h3>请款表</h3>
       <el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe>
-        <el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
+        <el-table-column label="供应商" prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款时间" sortable prop="请款时间" align="center" min-width="150">
+        <el-table-column label="请款时间" prop="请款时间" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.请款时间 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款人" sortable prop="姓名" align="center" min-width="80">
+        <el-table-column label="请款人" prop="姓名" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
index 41cc2cd3..b83e3dfa 100644
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -110,7 +110,7 @@
             </el-form>
           </template>
         </el-table-column>
-        <el-table-column label="供应商" sortable prop="供应商名称" align="center" width="150" show-overflow-tooltip>
+        <el-table-column label="供应商" prop="供应商名称" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -120,19 +120,19 @@
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购合同号" sortable prop="采购合同编号" align="center" min-width="160">
+        <el-table-column label="采购合同号" prop="采购合同编号" align="center" min-width="160">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="审核情况" sortable prop="审核情况内容" align="center" min-width="100">
+        <el-table-column label="审核情况" prop="审核情况内容" align="center" min-width="100">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.审核情况内容==='未审核'" type="primary" size="small">未审核</el-tag>
             <el-tag v-if="scope.row.审核情况内容==='通过审核'" type="success" size="small">已通过</el-tag>
             <el-tag v-if="scope.row.审核情况内容==='未通过审核'" type="danger" size="small">未通过</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="审批情况" sortable prop="审批情况内容" align="center" min-width="100">
+        <el-table-column label="审批情况" prop="审批情况内容" align="center" min-width="100">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.审批情况内容==='未审批'" type="primary" size="small">未审批</el-tag>
             <el-tag v-if="scope.row.审批情况内容==='通过审批'" type="success" size="small">已通过</el-tag>
@@ -166,7 +166,7 @@
             <span v-else>—</span>
           </template>
         </el-table-column>
-        <el-table-column label="采购员" sortable prop="姓名" align="center" min-width="90">
+        <el-table-column label="采购员" prop="姓名" align="center" min-width="90">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index 25c1c42e..e72d35b9 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -39,7 +39,7 @@
     <el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()">
       <el-tab-pane label="标准件" name="标准件">
         <el-table :data="tableData0" size="mini" style="max-height: 600px" height="600px" border stripe>
-          <el-table-column align="center" sortable prop="询价状态编号" label="采购状态" width="100px">
+          <el-table-column align="center" prop="询价状态编号" label="采购状态" width="100px">
             <template slot-scope="scope">
               <el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
               <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
@@ -47,17 +47,17 @@
               <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="机床图号" sortable prop="机床图号" width="100px" show-overflow-tooltip>
+          <el-table-column align="center" label="机床图号" prop="机床图号" width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.机床图号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="组号" sortable prop="组号" width="80px">
+          <el-table-column align="center" label="组号" prop="组号" width="80px">
             <template slot-scope="scope">
               {{ scope.row.组号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="名称" sortable prop="物料名称" width="100px" show-overflow-tooltip>
+          <el-table-column align="center" label="名称" prop="物料名称" width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.物料名称 }}
             </template>
@@ -67,12 +67,12 @@
               {{ scope.row.物料型号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="规格" sortable prop="物料规格" min-width="200px" show-overflow-tooltip>
+          <el-table-column align="center" label="规格" prop="物料规格" min-width="200px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.物料规格 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="供货商" sortable prop="供货商" min-width="100px" show-overflow-tooltip>
+          <el-table-column align="center" label="供货商" prop="供货商" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.供货商 || '—' }}
             </template>
@@ -97,7 +97,7 @@
               {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="供应商" sortable prop="供应商名称" min-width="150px" show-overflow-tooltip>
+          <el-table-column align="center" label="供应商" prop="供应商名称" min-width="150px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }}
             </template>
@@ -127,7 +127,7 @@
       </el-tab-pane>
       <el-tab-pane label="外购件" name="外购件">
         <el-table :data="tableData1" size="mini" style="max-height: 600px" height="600px" border stripe>
-          <el-table-column align="center" label="采购状态" sortable prop="询价状态编号" width="100px">
+          <el-table-column align="center" label="采购状态" prop="询价状态编号" width="100px">
             <template slot-scope="scope">
               <el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
               <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
@@ -135,17 +135,17 @@
               <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="机床图号" sortable prop="机床图号" width="100px" show-overflow-tooltip>
+          <el-table-column align="center" label="机床图号" prop="机床图号" width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.机床图号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="组号" sortable prop="组号" width="80px">
+          <el-table-column align="center" label="组号" prop="组号" width="80px">
             <template slot-scope="scope">
               {{ scope.row.组号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="名称" sortable prop="物料名称" width="100px" show-overflow-tooltip>
+          <el-table-column align="center" label="名称" prop="物料名称" width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.物料名称 }}
             </template>
@@ -155,12 +155,12 @@
               {{ scope.row.物料型号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="规格" sortable prop="物料规格" min-width="200px" show-overflow-tooltip>
+          <el-table-column align="center" label="规格" prop="物料规格" min-width="200px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.物料规格 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="供货商" sortable prop="供货商" min-width="100px" show-overflow-tooltip>
+          <el-table-column align="center" label="供货商" prop="供货商" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.供货商 || '—' }}
             </template>
@@ -185,7 +185,7 @@
               {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="供应商" sortable prop="供应商名称" min-width="150px" show-overflow-tooltip>
+          <el-table-column align="center" label="供应商" prop="供应商名称" min-width="150px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }}
             </template>
@@ -215,7 +215,7 @@
       </el-tab-pane>
       <el-tab-pane label="基本件" name="基本件">
         <el-table :data="tableData2" size="mini" style="max-height: 600px" height="600px" border stripe>
-          <el-table-column align="center" label="采购状态" sortable prop="询价状态编号" width="100px">
+          <el-table-column align="center" label="采购状态" prop="询价状态编号" width="100px">
             <template slot-scope="scope">
               <el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
               <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
@@ -223,17 +223,17 @@
               <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="机床图号" sortable prop="机床图号" width="100px" show-overflow-tooltip>
+          <el-table-column align="center" label="机床图号" prop="机床图号" width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.机床图号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="组号" sortable prop="组号" width="80px">
+          <el-table-column align="center" label="组号" prop="组号" width="80px">
             <template slot-scope="scope">
               {{ scope.row.组号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="名称" sortable prop="物料名称" min-width="100px" show-overflow-tooltip>
+          <el-table-column align="center" label="名称" prop="物料名称" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.零件名称 }}
             </template>
@@ -243,7 +243,7 @@
               {{ scope.row.零件图号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="规格" sortable prop="规格" min-width="100px" show-overflow-tooltip>
+          <el-table-column align="center" label="规格" prop="规格" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.规格 }}
             </template>
@@ -253,7 +253,7 @@
               {{ scope.row.材料 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="供货商" sortable prop="供货商" min-width="100px" show-overflow-tooltip>
+          <el-table-column align="center" label="供货商" prop="供货商" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.供货商 || '—' }}
             </template>
@@ -278,7 +278,7 @@
               {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || '—' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="供应商" sortable prop="供应商名称" min-width="100px" show-overflow-tooltip>
+          <el-table-column align="center" label="供应商" prop="供应商名称" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || '—' }}
             </template>
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index 76b2257f..59967537 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -137,7 +137,7 @@
         <el-row style="margin-bottom: 10px">
           <el-table v-loading="" :data="tableData0" size="mini" style="max-height: 600px" height="500px" border stripe @selection-change="handleSelectionChange1">
             <el-table-column :selectable="selectable" align="center" type="selection"/>
-            <el-table-column align="center" label="采购情况" sortable prop="询价状态编号" min-width="100px">
+            <el-table-column align="center" label="采购情况" prop="询价状态编号" min-width="100px">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.人员编号===''" type="primary" size="small">未分配</el-tag>
                 <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
@@ -145,12 +145,12 @@
                 <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="项目名称" sortable prop="项目名称" min-width="100px">
+            <el-table-column align="center" label="项目名称" prop="项目名称" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.项目名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="机床图号" label="机床图号" min-width="100px">
+            <el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
               </template>
@@ -160,27 +160,27 @@
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="物料类别" label="物料类别" min-width="100px">
+            <el-table-column align="center" prop="物料类别" label="物料类别" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.物料类别 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="物料品种" label="物料品种" min-width="100px">
+            <el-table-column align="center" prop="物料品种" label="物料品种" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.物料品种 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="物料型号" label="图号或型号" min-width="110px">
+            <el-table-column align="center" prop="物料型号" label="图号或型号" min-width="110px">
               <template slot-scope="scope">
                 {{ scope.row.物料型号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="物料名称" label="名称" min-width="100px">
+            <el-table-column align="center" prop="物料名称" label="名称" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.物料名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="物料规格" label="规格" min-width="100px">
+            <el-table-column align="center" prop="物料规格" label="规格" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.物料规格 }}
               </template>
@@ -195,7 +195,7 @@
                 {{ scope.row.备注 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="供货商" label="供货商" min-width="100px">
+            <el-table-column align="center" prop="供货商" label="供货商" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.供货商 }}
               </template>
@@ -354,7 +354,7 @@
         <el-row style="margin-bottom: 10px">
           <el-table v-loading="" :data="tableData1" size="mini" style="max-height: 600px" height="500px" border stripe @selection-change="handleSelectionChange1">
             <el-table-column :selectable="selectable" align="center" type="selection"/>
-            <el-table-column align="center" sortable prop="询价状态编号" label="采购情况" min-width="100px">
+            <el-table-column align="center" prop="询价状态编号" label="采购情况" min-width="100px">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.人员编号===''" type="primary" size="small">未分配</el-tag>
                 <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
@@ -362,12 +362,12 @@
                 <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="项目名称" label="项目名称" min-width="100px">
+            <el-table-column align="center" prop="项目名称" label="项目名称" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.项目名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="机床图号" label="机床图号" min-width="100px">
+            <el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
               </template>
@@ -377,27 +377,27 @@
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="物料类别" label="物料类别" min-width="100px">
+            <el-table-column align="center" prop="物料类别" label="物料类别" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.物料类别 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="物料品种" sortable prop="物料品种" min-width="100px">
+            <el-table-column align="center" label="物料品种" prop="物料品种" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.物料品种 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="物料型号" label="图号或型号" min-width="110px">
+            <el-table-column align="center" prop="物料型号" label="图号或型号" min-width="110px">
               <template slot-scope="scope">
                 {{ scope.row.物料型号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="物料名称" label="名称" min-width="100px">
+            <el-table-column align="center" prop="物料名称" label="名称" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.物料名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="物料规格" label="规格" min-width="100px">
+            <el-table-column align="center" prop="物料规格" label="规格" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.物料规格 }}
               </template>
@@ -412,7 +412,7 @@
                 {{ scope.row.备注 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="供货商" label="供货商" min-width="100px">
+            <el-table-column align="center" prop="供货商" label="供货商" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.供货商 }}
               </template>
@@ -545,7 +545,7 @@
         <el-row style="margin-bottom: 10px">
           <el-table v-loading="" :data="tableData2" size="mini" style="max-height: 600px" height="500px" border stripe @selection-change="handleSelectionChange2">
             <el-table-column :selectable="selectable" align="center" type="selection"/>
-            <el-table-column align="center" sortable prop="询价状态编号" label="采购情况" min-width="80px">
+            <el-table-column align="center" prop="询价状态编号" label="采购情况" min-width="80px">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.人员编号===''" type="primary" size="small">未分配</el-tag>
                 <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
@@ -553,32 +553,32 @@
                 <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="项目名称" label="项目名称" min-width="100px">
+            <el-table-column align="center" prop="项目名称" label="项目名称" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.项目名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="机床图号" label="机床图号" min-width="100px">
+            <el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="组号" label="组号" min-width="80px">
+            <el-table-column align="center" prop="组号" label="组号" min-width="80px">
               <template slot-scope="scope">
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="零件图号" label="图号" min-width="100px">
+            <el-table-column align="center" prop="零件图号" label="图号" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="零件名称" label="名称" min-width="100px">
+            <el-table-column align="center" prop="零件名称" label="名称" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.零件名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="规格" label="规格" min-width="100px">
+            <el-table-column align="center" prop="规格" label="规格" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.规格 }}
               </template>
@@ -598,7 +598,7 @@
                 {{ scope.row.备注 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" sortable prop="供货商" label="供货商" min-width="100px">
+            <el-table-column align="center" prop="供货商" label="供货商" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.供货商 }}
               </template>
diff --git a/src/views/PurchasingCenter/SetPayPlan/index.vue b/src/views/PurchasingCenter/SetPayPlan/index.vue
index fbc8d73e..e6d1df72 100644
--- a/src/views/PurchasingCenter/SetPayPlan/index.vue
+++ b/src/views/PurchasingCenter/SetPayPlan/index.vue
@@ -70,17 +70,17 @@
             </el-table>
           </template>
         </el-table-column>
-        <el-table-column label="采购合同编号" sortable prop="采购合同编号" align="center" min-width="100">
+        <el-table-column label="采购合同编号" prop="采购合同编号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购合同名称" sortable prop="采购合同名称" align="center" min-width="100">
+        <el-table-column label="采购合同名称" prop="采购合同名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="200">
+        <el-table-column label="供应商" prop="供应商名称" align="center" min-width="200">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue
index 4dddad2b..a0fb204a 100644
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -25,7 +25,7 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button icon="el-icon-search" type="success" size="small" @click="pageCurrentWB = 1;pageSizeWB = 10;pageCurrent = 1;pageSize = 10;getTableData()">查询</el-button>
+      <el-button icon="el-icon-search" type="success" size="small" @click="pageCurrentWB = 1;pageSizeWB = 1000;pageCurrent = 1;pageSize = 1000;getTableData()">查询</el-button>
     </el-card>
     <el-card>
       <div v-for="(file, key) in hadFile" :key="key">
@@ -62,7 +62,6 @@
         <el-table-column
           label="机床图号"
           align="center"
-          sortable
           prop="机床图号"
           min-width="150px">
           <template slot-scope="scope">{{ scope.row.机床图号 }}</template>
@@ -70,7 +69,6 @@
         <el-table-column
           label="零件图号"
           align="center"
-          sortable
           prop="零件图号"
           min-width="200px">
           <template slot-scope="scope">{{ scope.row.零件图号 }}</template>
@@ -78,7 +76,6 @@
         <el-table-column
           label="零件名称"
           align="center"
-          sortable
           prop="零件名称"
           min-width="140px">
           <template slot-scope="scope">{{ scope.row.零件名称 }}</template>
@@ -86,7 +83,6 @@
         <el-table-column
           label="组号"
           align="center"
-          sortable
           prop="组号"
           min-width="80px">
           <template slot-scope="scope">{{ scope.row.组号 }}</template>
@@ -109,14 +105,12 @@
         </el-table-column>
         <el-table-column
           label="材料"
-          sortable
           prop="材料"
           align="center">
           <template slot-scope="scope">{{ scope.row.材料 }}</template>
         </el-table-column>
         <el-table-column
           label="规格"
-          sortable
           prop="规格"
           align="center">
           <template slot-scope="scope">{{ scope.row.规格 }}</template>
@@ -161,10 +155,10 @@
       <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"
+          layout="total"
           @size-change="handleSizeChanges"
           @current-change="handleCurrentChanges"/>
       </div>
@@ -185,17 +179,17 @@
           align="center"
           type="index"
           width="50"/>
-        <el-table-column align="center" sortable prop="物料名称" label="物料名称">
+        <el-table-column align="center" prop="物料名称" label="物料名称">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" sortable prop="物料规格" label="物料规格">
+        <el-table-column align="center" prop="物料规格" label="物料规格">
           <template slot-scope="scope">
             {{ scope.row.物料规格 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" sortable prop="物料型号" label="物料型号">
+        <el-table-column align="center" prop="物料型号" label="物料型号">
           <template slot-scope="scope">
             {{ scope.row.物料型号 }}
           </template>
@@ -215,12 +209,12 @@
             {{ scope.row.机床数量 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" sortable prop="零件类型" label="零件类型">
+        <el-table-column align="center" prop="零件类型" label="零件类型">
           <template slot-scope="scope">
             {{ scope.row.零件类型 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" sortable prop="供货商" label="供货商">
+        <el-table-column align="center" prop="供货商" label="供货商">
           <template slot-scope="scope">
             {{ scope.row.供货商 }}
           </template>
@@ -260,10 +254,10 @@
       <div class="block" style="margin-top: 10px">
         <el-pagination
           :current-page="pageCurrentWB"
-          :page-sizes="[10, 20, 30, 40]"
+          :page-sizes="[10, 20, 30, 40, 100]"
           :page-size="pageSizeWB"
           :total="totalWB"
-          layout="total, sizes, prev, pager, next, jumper"
+          layout="total"
           @size-change="handleSizeChangeWB"
           @current-change="handleCurrentChangeWB"/>
       </div>
@@ -291,9 +285,9 @@ export default {
       tableData: [],
       tableDataWB: [],
       pageCurrent: 1,
-      pageSize: 10,
+      pageSize: 1000,
       pageCurrentWB: 1,
-      pageSizeWB: 10,
+      pageSizeWB: 1000,
       totalWB: 0,
       hadFile: []
     }
@@ -347,9 +341,9 @@ export default {
     groupValue(val) {
       if (val) {
         this.pageCurrentWB = 1
-        this.pageSizeWB = 10
+        this.pageSizeWB = 1000
         this.pageCurrent = 1
-        this.pageSize = 10
+        this.pageSize = 1000
         this.getTableData()
       }
     }
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index 022aeb8b..572a6b33 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -39,12 +39,12 @@
         </el-tooltip>
         <el-table v-loading="loading1" :data="tableData1" border stripe highlight-current-row style="width: 100%;margin-top:3px;" height="330" size="mini" @selection-change="handleSelectionChange">
           <el-table-column type="selection" align="center" width="55"/>
-          <el-table-column label="零件图号" sortable prop="零件图号" min-width="100" align="center">
+          <el-table-column label="零件图号" prop="零件图号" min-width="100" align="center">
             <template slot-scope="scope">
               {{ scope.row.零件图号 }}
             </template>
           </el-table-column>
-          <el-table-column label="零件名称" sortable prop="零件名称" min-width="100" align="center">
+          <el-table-column label="零件名称" prop="零件名称" min-width="100" align="center">
             <template slot-scope="scope">
               {{ scope.row.零件名称 }}
             </template>
@@ -54,7 +54,7 @@
               {{ scope.row.批次数量 }}
             </template>
           </el-table-column>
-          <el-table-column label="材料" sortable prop="材料" align="center">
+          <el-table-column label="材料" prop="材料" align="center">
             <template slot-scope="scope">
               {{ scope.row.材料 }}
             </template>
@@ -88,7 +88,7 @@
         </el-tooltip>
       </div>
       <el-table v-loading="" :data="tableData2" border stripe style="max-height: 460px;" height="230px" size="mini" highlight-current-row @row-click="searchTable3">
-        <el-table-column label="采购状态" sortable prop="采购计划状态" align="center" width="100" fixed="left">
+        <el-table-column label="采购状态" prop="采购计划状态" align="center" width="100" fixed="left">
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">编辑中</el-tag>
             <el-tag v-if="Number(scope.row.采购计划状态)===1" type="primary" size="mini">已保存</el-tag>
@@ -96,27 +96,27 @@
             <el-tag v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="采购计划单号" sortable prop="采购单号" align="center" min-width="170">
+        <el-table-column label="采购计划单号" prop="采购单号" align="center" min-width="170">
           <template slot-scope="scope">
             {{ scope.row.采购单号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购计划单名称" sortable prop="采购单名称" align="center" min-width="170">
+        <el-table-column label="采购计划单名称" prop="采购单名称" align="center" min-width="170">
           <template slot-scope="scope">
             {{ scope.row.采购单名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
+        <el-table-column label="供应商" prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购员" sortable prop="姓名" align="center" min-width="80">
+        <el-table-column label="采购员" prop="姓名" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="下单日期" sortable prop="下单日期" align="center" width="100">
+        <el-table-column label="下单日期" prop="下单日期" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.下单日期.split(' ')[0] }}
           </template>
@@ -165,7 +165,7 @@
             <el-tag v-if="Number(scope.row.是否到货)===2" type="info" size="mini">已结算</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="物料编码" sortable prop="物料零件编码" align="center" width="200">
+        <el-table-column label="物料编码" prop="物料零件编码" align="center" width="200">
           <template slot-scope="scope">
             {{ scope.row.物料零件编码 }}
           </template>
@@ -175,12 +175,12 @@
         <!--{{ scope.row.原材料名称 }}-->
         <!--</template>-->
         <!--</el-table-column>-->
-        <el-table-column label="零件名称" sortable prop="零件名称" align="center">
+        <el-table-column label="零件名称" prop="零件名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="材料" sortable prop="材料" align="center" >
+        <el-table-column label="材料" prop="材料" align="center" >
           <template slot-scope="scope">
             {{ scope.row.材料 }}
           </template>
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
index 21467716..ce49071b 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
@@ -42,12 +42,12 @@
             </el-form>
           </template>
         </el-table-column>
-        <el-table-column label="供应商" sortable prop="供应商名称" align="center" width="170" show-overflow-tooltip>
+        <el-table-column label="供应商" prop="供应商名称" align="center" width="170" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="发票号" sortable prop="发票号" align="center" width="130">
+        <el-table-column label="发票号" prop="发票号" align="center" width="130">
           <template slot-scope="scope">
             {{ scope.row.发票号 }}
           </template>
@@ -57,17 +57,17 @@
             {{ scope.row.发票金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="申请人" sortable prop="申请人姓名" align="center" width="100">
+        <el-table-column label="申请人" prop="申请人姓名" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
           </template>
         </el-table-column>
-        <el-table-column label="申请时间" sortable prop="申请时间" align="center" width="130">
+        <el-table-column label="申请时间" prop="申请时间" align="center" width="130">
           <template slot-scope="scope">
             {{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="采购审批" sortable prop="审批人1姓名" align="center" width="100">
+        <el-table-column label="采购审批" prop="审批人1姓名" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }}
           </template>
@@ -77,7 +77,7 @@
             {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="财务审批" sortable prop="审批人2姓名" align="center" width="100">
+        <el-table-column label="财务审批" prop="审批人2姓名" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.审批人2姓名 ? scope.row.审批人2姓名 : '未审批' }}
           </template>
@@ -87,7 +87,7 @@
             {{ scope.row.审批2时间 ? scope.row.审批2时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="总经理审批" sortable prop="审批人3姓名" align="center" width="120">
+        <el-table-column label="总经理审批" prop="审批人3姓名" align="center" width="120">
           <template slot-scope="scope">
             {{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
           </template>
diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue
index a0506d2c..f597dc98 100644
--- a/src/views/WorkshopProcurement/NewArrivalList/index.vue
+++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue
@@ -40,12 +40,12 @@
             <el-tag v-else type="primary" size="mini">未结算</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="280">
+        <el-table-column label="供应商" prop="供应商名称" align="center" min-width="280">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="到货日期" sortable prop="到货日期" align="center" width="150">
+        <el-table-column label="到货日期" prop="到货日期" align="center" width="150">
           <template slot-scope="scope">
             {{ scope.row.日期.split(' ')[0] }}
           </template>
@@ -99,7 +99,7 @@
         size="mini"
         @row-click="searchTable6">
         <el-table-column width="60" align="center" type="index" label="序号"/>
-        <el-table-column label="材料" sortable prop="材料" align="center" width="200">
+        <el-table-column label="材料" prop="材料" align="center" width="200">
           <template slot-scope="scope">
             {{ scope.row.材料 }}
           </template>
@@ -155,17 +155,17 @@
         stripe
         style="margin: 3px 0"
         size="mini">
-        <el-table-column label="物料编码" sortable prop="物料零件编码" align="center" width="200">
+        <el-table-column label="物料编码" prop="物料零件编码" align="center" width="200">
           <template slot-scope="scope">
             {{ scope.row.物料零件编码 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" sortable prop="零件名称" align="center">
+        <el-table-column label="零件名称" prop="零件名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="材料" sortable prop="材料" align="center" >
+        <el-table-column label="材料" prop="材料" align="center" >
           <template slot-scope="scope">
             {{ scope.row.材料 }}
           </template>
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
index f5c37bbf..2bd67020 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -89,9 +89,6 @@
             </el-table>
           </template>
         </el-table-column>
-<<<<<<< HEAD
-        <el-table-column align="center" label="发票号" sortable prop="发票号" min-width="120px">
-=======
         <el-table-column align="center" label="发票状态" min-width="100px">
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.是否请款) === 0" type="warning" size="mini">未请款</el-tag>
@@ -99,12 +96,11 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="发票号" min-width="120px">
->>>>>>> b61c5180f7663ad09422c333eddaa302cafc0307
           <template slot-scope="scope">
             {{ scope.row.发票号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="开票时间" sortable prop="开票时间" min-width="100px">
+        <el-table-column align="center" label="开票时间" prop="开票时间" min-width="100px">
           <template slot-scope="scope">
             {{ scope.row.开票时间 }}
           </template>
@@ -114,7 +110,7 @@
             {{ scope.row.开票金额 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="供应商" sortable prop="供应商名称" min-width="200px" show-overflow-tooltip>
+        <el-table-column align="center" label="供应商" prop="供应商名称" min-width="200px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
diff --git a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
index dc12e468..37859d89 100644
--- a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
+++ b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
@@ -33,17 +33,17 @@
 
     <el-card>
       <el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe>
-        <el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="250">
+        <el-table-column label="供应商" prop="供应商名称" align="center" min-width="250">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款时间" sortable prop="请款时间" align="center" min-width="150">
+        <el-table-column label="请款时间" prop="请款时间" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.请款时间 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款人" sortable prop="姓名" align="center" min-width="80">
+        <el-table-column label="请款人" prop="姓名" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
index 3b6b6970..6f09c7c0 100644
--- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
@@ -65,7 +65,7 @@
             </el-table>
           </template>
         </el-table-column>
-        <el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
+        <el-table-column label="供应商" prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>