diff --git a/src/api/Inventory/CreatePickingList.js b/src/api/Inventory/CreatePickingList.js
index b9200298..e4176c32 100644
--- a/src/api/Inventory/CreatePickingList.js
+++ b/src/api/Inventory/CreatePickingList.js
@@ -42,7 +42,19 @@ export function searchTable(...params) {
     data: {
       type: '1',
       name: '车间装配管理_领料单_三表_查询数据',
-      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&名称_check=${params[4]}&名称=${params[5]}&零件类型=${params[8]}`,
+      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&名称_check=${params[4]}&名称=${params[5]}&型号_check=${params[6]}&型号=${params[7]}&规格_check=${params[8]}&规格=${params[9]}&领料情况_check=${params[10]}&领料情况=${params[11]}&零件类型=${params[14]}`,
+      Pagination: params[12] + '&' + params[13]
+    }
+  })
+}
+export function searchPart(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '库存管理_离线外购件_出库查询',
+      param: `物料名称_check=${params[0]}&物料名称=${params[1]}&物料规格_check=${params[2]}&物料规格=${params[3]}&物料型号_check=${params[4]}&物料型号=${params[5]}`,
       Pagination: params[6] + '&' + params[7]
     }
   })
@@ -108,6 +120,18 @@ export function selectIntoList(...params) {
     }
   })
 }
+// 选入领料单
+export function IntoMateerial(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '离线采购_领料明细_增加数据_循环',
+      param: `物料流水号组=${params[0]}&组件零件基本件流水号组=${params[1]}&领料数量组=${params[2]}&领料单流水号=${params[3]}&机床流水号=${params[4]}`
+    }
+  })
+}
 // 删除领料单
 export function dropListDetail(num) {
   return request({
@@ -128,7 +152,7 @@ export function searchListDetailMX(...params) {
     data: {
       type: '1',
       name: '车间装配管理_领料单明细_详情_查询数据',
-      param: `领料单流水号=${params[0]}&基本件流水号=${params[1]}&标准件和外购件流水号=${params[2]}`
+      param: `领料单流水号=${params[0]}&基本件流水号=${params[1]}&标准件和外购件流水号=${params[2]}&离线采购件流水号=${params[3]}`
     }
   })
 }
diff --git a/src/api/Inventory/MaterialOut.js b/src/api/Inventory/MaterialOut.js
index f75a1aac..a1d42e3e 100644
--- a/src/api/Inventory/MaterialOut.js
+++ b/src/api/Inventory/MaterialOut.js
@@ -103,7 +103,7 @@ export function submitOutStore(...params) {
     data: {
       type: '2',
       name: '库存管理_物料出库_出库记录_增加数据_循环',
-      param: `领料单明细水号组=${params[0]}&基本件流水号组=${params[1]}&物料流水号组=${params[2]}&标准件和外购件流水号组=${params[3]}&请购单明细流水号组=${params[4]}&组件流水号组=${params[5]}&机床流水号组=${params[6]}&出库数量组=${params[7]}&出库人流水号=${params[8]}&领料人编号=${params[9]}&出库类别=${params[10]}&领料单流水号=${params[11]}`
+      param: `领料单明细水号组=${params[0]}&基本件流水号组=${params[1]}&物料流水号组=${params[2]}&标准件和外购件流水号组=${params[3]}&请购单明细流水号组=${params[4]}&组件流水号组=${params[5]}&机床流水号组=${params[6]}&出库数量组=${params[7]}&出库人流水号=${params[8]}&领料人编号=${params[9]}&出库类别=${params[10]}&领料单流水号=${params[11]}&离线采购件流水号组=${params[12]}`
     }
   })
 }
diff --git a/src/api/Inventory/OfflinePartOut.js b/src/api/Inventory/OfflinePartOut.js
index ab33de83..6f2cf921 100644
--- a/src/api/Inventory/OfflinePartOut.js
+++ b/src/api/Inventory/OfflinePartOut.js
@@ -61,14 +61,14 @@ export function searchPeople(data1) {
   })
 }
 // 离线件出库
-export function outlinePartOut(data2, data3, data4, data5, data6, data7, data8, data9, data10, data11) {
+export function outlinePartOut(data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '库存管理_离线采购件_零件出库',
-      param: '领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + '&项目流水号=' + data6 + '&机床流水号=' + data7 + '&组件流水号=' + data8 + '&物料流水号=' + data9 + '&出库人员流水号=' + data10 + '&离线合同明细流水号=' + data11
+      param: '领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + '&项目流水号=' + data6 + '&机床流水号=' + data7 + '&组件流水号=' + data8 + '&物料流水号=' + data9 + '&出库人员流水号=' + data10 + '&离线合同明细流水号=' + data11 + '&组件零件基本件流水号=' + data12
     }
   })
 }
diff --git a/src/api/Inventory/PurchaseInRecord.js b/src/api/Inventory/PurchaseInRecord.js
index e86dedea..7ac36d53 100644
--- a/src/api/Inventory/PurchaseInRecord.js
+++ b/src/api/Inventory/PurchaseInRecord.js
@@ -1,25 +1,13 @@
 import request from '@/utils/request'
 
-// 初始化项目
-export function initProject() {
+// 初始化机床项目
+export function initMachineProject() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: 'PDM_项目名称_查询数据_按时间排序'
-    }
-  })
-}
-// 机床查询
-export function searchMachine(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: 'PDM_机床名称_查询数据',
-      param: '项目流水号_check=1&项目流水号=' + num
+      name: 'PDM_项目名称_查询数据'
     }
   })
 }
@@ -36,27 +24,14 @@ export function searchGroup(num) {
   })
 }
 // 查询采购件入库记录
-export function searchRecord1(check1, project, check2, machine, check3, group, check4, name, check5, spec, check6, model, pageCurrent, pageSize) {
+export function searchRecord1(check1, project, check2, machine, check3, group, check4, name, check5, spec, check6, model, check7, time1, time2, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: `库存管理_入库记录_采购件_查询数据`,
-      param: `项目流水号_check=${check1}&项目流水号=${project}&机床流水号_check=${check2}&机床流水号=${machine}&组件流水号_check=${check3}&组件流水号=${group}&名称_check=${check4}&名称=${name}&规格_check=${check5}&规格=${spec}&图号或型号_check=${check6}&图号或型号=${model}`,
-      Pagination: pageCurrent + '&' + pageSize
-    }
-  })
-}
-// 查询离线件入库记录
-export function searchRecord2(check4, name, check5, spec, check6, model, pageCurrent, pageSize) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: `库存管理_入库记录_离线件_查询数据`,
-      param: `名称_check=${check4}&名称=${name}&规格_check=${check5}&规格=${spec}&图号或型号_check=${check6}&图号或型号=${model}`,
+      param: `项目流水号_check=${check1}&项目流水号=${project}&机床流水号_check=${check2}&机床流水号=${machine}&组件流水号_check=${check3}&组件流水号=${group}&名称_check=${check4}&名称=${name}&规格_check=${check5}&规格=${spec}&图号或型号_check=${check6}&图号或型号=${model}&入库时间_check=${check7}&入库开始时间=${time1}&入库结束时间=${time2}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/api/Inventory/PurchaseOutRecord.js b/src/api/Inventory/PurchaseOutRecord.js
index 27505231..b71a1eff 100644
--- a/src/api/Inventory/PurchaseOutRecord.js
+++ b/src/api/Inventory/PurchaseOutRecord.js
@@ -1,25 +1,13 @@
 import request from '@/utils/request'
 
-// 初始化项目
-export function initProject() {
+// 初始化机床项目
+export function initMachineProject() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: 'PDM_项目名称_查询数据_按时间排序'
-    }
-  })
-}
-// 机床查询
-export function searchMachine(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: 'PDM_机床名称_查询数据',
-      param: '项目流水号_check=1&项目流水号=' + num
+      name: 'PDM_项目名称_查询数据'
     }
   })
 }
diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/api/PurchasingCenter/OfflineContract.js
index 37be21be..58f4e99f 100644
--- a/src/api/PurchasingCenter/OfflineContract.js
+++ b/src/api/PurchasingCenter/OfflineContract.js
@@ -111,14 +111,14 @@ export function searchMateriel(num) {
   })
 }
 // 增加离线合同明细
-export function addMateriel(num1, num2) {
+export function addMateriel(num1, num2, num3, num4, num5, num6) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '采购管理_离线合同明细_增加数据',
-      param: `离线合同流水号=${num1}&物料流水号组=${num2}`
+      param: `离线合同流水号=${num1}&组件零件流水号组=${num2}&组件零件基本件流水号组=${num3}&物料流水号组=${num4}&id组=${num5}&数量组=${num6}`
     }
   })
 }
@@ -134,6 +134,30 @@ export function deleteMateriel(num) {
     }
   })
 }
+// 使用库存
+export function changeNum(num, num1, num2, num3, num4) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_离线采购_占用数量_插入',
+      param: `物料流水号=${num}&使用库存数=${num1}&机床流水号=${num2}&组件零件流水号=${num3}&数量=${num4}`
+    }
+  })
+}
+// 使用滞货
+export function submitUseInventory(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_使用滞货',
+      param: `物料流水号=${params[0]}&使用滞货数量=${params[1]}&组件零件流水号=${params[2]}&使用人编号=${params[3]}`
+    }
+  })
+}
 // 保存离线合同
 export function saveOfflineContact(contractNum, total, partGroup, numGroup, priceGroup, dateGroup, remarkGroup, taxRate) {
   return request({
@@ -183,6 +207,91 @@ export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2
     }
   })
 }
+// 查询分配后的标准件和外购件
+export function searchMaterial1(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7, val8, val9, val10) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存',
+      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 查询分配后的基本件
+export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_采购部采购_查询物料_基本件_分配后',
+      param: `物料状态编号=${num1}&零件图号_check=${check1}&零件图号=${val1}&零件名称_check=${check2}&零件名称=${val2}&零件规格_check=${check3}&零件规格=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 查询分配后的仓库采购件
+export function searchMaterial22(num1, check1, val1, check2, val2, check3, val3, person, val8, val9, val10) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_仓库采购_离线合同_查询',
+      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`
+    }
+  })
+}
+// 初始化项目
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_项目名称_查询数据_按时间排序'
+    }
+  })
+}
+// 机床查询
+export function searchMachine(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_机床名称_查询数据',
+      param: '项目流水号_check=1&项目流水号=' + num
+    }
+  })
+}
+// 分组查询
+export function searchGroup(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_组件名称_查询数据',
+      param: '机床流水号=' + num
+    }
+  })
+}
+export function getPerson() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: 'select * from dbo.人事档案管理_人员名单 inner join dbo.菜单系统模块_人员与角色 ' +
+      'on 人事档案管理_人员名单.人员编号=菜单系统模块_人员与角色.人员编号 ' +
+      'where 角色编号=3 or 角色编号=2'
+    }
+  })
+}
 // 初始化离线合同
 export function initOfflineContract() {
   return request({
@@ -207,3 +316,25 @@ export function submitBind(...params) {
     }
   })
 }
+export function tiaozheng1(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购件入库_创建询价单_调整采购任务_循环执行',
+      param: '人员编号=' + num1 + '&标准件和外购件流水号组=' + num2
+    }
+  })
+}
+export function tiaozheng2(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购件入库_创建询价单_调整采购任务_基本件_循环执行',
+      param: '人员编号=' + num1 + '&基本件流水号组=' + num2
+    }
+  })
+}
diff --git a/src/assets/img/img27.png b/src/assets/img/img27.png
new file mode 100644
index 00000000..60a122b3
Binary files /dev/null and b/src/assets/img/img27.png differ
diff --git a/src/assets/img/img28.png b/src/assets/img/img28.png
new file mode 100644
index 00000000..60a122b3
Binary files /dev/null and b/src/assets/img/img28.png differ
diff --git a/src/utils/request.js b/src/utils/request.js
index 7218f9b2..1da72057 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -16,9 +16,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic
 export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
 export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx`
 export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx`
-export const url = `http://192.168.0.110:8002/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
-export const ExcelDownLoad = 'http://192.168.0.110:8002/submit/downloadFile.ashx' // 导出excel
-
+export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
+export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel
 // 技术中心程序发布时要更改下面所有的IP到0段
 export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
 export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图  发布时改成0.231
@@ -26,7 +25,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/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index 74dc3854..cf44b474 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -361,9 +361,9 @@
             {{ scope.row.工艺名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="工位" prop="mes终端编号" align="center" width="80px">
+        <el-table-column label="工位" prop="MES终端编号" align="center" width="80px">
           <template slot-scope="scope">
-            {{ scope.row.mes终端编号 }}
+            {{ scope.row.MES终端编号 }}
           </template>
         </el-table-column>
         <el-table-column label="操作工" prop="姓名" align="center">
diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue
index e161c9ec..07741f00 100644
--- a/src/views/Inventory/CreatePickingList/index.vue
+++ b/src/views/Inventory/CreatePickingList/index.vue
@@ -1,92 +1,87 @@
 <template>
   <div class="app-container">
-    <el-card>
+    <el-card style="width: 57%">
       <div slot="header">
-        <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange">
-          <el-option
-            v-for="item in machineNumber"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-            <div style="float: left">{{ item.label }}</div>
-            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
-          </el-option>
-        </el-select>
-        <span>组号:</span>
-        <el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable>
-          <el-option
-            v-for="item in groupNumber"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <span>名称:</span>
-        <el-input v-model="Name" placeholder="名称" clearable size="small"/>
-        <span>领料情况:</span>
-        <el-select v-model="PickingValue" placeholder="领料情况" size="small" clearable>
-          <el-option
-            v-for="item in Picking"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent0=1;pageSize0=20;pageCurrent1=1;pageSize1=20;pageCurrent2=1;pageSize2=20;searchTable()">查询</el-button>
+        <el-row>
+          <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable style="width: 120px" @change="machineChange">
+            <el-option
+              v-for="item in machineNumber"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+              <div style="float: left">{{ item.label }}</div>
+              <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+            </el-option>
+          </el-select>
+          <el-select v-model="groupNumberValue" placeholder="组号" size="small" style="width: 120px" clearable>
+            <el-option
+              v-for="item in groupNumber"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <el-select v-model="PickingValue" placeholder="领料情况" size="small" style="width: 120px" clearable>
+            <el-option
+              v-for="item in Picking"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <el-input v-model="Name" placeholder="名称" clearable style="width: 120px" size="small"/>
+          <el-input v-model="materialSpec" placeholder="物料规格" style="width: 120px" clearable size="small"/>
+          <el-input v-model="materialModel" placeholder="物料型号" style="width: 120px" clearable size="small"/>
+          <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent0=1;pageSize0=300;pageCurrent1=1;pageSize1=300;pageCurrent2=1;pageSize2=300;pageCurrent4=1;pageSize4=20;searchTable()">查询</el-button>
+        </el-row>
       </div>
       <el-tabs v-model="PartType" type="card" @tab-click="searchTable()">
         <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" prop="机床图号" label="机床图号" min-width="100px">
+          <el-table ref="multipleTable" :data="tableData0" size="mini" style="max-height: 600px" height="500px" border stripe @selection-change="handleSelectionChange">
+            <el-table-column :selectable="selectable" type="selection" align="center" width="50"/>
+            <el-table-column align="center" prop="机床图号" label="机床图号" width="130px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="组号" label="组号" min-width="80px">
+            <el-table-column align="center" prop="组号" label="组号" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料名称" label="名称" min-width="100px">
+            <el-table-column align="center" prop="物料名称" label="名称" width="100px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.物料名称 }}
               </template>date
             </el-table-column>
-            <el-table-column align="center" prop="型号" label="型号" min-width="100px">
+            <el-table-column align="center" prop="型号" label="型号" min-width="120px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.物料型号 || '—' }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="规格排序" label="规格" min-width="200px">
+            <el-table-column align="center" prop="规格排序" label="规格" min-width="150px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.物料规格 || '—' }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="单台机床数量" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.单台机床数量 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="总数量" min-width="100px">
+            <el-table-column align="center" label="总数量" width="60px">
               <template slot-scope="scope">
                 {{ scope.row.总数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="备件数量" min-width="100px">
+            <el-table-column align="center" label="备件数" width="60px">
               <template slot-scope="scope">
                 {{ scope.row.备件总数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="领料单编号" min-width="100px">
+            <el-table-column align="center" label="领料单编号" width="100px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.领料单编号 }}
               </template>
             </el-table-column>
           </el-table>
-          <div class="block" style="float:right;">
+          <div class="block">
             <el-pagination
               :current-page="pageCurrent0"
-              :page-sizes="[10, 20, 30, 40]"
+              :page-sizes="[10, 20, 30, 40, 300]"
               :page-size="pageSize0"
               :total="total0"
               style="margin-top:10px;display:inline-block;width:50%"
@@ -96,53 +91,53 @@
           </div>
         </el-tab-pane>
         <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" prop="机床图号" label="机床图号" min-width="100px">
+          <el-table ref="multipleTable" :data="tableData1" size="mini" style="max-height: 500px" height="600px" border stripe @selection-change="handleSelectionChange">
+            <el-table-column :selectable="selectable" type="selection" align="center" width="50"/>
+            <el-table-column align="center" prop="机床图号" label="机床图号" width="130px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="组号" label="组号" min-width="80px">
+            <el-table-column align="center" prop="组号" label="组号" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料名称" label="名称" min-width="100px">
+            <el-table-column align="center" prop="物料名称" label="名称" width="100px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.物料名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="型号" label="型号" min-width="100px">
+            <el-table-column align="center" prop="型号" label="型号" min-width="130px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.物料型号 || '—' }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料规格" label="规格" min-width="200px">
+            <el-table-column align="center" prop="物料规格" label="规格" min-width="200px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.物料规格 || '—' }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="总数量" min-width="100px">
+            <el-table-column align="center" label="总数量" width="60px">
               <template slot-scope="scope">
                 {{ scope.row.总数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="备件数量" min-width="100px">
+            <el-table-column align="center" label="备件数" width="60px">
               <template slot-scope="scope">
                 {{ scope.row.备件总数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="领料单编号" min-width="100px">
+            <el-table-column align="center" label="领料单编号" width="100px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.领料单编号 }}
               </template>
             </el-table-column>
           </el-table>
-          <div class="block" style="float:right;">
+          <div class="block">
             <el-pagination
               :current-page="pageCurrent1"
-              :page-sizes="[10, 20, 30, 40]"
+              :page-sizes="[10, 20, 30, 40, 300]"
               :page-size="pageSize1"
               :total="total1"
               style="margin-top:10px;display:inline-block;width:50%"
@@ -152,58 +147,58 @@
           </div>
         </el-tab-pane>
         <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" prop="机床图号" label="机床图号" min-width="100px">
+          <el-table ref="multipleTable" :data="tableData2" size="mini" style="max-height: 500px" height="600px" border stripe @selection-change="handleSelectionChange">
+            <el-table-column :selectable="selectable" type="selection" align="center" width="50"/>
+            <el-table-column align="center" prop="机床图号" label="机床图号" width="130px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="组号" label="组号" min-width="80px">
+            <el-table-column align="center" prop="组号" label="组号" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="零件名称" label="名称" min-width="100px">
+            <el-table-column align="center" prop="零件名称" label="名称" width="100px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.零件名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="图号" prop="零件图号" min-width="100px">
+            <el-table-column align="center" label="图号" sortable prop="零件图号" min-width="130px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="规格" label="规格" min-width="100px">
+            <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" label="材料" min-width="100px">
+            <el-table-column align="center" label="材料" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.材料 || '—' }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="总数量" min-width="100px">
+            <el-table-column align="center" label="总数量" width="60px">
               <template slot-scope="scope">
                 {{ scope.row.总数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="备件数量" min-width="100px">
+            <el-table-column align="center" label="备件数" width="60px">
               <template slot-scope="scope">
                 {{ scope.row.备件总数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="领料单编号" min-width="100px">
+            <el-table-column align="center" label="领料单编号" width="100px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.领料单编号 }}
               </template>
             </el-table-column>
           </el-table>
-          <div class="block" style="float:right;">
+          <div class="block">
             <el-pagination
               :current-page="pageCurrent2"
-              :page-sizes="[10, 20, 30, 40]"
+              :page-sizes="[10, 20, 30, 40, 300]"
               :page-size="pageSize2"
               :total="total2"
               style="margin-top:10px;display:inline-block;width:50%"
@@ -212,155 +207,180 @@
               @current-change="handleCurrentChange2"/>
           </div>
         </el-tab-pane>
+        <el-tab-pane label="离线采购件" name="离线采购件">
+          <el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 100%;" height="500px" @selection-change="handleSelectionChange1">
+            <el-table-column :selectable="selectable1" type="selection" align="center" width="50"/>
+            <el-table-column label="物料名称" prop="物料名称" align="center" min-width="140" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.物料名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="物料型号" prop="物料型号" align="center" min-width="150" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.物料型号 }}
+              </template>
+            </el-table-column>
+            <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="库存量" align="center" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.货位存量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="领用数量" align="center" width="130px" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-input-number v-model="scope.row.领用数量" :min="0" :precision="2" size="mini" style="margin: 0;width: 100%"/>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block" style="margin-top: 10px;">
+            <el-pagination
+              :current-page="pageCurrent4"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="pageSize4"
+              :total="total4"
+              style="display:inline-block;width:50%"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange5"
+              @current-change="handleCurrentChange5"/>
+          </div>
+        </el-tab-pane>
       </el-tabs>
     </el-card>
 
-    <el-card>
-      <div slot="header">
-        <span style="margin: 5px">领料单编号:</span>
-        <el-input v-model="pickingListNumber" clearable size="small" style="width:200px" />
-        <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
-        <el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="createList()">创建</el-button>
-      </div>
-      <span style="margin:0;width: 100px;font-size: 20px">领料单</span>
-      <el-tooltip :open-delay="1200" effect="dark" content="为所选领料单增加物料明细" placement="top">
-        <el-button size="small" type="primary" icon="el-icon-bottom" style="margin: 0 0 5px 10px" @click="selectInto()">选入</el-button>
-      </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 prop="领料单编号" label="领料单编号" align="center" min-width="200">
-          <template slot-scope="scope">
-            {{ scope.row.领料单编号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="创建时间" align="center" min-width="200" >
-          <template slot-scope="scope">
-            {{ scope.row.操作日期.split(' ')[0] }}
-          </template>
-        </el-table-column>
-        <el-table-column label="领料人" prop="领料人" align="center" min-width="130">
-          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="领料单备注" prop="领料单备注" align="center" min-width="130">
-          <template slot-scope="scope">
-            {{ scope.row.领料单备注 }}
-          </template>
-        </el-table-column>
-        <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>
-          </template>
-        </el-table-column>
-        <!--<el-table-column label="领回确认" align="center" min-width="80">-->
-        <!--<template slot-scope="scope">-->
-        <!--<el-tag v-if="Number(scope.row.是否启用)===1" type="warning">未确认</el-tag>-->
-        <!--<el-tag v-else type="success">已确认</el-tag>-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <el-table-column label="操作" align="center" width="230px">
-          <template slot-scope="scope" align="center">
-            <!--<el-button v-if="Number(token)===21 || Number(token)===36" :disabled="Number(scope.row.是否审批)===0 || Number(scope.row.是否启用)===0" size="mini" type="primary" @click="checkList(scope.row)">确认领回</el-button>-->
-            <el-button :disabled="Number(scope.row.是否启用)===0" size="mini" plain type="danger" icon="el-icon-delete" @click="dropList(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="float:right;margin: 10px 0;">
-        <el-pagination
-          :current-page="pageCurrent3"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize3"
-          :total="total3"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange3"
-          @current-change="handleCurrentChange3"/>
-      </div>
-      <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" prop="名称" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.名称 }}
-          </template>
-        </el-table-column>
-        <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" prop="规格" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.规格 || '—' }}
-          </template>
-        </el-table-column>
-        <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" prop="组号" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.组号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="总数量" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.总数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="备件数量" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.备件数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="已领数量" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.出库数量1 }}
-          </template>
-        </el-table-column>
-        <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" 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>
-            <el-tag v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领料</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="true" label="操作" align="center" width="230">
-          <template slot-scope="scope">
-            <el-popover placement="right" width="500" trigger="click">
-              <el-table :data="gridData" highlight-current-row size="mini" show-summary>
-                <el-table-column width="50" align="center" type="index" label="序号"/>
-                <el-table-column min-width="100" align="center" label="姓名">
-                  <template slot-scope="scope">
-                    {{ scope.row.姓名 }}
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="150" align="center" label="领料时间">
-                  <template slot-scope="scope">
-                    {{ scope.row.操作日期 }}
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="100" align="center" label="数量" prop="出库数量">
-                  <template slot-scope="scope">
-                    {{ scope.row.出库数量 }}
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-button slot="reference" type="primary" size="mini" icon="el-icon-search" plain @click="searchTable02(scope.row)">查看详情</el-button>
-            </el-popover>
-            <el-button :disabled="!!scope.row.是否出库 || Number(scope.row.是否领料确认)===1" size="mini" plain type="danger" icon="el-icon-delete" style="margin-left: 10px" @click="dropListDetail(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
+    <div slot="header">
+      <el-card>
+        <el-row style="margin-top: 5px">
+          <el-input v-model="pickingListNumber" clearable size="small" placeholder="领料单编号" style="width:120px;margin-left: 10px" />
+          <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
+          <el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="createList()">创建领料单</el-button>
+          <el-tooltip :open-delay="1200" effect="dark" content="为所选领料单增加物料明细" placement="top">
+            <el-button size="small" type="warning" icon="el-icon-bottom" style="margin: 0 0 5px 10px" @click="selectInto()">选入物料</el-button>
+          </el-tooltip>
+          <el-button :disabled="Number(审批情况)===1" size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropList()">删除领料单</el-button>
+          <el-button :disabled="Number(审批情况)===1" size="small" plain type="danger" icon="el-icon-delete" style="margin-right: 20px;float: right" @click="dropListDetail()">移除领料明细</el-button>
+        </el-row>
+      </el-card>
+    </div>
+    <div style="width: 26%;float: left;margin-right: 16px">
+      <el-card>
+        <el-table :data="pickListTable1" :row-class-name="tableRowClassName" class="shenpi" highlight-current-row border size="mini" width="100%" height="400px" @row-click="clickList">
+          <el-table-column prop="领料单编号" label="领料单编号" align="center" min-width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.领料单编号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="领料人" prop="领料人" align="center" min-width="90px">
+            <template slot-scope="scope">
+              {{ scope.row.姓名 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" prop="备注" align="center" min-width="130px">
+            <template slot-scope="scope">
+              {{ scope.row.领料单备注 }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block" style="float:left;margin: 10px 0;">
+          <el-pagination
+            :current-page="pageCurrent3"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="pageSize3"
+            :total="total3"
+            layout="total, sizes, prev, pager, next"
+            @size-change="handleSizeChange3"
+            @current-change="handleCurrentChange3"/>
+        </div>
+      </el-card>
+    </div>
+    <div style="width: 72.5%;float: left">
+      <el-card>
+        <el-table :data="pickListTable2" border style="width: 100%;" size="mini" highlight-current-row height="400px" @row-click="searchMX">
+          <el-table-column label="序号" align="center" type="index" width="50"/>
+          <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="图号或型号" align="center" prop="图号或型号" min-width="110px" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.图号或型号 || '—' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="规格" align="center" prop="规格" min-width="120" show-overflow-tooltip>
+            <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="组号" align="center" prop="组号" min-width="70">
+            <template slot-scope="scope">
+              {{ scope.row.组号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="领用数" align="center" width="60">
+            <template slot-scope="scope">
+              {{ scope.row.总数量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="备件数" align="center" width="60">
+            <template slot-scope="scope">
+              {{ scope.row.备件数量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="已领数" align="center" width="60">
+            <template slot-scope="scope">
+              {{ scope.row.出库数量1 }}
+            </template>
+          </el-table-column>
+          <el-table-column v-if="true" label="备料确认" align="center" prop="是否备料确认" min-width="75px">
+            <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" prop="是否领料确认" width="75px">
+            <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>
+              <el-tag v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领料</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" min-width="120px">
+            <template slot-scope="scope">
+              <el-popover placement="right" width="500" trigger="click">
+                <el-table :data="gridData" highlight-current-row size="mini" show-summary>
+                  <el-table-column width="50" align="center" type="index" label="序号"/>
+                  <el-table-column min-width="100" align="center" label="姓名">
+                    <template slot-scope="scope">
+                      {{ scope.row.姓名 }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column min-width="150" align="center" label="领料时间">
+                    <template slot-scope="scope">
+                      {{ scope.row.操作日期 }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column min-width="100" align="center" label="数量" prop="出库数量">
+                    <template slot-scope="scope">
+                      {{ scope.row.出库数量 }}
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <el-button slot="reference" type="primary" size="mini" icon="el-icon-search" plain @click="searchTable02(scope.row)">领料详情</el-button>
+              </el-popover>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+    </div>
 
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="创建领料单" center width="380px">
       <el-form ref="form1" :model="form1" :rules="rules1" label-position="left">
@@ -386,16 +406,21 @@
 </template>
 
 <script>
-import { initPickPerson, initMachineProject, searchgroup, searchTable, searchList, createList, dropList, selectIntoList, searchListDetail, dropListDetail, searchListDetailMX } from '@/api/Inventory/CreatePickingList'
+import { initPickPerson, initMachineProject, searchgroup, searchTable, searchList, createList, dropList, selectIntoList, searchListDetail, dropListDetail, searchListDetailMX, searchPart, IntoMateerial } from '@/api/Inventory/CreatePickingList'
 import request from '@/utils/request'
 import { mapGetters } from 'vuex'
 export default {
   name: 'CreatePickingList',
   data() {
     return {
+      审批情况: '',
+      peopleName: '',
+      ListMX: '',
       PartType: '基本件',
       machineNumberValue: '',
       machineNumber: [],
+      MachineNumber: '',
+      tableDataBasic: [],
       PickingValue: '',
       Picking: [{
         value: 0,
@@ -412,20 +437,26 @@ export default {
       tableData1: [],
       tableData2: [],
       pageCurrent0: 1,
-      pageSize0: 20,
+      pageSize0: 300,
       total0: 0,
       pageCurrent1: 1,
-      pageSize1: 20,
+      pageSize1: 300,
       total1: 0,
       pageCurrent2: 1,
-      pageSize2: 20,
+      pageSize2: 300,
       total2: 0,
       pickListTable1: [],
       pageCurrent3: 1,
       pageSize3: 20,
       total3: 0,
+      pageCurrent4: 1,
+      pageSize4: 20,
+      total4: 0,
       pickListTable2: [],
       dialogFormVisible1: false,
+      listLoading: false,
+      materialSpec: '', // 物料规格
+      materialModel: '', // 物料型号
       form1: {
         领料人流水号: '',
         领料单备注: ''
@@ -437,7 +468,8 @@ export default {
       pickingListNumber: '', // 领料单编号
       pickingListNumberShow: '', // 领料单编号
       pickingListNum: '', // 领料单流水号
-      multipleSelection: []
+      multipleSelection: [],
+      multipleSelection1: []
     }
   },
   computed: {
@@ -448,7 +480,6 @@ export default {
   },
   mounted() {
     this.fetchData()
-    this.searchTable()
     this.searchList()
   },
   methods: {
@@ -516,53 +547,107 @@ export default {
         }
       })
     },
+    tableRowClassName({ row }) {
+      if (parseInt(row.是否审批) === 1) {
+        return 'shenpi-row'
+      } else {
+        return ''
+      }
+    },
+    selectable(row, index) { // 控制某行是否可选
+      return row.领料单编号 === null // 未采购&&确认物料修改
+    },
+    selectable1(row) {
+      return row.领用数量 !== 0
+    },
     // 查三表
     searchTable() {
-      this.multipleSelection = []
-      if (this.PartType === '标准件') {
-        this.searchTable0()
-      } else if (this.PartType === '外购件') {
-        this.searchTable1()
-      } else if (this.PartType === '基本件') {
-        this.searchTable2()
+      if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
+        this.multipleSelection = []
+        this.multipleSelection1 = []
+        if (this.PartType === '标准件') {
+          this.searchTable0()
+        } else if (this.PartType === '外购件') {
+          this.searchTable1()
+        } else if (this.PartType === '基本件') {
+          this.searchTable2()
+        } else if (this.PartType === '离线采购件') {
+          this.searchTable4()
+        }
+      } else {
+        this.$message.warning('请选择机床后再查询')
       }
     },
     // 标准件
     searchTable0() {
-      let check1, check2, check3
+      let check1, check2, check3, check4, check5, check6
       this.machineNumberValue ? check1 = 1 : check1 = 0
       this.groupNumberValue ? check2 = 1 : check2 = 0
       this.Name ? check3 = 1 : check3 = 0
-      searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, this.pageCurrent0, this.pageSize0, 1).then(response => {
-        console.log(response.data.rows)
+      this.materialModel ? check4 = 1 : check4 = 0
+      this.materialSpec ? check5 = 1 : check5 = 0
+      if (this.PickingValue !== 0 && this.PickingValue !== 1) {
+        check6 = 0
+      } else {
+        check6 = 1
+      }
+      searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent0, this.pageSize0, 1).then(response => {
         this.tableData0 = response.data.rows
         this.total0 = response.data.total
       })
     },
     // 外购件
     searchTable1() {
-      let check1, check2, check3
+      let check1, check2, check3, check4, check5, check6
       this.machineNumberValue ? check1 = 1 : check1 = 0
       this.groupNumberValue ? check2 = 1 : check2 = 0
       this.Name ? check3 = 1 : check3 = 0
-      searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, this.pageCurrent1, this.pageSize1, 2).then(response => {
+      this.materialModel ? check4 = 1 : check4 = 0
+      this.materialSpec ? check5 = 1 : check5 = 0
+      if (this.PickingValue !== 0 && this.PickingValue !== 1) {
+        check6 = 0
+      } else {
+        check6 = 1
+      }
+      searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent1, this.pageSize1, 2).then(response => {
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
       })
     },
     // 基本件
     searchTable2() {
-      let check1, check2, check3
+      let check1, check2, check3, check4, check5, check6
       this.machineNumberValue ? check1 = 1 : check1 = 0
       this.groupNumberValue ? check2 = 1 : check2 = 0
       this.Name ? check3 = 1 : check3 = 0
-      searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, this.pageCurrent2, this.pageSize2, 3).then(response => {
+      this.materialModel ? check4 = 1 : check4 = 0
+      this.materialSpec ? check5 = 1 : check5 = 0
+      if (this.PickingValue !== 0 && this.PickingValue !== 1) {
+        check6 = 0
+      } else {
+        check6 = 1
+      }
+      searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent2, this.pageSize2, 3).then(response => {
         this.tableData2 = response.data.rows
         this.total2 = response.data.total
       })
     },
+    // 离线采购件
+    searchTable4() {
+      this.listLoading = true
+      this.tableDataBasic = []
+      let check1, check2, check3
+      this.Name ? check1 = 1 : check1 = 0
+      this.materialSpec ? check2 = 1 : check2 = 0
+      this.materialModel ? check3 = 1 : check3 = 0
+      searchPart(check1, this.Name, check2, this.materialSpec, check3, this.materialModel, this.pageCurrent4, this.pageSize4).then(response => {
+        this.tableDataBasic = response.data.rows
+        this.total4 = response.data.total
+        this.listLoading = false
+      })
+    },
     searchTable02(row) {
-      searchListDetailMX(row.领料单流水号, row.基本件流水号, row.标准件和外购件流水号).then(response => {
+      searchListDetailMX(row.领料单流水号, row.基本件流水号, row.标准件和外购件流水号, row.离线采购件流水号).then(response => {
         this.gridData = response.data
       })
     },
@@ -593,6 +678,15 @@ export default {
       this.pageCurrent2 = val
       this.searchTable2()
     },
+    handleSizeChange5(val) {
+      this.pageSize4 = val
+      this.pageCurrent4 = 1
+      this.searchTable4()
+    },
+    handleCurrentChange5(val) {
+      this.pageCurrent4 = val
+      this.searchTable4()
+    },
     // 查询领料单列表
     searchList() {
       let check, isElectrical
@@ -612,6 +706,15 @@ export default {
       this.pageCurrent3 = val
       this.searchList()
     },
+    handleSizeChange4(val) {
+      this.pageSize3 = val
+      this.pageCurrent3 = 1
+      this.searchList()
+    },
+    handleCurrentChange4(val) {
+      this.pageCurrent3 = val
+      this.searchList()
+    },
     // 创建领料单
     createList() {
       if (this.$refs['form1'] !== undefined) {
@@ -665,13 +768,13 @@ export default {
       })
     },
     // 删除领料单
-    dropList(row) {
+    dropList() {
       this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        dropList(row.领料单流水号).then(response => {
+        dropList(this.pickingListNum).then(response => {
           if (Number(response.data[0].result) === 1) {
             this.$message.success('删除成功')
             this.searchList()
@@ -692,57 +795,91 @@ export default {
     },
     // 选入
     selectInto() {
-      const basePartGroup = []
-      const purchasePartGroup = []
-      this.multipleSelection.map(v => {
-        v.基本件流水号 ? basePartGroup.push(v.基本件流水号) : purchasePartGroup.push(v.标准件和外购件流水号)
-      })
-      if (basePartGroup.length === 0 && purchasePartGroup.length === 0) {
-        this.$message.warning('请勾选零件')
-        return
-      }
-      if (!this.pickingListNum || !this.pickingListNumberShow) {
-        this.$message.warning('请选择领料单')
-        return
-      }
-      if (basePartGroup.length) { // 基本件
-        selectIntoList(basePartGroup, null, this.pickingListNum).then(response => {
+      if (this.PartType === '离线采购件') {
+        const materialGroup = []
+        const groupPartGroup = []
+        const numGroup = []
+        this.multipleSelection1.map(v => {
+          materialGroup.push(v.物料流水号)
+          groupPartGroup.push(v.组件零件基本件流水号)
+          numGroup.push(v.领用数量)
+        })
+        if (materialGroup.length === 0) {
+          this.$message.warning('请勾选零件')
+          return
+        }
+        if (!this.pickingListNum || !this.pickingListNumberShow) {
+          this.$message.warning('请选择领料单')
+          return
+        }
+        if (!this.machineNumberValue) {
+          this.$message.warning('请选择机床')
+          return
+        }
+        IntoMateerial(materialGroup, groupPartGroup, numGroup, this.pickingListNum, this.machineNumberValue).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('操作成功')
             this.searchTable()
             this.clickList()
           } else { this.$message.error('操作失败') }
         })
-      } else { // 标准件外购件
-        selectIntoList(null, purchasePartGroup, this.pickingListNum).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('操作成功')
-            this.searchTable()
-            this.clickList()
-          } else { this.$message.error('操作失败') }
+      } else {
+        const basePartGroup = []
+        const purchasePartGroup = []
+        this.multipleSelection.map(v => {
+          v.基本件流水号 ? basePartGroup.push(v.基本件流水号) : purchasePartGroup.push(v.标准件和外购件流水号)
         })
+        if (basePartGroup.length === 0 && purchasePartGroup.length === 0) {
+          this.$message.warning('请勾选零件')
+          return
+        }
+        if (!this.pickingListNum || !this.pickingListNumberShow) {
+          this.$message.warning('请选择领料单')
+          return
+        }
+        if (basePartGroup.length) { // 基本件
+          selectIntoList(basePartGroup, null, this.pickingListNum).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('操作成功')
+              this.searchTable()
+              this.clickList()
+            } else { this.$message.error('操作失败') }
+          })
+        } else { // 标准件外购件
+          selectIntoList(null, purchasePartGroup, this.pickingListNum).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('操作成功')
+              this.searchTable()
+              this.clickList()
+            } else { this.$message.error('操作失败') }
+          })
+        }
       }
     },
     // 查看领料单明细
     clickList(row) {
-      console.log(row)
+      row ? this.审批情况 = row.是否审批 : this.审批情况
       row ? this.pickingListNum = row.领料单流水号 : this.pickingListNum
       row ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow
+      row ? this.peopleName = row.姓名 : this.peopleName
       searchListDetail(this.pickingListNum).then(res => {
         this.pickListTable2 = res.data
       })
     },
+    searchMX(row) {
+      this.ListMX = row.领料单明细流水号
+    },
     // 删除领料单明细
-    dropListDetail(row) {
-      console.log(row)
+    dropListDetail() {
       this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        dropListDetail(row.领料单明细流水号).then(response => {
+        dropListDetail(this.ListMX).then(response => {
           if (Number(response.data[0].result) === 1) {
             this.$message.success('删除成功')
+            this.searchTable()
             this.clickList()
           } else {
             this.$message.error('已领取，不可删除')
@@ -760,9 +897,6 @@ export default {
 </script>
 
 <style scoped>
-  .el-card{
-    margin-bottom: 15px;
-  }
   .el-select{
     width:200px
   }
@@ -776,3 +910,8 @@ export default {
     margin: 0
   }
 </style>
+<style>
+  .el-table .shenpi-row {
+    background: #9BD7FC !important;
+  }
+</style>
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index 3a4d2142..d7dcdff1 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -1,196 +1,114 @@
 <template>
   <div class="app-container">
     <el-card>
-      <div slot="header">
+      <div style="margin-top: 8px;margin-bottom: 8px">
         <span style="margin: 5px">领料单编号:</span>
         <el-input v-model="pickingListNumber" clearable size="small" style="width:200px" />
         <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
+        <el-button size="small" type="warning" style="float: right;margin-right: 10px" @click="prepareConfirm()">备料确认</el-button>
+        <el-button :disabled="审批未通过===true" size="small" type="primary" style="float: right" @click="inputPassword()">领料确认</el-button>
       </div>
-      <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="领料单编号" prop="领料单编号" align="center" min-width="200">
-          <template slot-scope="scope">
-            {{ scope.row.领料单编号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="创建时间" align="center" min-width="200" >
-          <template slot-scope="scope">
-            {{ scope.row.操作日期.split(' ')[0] }}
-          </template>
-        </el-table-column>
-        <el-table-column label="领料人" prop="姓名" align="center" min-width="130">
-          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="领料单备注" align="center" min-width="130">
-          <template slot-scope="scope">
-            {{ scope.row.领料单备注 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="审批" align="center" min-width="80">
-          <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否审批)===0" type="warning" size="small">未审批</el-tag>
-            <el-tag v-else type="success" size="small">已审批</el-tag>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-row>
-        <el-col style="width:calc(100% - 600px)">
-          <div class="block" style="margin: 10px 0;">
-            <el-pagination
-              :current-page="pageCurrent3"
-              :page-sizes="[10, 20, 30, 40]"
-              :page-size="pageSize3"
-              :total="total3"
-              layout="total, sizes, prev, pager, next, jumper"
-              @size-change="handleSizeChange3"
-              @current-change="handleCurrentChange3"/>
-          </div>
-        </el-col>
-      </el-row>
-      <el-row style="margin: 0;">
-        <el-col style="width: 300px">
-          <h4>领料单明细：{{ pickingListNumberShow }}</h4>
-        </el-col>
-        <el-col style="float:left;width: 200px;margin-top:15px">
-          <el-button :disabled="SELECTION.length===0" size="small" type="warning" @click="prepareConfirm()">备料确认</el-button>
-          <el-button :disabled="SELECTION.length===0" size="small" type="primary" @click="inputPassword()">领料确认</el-button>
-        </el-col>
-      </el-row>
-      <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="名称" 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="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="机床图号" prop="机床图号" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.机床图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="组号" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.组号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="总数量" align="center" min-width="40">
-          <template slot-scope="scope">
-            {{ scope.row.总数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="备件数量" align="center" min-width="50">
-          <template slot-scope="scope">
-            {{ scope.row.备件数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="货位存量" align="center" min-width="50">
-          <template slot-scope="scope">
-            {{ scope.row.请购单明细流水号 ? scope.row.货位存量 : scope.row.货位存量1 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="已领数量" align="center" min-width="50">
-          <template slot-scope="scope">
-            {{ scope.row.出库数量1 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="出库数量" align="center" width="200">
-          <template slot-scope="scope">
-            <el-input-number v-model="scope.row.出库数量" size="mini"/>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="true" label="备料确认" align="center" width="100">
-          <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否备料确认)===1" size="mini" type="success">已备料</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" 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>
-            <el-tag v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领料</el-tag>
-          </template>
-        </el-table-column>
-        <!--<el-table-column label="操作" align="center" width="100" fixed="right">-->
-        <!--<template slot-scope="scope">-->
-        <!--<el-button :disabled="Number(scope.row.出库数量)<=0" size="mini" icon="el-icon-back" plain type="primary" @click="sendBack(scope.row)">归还</el-button>-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-      </el-table>
     </el-card>
-
-    <!--<el-card>-->
-    <!--<el-row>-->
-    <!--<el-col :span="12">-->
-    <!--<h4 style="margin-top:0">物料货位数量信息</h4>-->
-    <!--</el-col>-->
-    <!--<el-col :span="12">-->
-    <!--占用数量：{{ 占用数量 }}-->
-    <!--</el-col>-->
-    <!--</el-row>-->
-    <!--<el-table :data="StockNumberTable" border stripe style="width: 100%;" size="mini" height="300" show-summary>-->
-    <!--<el-table-column label="序号" align="center" type="index" width="50"/>-->
-    <!--<el-table-column label="名称" align="center" min-width="100">-->
-    <!--<template slot-scope="scope">-->
-    <!--{{ scope.row.物料名称 || scope.row.零件名称 }}-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column label="图号或型号" align="center" min-width="100">-->
-    <!--<template slot-scope="scope">-->
-    <!--{{ scope.row.物料型号 || scope.row.零件图号 || '—' }}-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column label="规格" align="center" min-width="100">-->
-    <!--<template slot-scope="scope">-->
-    <!--{{ scope.row.物料规格 || scope.row.规格 || '—' }}-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column label="仓库名称" align="center" min-width="70">-->
-    <!--<template slot-scope="scope">-->
-    <!--{{ scope.row.仓库名称 }}-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column label="货位名称" align="center" min-width="70">-->
-    <!--<template slot-scope="scope">-->
-    <!--{{ scope.row.货位名称 }}-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column label="货位存量" align="center" min-width="70" prop="货位存量">-->
-    <!--<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="组号" align="center" min-width="70">-->
-    <!--<template slot-scope="scope">-->
-    <!--{{ scope.row.组号 || '—' }}-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column label="操作" align="center" width="200px">-->
-    <!--<template slot-scope="scope" align="center">-->
-    <!--<el-button :disabled="审批未通过" size="mini" type="primary" @click="outStore(scope.row)">出库</el-button>-->
-    <!--<el-button :disabled="审批未通过" size="mini" type="warning" @click="errorRecord(scope.row)">异常记录</el-button>-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--</el-table>--><!--</el-card>-->
+    <div style="width: 26%;float: left;margin-right: 16px">
+      <el-card>
+        <el-table :data="pickListTable1" :row-class-name="tableRowClassName" class="shenpi" highlight-current-row border size="mini" width="100%" height="730px" @row-click="clickList">
+          <el-table-column prop="领料单编号" label="领料单编号" align="center" min-width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.领料单编号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="领料人" prop="领料人" align="center" min-width="90px">
+            <template slot-scope="scope">
+              {{ scope.row.姓名 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" prop="备注" align="center" min-width="130px">
+            <template slot-scope="scope">
+              {{ scope.row.领料单备注 }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block" style="float:left;margin: 10px 0;">
+          <el-pagination
+            :current-page="pageCurrent3"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="pageSize3"
+            :total="total3"
+            layout="total, sizes, prev, pager, next"
+            @size-change="handleSizeChange3"
+            @current-change="handleCurrentChange3"/>
+        </div>
+      </el-card>
+    </div>
+    <div style="width: 72.5%;float: left">
+      <el-card>
+        <el-table :data="pickListTable2" highlight-current-row stripe border style="width: 100%;" size="mini" height="780">
+          <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="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.图号或型号 || '—' }}
+            </template>
+          </el-table-column>
+          <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="机床图号" prop="机床图号" align="center" min-width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.机床图号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="组号" align="center" min-width="70">
+            <template slot-scope="scope">
+              {{ scope.row.组号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="领用数" align="center" min-width="60">
+            <template slot-scope="scope">
+              {{ scope.row.总数量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="备件数" align="center" min-width="60">
+            <template slot-scope="scope">
+              {{ scope.row.备件数量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="库存数" align="center" min-width="60">
+            <template slot-scope="scope">
+              {{ scope.row.货位存量1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="已领数" align="center" min-width="60">
+            <template slot-scope="scope">
+              {{ scope.row.出库数量1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="出库数" align="center" min-width="120">
+            <template slot-scope="scope">
+              <el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.出库数量1)" v-model="scope.row.出库数量" size="mini" style="width: 100%"/>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="true" label="备料确认" align="center" width="90">
+            <template slot-scope="scope">
+              <el-tag v-if="Number(scope.row.是否备料确认)===1" size="mini" type="success">已备料</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" width="90">
+            <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>
+              <el-tag v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领料</el-tag>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+    </div>
 
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="物料出库" center width="380px">
       <el-form ref="form1" :model="form1" :rules="rules1" label-position="left">
@@ -312,7 +230,7 @@
 </template>
 
 <script>
-import { sendBack, initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, searchStockNumber1, searchStockNumber2, submitOutStore, updateRemark, errorRecord, searchStockNumber3, initOutType, pickingSubmit } from '@/api/Inventory/MaterialOut'
+import { sendBack, initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, submitOutStore, initOutType } from '@/api/Inventory/MaterialOut'
 import { mapGetters } from 'vuex'
 import request from '@/utils/request'
 export default {
@@ -326,7 +244,7 @@ export default {
       pickingListNumberShow: '',
       pickListTable1: [],
       pageCurrent3: 1,
-      pageSize3: 20,
+      pageSize3: 40,
       total3: 0,
       pickListTable2: [],
       StockNumberTable: [],
@@ -392,6 +310,7 @@ export default {
       inventoryNum: '', // 中间变量仓库流水号
       locationNum: '', // 中间变量货位流水号
       outNumber: [], // 中间变量出库数量
+      offlineNum: [],
       inventoryName: [],
       locateName: [],
       物料流水号: '',
@@ -473,22 +392,12 @@ export default {
         if (res.data[0].result === '1') {
           this.$message.success('操作成功')
           this.dialogFormVisible4 = false
-          this.clickListDetail()
           this.clickList()
         } else {
           this.$message.error('操作失败')
         }
       })
     },
-    UpdateRemark(row) {
-      updateRemark(row.领料单明细流水号, row.备注).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('编辑成功')
-        } else {
-          this.$message.error('编辑失败')
-        }
-      })
-    },
     // 备料确认
     prepareConfirm() {
       this.$confirm('是否备料确认?', '提示', {
@@ -523,44 +432,9 @@ export default {
     inputPassword() {
       this.dialogFormVisible3 = true
     },
-    // 提交领料确认
-    pickConfirm() {
-      this.$confirm('是否领料确认?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        const param = {
-          url: '',
-          method: 'post',
-          data: {
-            type: '4',
-            name: `update 车间装配管理_领料单明细 set 是否领料确认 = 1 where 领料单明细流水号 in (${this.multipleSelection})`
-          }
-        }
-        pickingSubmit(this.pickingPersonNum, this.form3.password).then(res => {
-          if (res.data[0].result === 'success') {
-            request(param).then(res => {
-              if (res.data[0].result === '1') {
-                this.$message.success('操作成功')
-                this.dialogFormVisible3 = false
-                this.clickList()
-              } else {
-                this.$message.error('操作失败')
-              }
-            })
-          } else if (res.data[0].result === 'error') {
-            this.$message.error('密码错误')
-          } else {
-            this.$message.error('操作失败')
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消操作'
-        })
-      })
+    selectable(row, index) { // 控制某行是否可选
+      console.log(row)
+      return ((Number(row.总数量) <= Number(row.出库数量1))) === false
     },
     // 初始化数据
     fetchData() {
@@ -631,10 +505,25 @@ export default {
       row && row.领料单编号 ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow
       row && row.姓名 ? this.form3.personName = row.姓名 : this.form3.personName
       searchListDetail(this.pickingListNum).then(res => {
-        console.log(res.data)
+        for (let i = 0; i < res.data.length; i++) {
+          if (res.data[i].离线采购件流水号 !== 0) {
+            res.data[i].货位存量1 = res.data[i].货位存量
+          }
+          if (res.data[i].请购单明细流水号 !== 0 && res.data[i].请购单明细流水号 !== '' && res.data[i].请购单明细流水号 !== null) {
+            res.data[i].货位存量1 = res.data[i].货位存量
+          }
+        }
         this.pickListTable2 = res.data
+        console.log(this.pickListTable2, 111)
       })
     },
+    tableRowClassName({ row }) {
+      if (parseInt(row.是否审批) === 1) {
+        return 'shenpi-row'
+      } else {
+        return ''
+      }
+    },
     // 多选
     handleSelectionChange(val) {
       console.log(val)
@@ -642,73 +531,37 @@ export default {
     },
     // 提交领料确认
     pickConfirm1() {
-      for (let i = 0; i < this.SELECTION.length; i++) {
-        this.multipleSelection.push(this.SELECTION[i].领料单明细流水号)
-        this.basePartNum.push(this.SELECTION[i].基本件流水号)
-        this.materialNum.push(this.SELECTION[i].物料流水号)
-        this.parchasePartNum.push(this.SELECTION[i].标准件和外购件流水号)
-        this.purchaseBillNum.push(this.SELECTION[i].请购单明细流水号)
-        this.groupNumValue.push(this.SELECTION[i].组件流水号)
-        this.machineValue.push(this.SELECTION[i].机床流水号)
-        this.outNumber.push(this.SELECTION[i].出库数量)
+      for (let i = 0; i < this.pickListTable2.length; i++) {
+        if (this.pickListTable2[i].出库数量 !== 0) {
+          this.multipleSelection.push(this.pickListTable2[i].领料单明细流水号)
+          this.basePartNum.push(this.pickListTable2[i].基本件流水号)
+          this.materialNum.push(this.pickListTable2[i].物料流水号)
+          this.parchasePartNum.push(this.pickListTable2[i].标准件和外购件流水号)
+          this.purchaseBillNum.push(this.pickListTable2[i].请购单明细流水号)
+          this.groupNumValue.push(this.pickListTable2[i].组件流水号)
+          this.machineValue.push(this.pickListTable2[i].机床流水号)
+          this.offlineNum.push(this.pickListTable2[i].离线采购件流水号)
+          this.outNumber.push(this.pickListTable2[i].出库数量)
+        }
       }
-      submitOutStore(this.multipleSelection, this.basePartNum, this.materialNum, this.parchasePartNum, this.purchaseBillNum, this.groupNumValue, this.machineValue, this.outNumber, this.id, this.form3.password, this.form3.outTypeValue, this.pickingListNum).then(response => {
+      submitOutStore(this.multipleSelection, this.basePartNum, this.materialNum, this.parchasePartNum, this.purchaseBillNum, this.groupNumValue, this.machineValue, this.outNumber, this.id, this.form3.password, this.form3.outTypeValue, this.pickingListNum, this.offlineNum).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('出库成功')
           this.dialogFormVisible3 = false
           searchListDetail(this.pickingListNum).then(res => {
+            for (let i = 0; i < res.data.length; i++) {
+              if (res.data[i].离线采购件流水号 !== 0) {
+                res.data[i].货位存量1 = res.data[i].货位存量
+              }
+              if (res.data[i].请购单明细流水号 !== 0 && res.data[i].请购单明细流水号 !== '' && res.data[i].请购单明细流水号 !== null) {
+                res.data[i].货位存量1 = res.data[i].货位存量
+              }
+            }
             this.pickListTable2 = res.data
           })
         } else { this.$message.error('操作失败') }
       })
     },
-    // 查看领料单明细相关的物料货位数量
-    clickListDetail(row) {
-      row && row.基本件流水号 ? (this.basePartNum = row.基本件流水号, this.materialNum = null, this.parchasePartNum = null, this.purchaseBillNum = null) : this.basePartNum
-      row && row.物料流水号 ? (this.materialNum = row.物料流水号, this.basePartNum = null, this.purchaseBillNum = null) : this.materialNum
-      row && row.标准件和外购件流水号 ? (this.parchasePartNum = row.标准件和外购件流水号, this.basePartNum = null, this.purchaseBillNum = null) : this.parchasePartNum
-      row && row.请购单明细流水号 ? (this.purchaseBillNum = row.请购单明细流水号, this.basePartNum = null, this.materialNum = null, this.parchasePartNum = null) : this.purchaseBillNum
-      row && row.机床流水号 ? this.machineValue = row.机床流水号 : this.machineValue
-      row && row.组件流水号 ? this.groupNumValue = row.组件流水号 : this.groupNumValue
-      row && row.总数量 ? this.outNumber = row.总数量 : this.outNumber
-      if (this.materialNum) {
-        searchStockNumber1(this.materialNum).then(res => {
-          this.StockNumberTable = res.data
-        })
-      } else if (this.basePartNum) {
-        searchStockNumber2(this.basePartNum).then(res => {
-          this.StockNumberTable = res.data
-        })
-      } else if (this.purchaseBillNum) {
-        searchStockNumber3(this.purchaseBillNum).then(res => {
-          this.StockNumberTable = res.data
-        })
-      }
-    },
-    // 出库
-    outStore(row) {
-      if (this.$refs['form1'] !== undefined) {
-        this.$refs['form1'].resetFields()
-      }
-      this.form1.machineValue = this.machineValue
-      this.inventoryNum = row.仓库流水号
-      this.locationNum = row.货位流水号
-      this.outNumber > row.货位存量 ? (this.form1.outNumber = row.货位存量, this.form1.outNumberMax = row.货位存量) : (this.form1.outNumber = this.outNumber, this.form1.outNumberMax = this.outNumber) // 货位存量和领料数量对比取小
-      this.form1.personValue = Number(this.id)
-      this.group = []
-      this.form1.groupNumValue = ''
-      searchgroup(this.form1.machineValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.group.push({
-            label: response.data[i].组号,
-            value: Number(response.data[i].组件流水号)
-          })
-        }
-      }).then(() => {
-        this.form1.groupNumValue = this.groupNumValue
-        this.dialogFormVisible1 = true
-      })
-    },
     // 提交出库
     submitOutStore() {
       this.$refs['form1'].validate((valid) => {
@@ -719,7 +572,6 @@ export default {
             if (response.data[0].result === '1') {
               this.$message.success('出库成功')
               this.dialogFormVisible1 = false
-              this.clickListDetail()
               this.clickList()
             } else { this.$message.error('操作失败') }
           })
@@ -727,33 +579,6 @@ export default {
           return false
         }
       })
-    },
-    // 异常记录
-    errorRecord(row) {
-      if (this.$refs['form2'] !== undefined) {
-        this.$refs['form2'].resetFields()
-      }
-      this.form2.errorNumber = ''
-      this.form2.reason = ''
-      this.form2.物料流水号 = row.物料流水号
-      this.form2.基本件流水号 = row.基本件流水号
-      this.form2.货位流水号 = row.货位流水号
-      this.dialogFormVisible2 = true
-    },
-    // 提交异常记录
-    submitErrorRecord() {
-      this.$refs['form2'].validate((valid) => {
-        if (valid) {
-          errorRecord(this.form2.errorNumber, this.form2.reason, this.form2.物料流水号, this.form2.基本件流水号, this.form2.货位流水号).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('记录成功')
-              this.dialogFormVisible2 = false
-            } else { this.$message.error('操作失败') }
-          })
-        } else {
-          return false
-        }
-      })
     }
   }
 }
@@ -773,3 +598,8 @@ export default {
     margin: 0
   }
 </style>
+<style>
+  .el-table .shenpi-row {
+    background: #9BD7FC !important;
+  }
+</style>
diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue
index e25a1121..5bbd2eee 100644
--- a/src/views/Inventory/OfflinePartOut/index.vue
+++ b/src/views/Inventory/OfflinePartOut/index.vue
@@ -238,7 +238,8 @@ export default {
       materialName: '', // 物料名称
       materialSpec: '', // 物料规格
       materialModel: '', // 物料型号
-      离线合同明细流水号: ''
+      离线合同明细流水号: '',
+      组件零件基本件流水号: ''
     }
   },
   computed: {
@@ -350,6 +351,7 @@ export default {
       this.materialNumber = row.物料流水号
       this.partnumber = row.货位存量
       this.离线合同明细流水号 = row.离线合同明细流水号
+      this.组件零件基本件流水号 = row.组件零件基本件流水号
     },
     // 重置表单
     callOff() {
@@ -375,7 +377,7 @@ export default {
       } else {
         this.$refs['form'].validate((valid) => {
           if (valid) {
-            outlinePartOut(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.form.DirectNote, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber, this.离线合同明细流水号).then(response => {
+            outlinePartOut(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.form.DirectNote, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber, this.离线合同明细流水号, this.组件零件基本件流水号).then(response => {
               if (response.data[0].result === '1') {
                 this.$message.success('零件出库成功')
                 this.dialogFormVisible = false
diff --git a/src/views/Inventory/OfflinePartsStorage/index.vue b/src/views/Inventory/OfflinePartsStorage/index.vue
index 080f7ef2..cd7432ce 100644
--- a/src/views/Inventory/OfflinePartsStorage/index.vue
+++ b/src/views/Inventory/OfflinePartsStorage/index.vue
@@ -20,9 +20,8 @@
       <el-button type="success" size="small" style="margin-left: 10px" @click="searchContractDetail">查询明细</el-button>
     </el-card>
     <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="合同编号" prop="离线合同编号" width="120px" align="center" show-overflow-tooltip>
+      <el-table ref="multipleTable" :data="table1" border stripe size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px">
+        <el-table-column label="合同编号" sortable prop="离线合同编号" width="120px" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.离线合同编号 }}
           </template>
@@ -266,11 +265,15 @@ export default {
         this.contractNumber = ''
       }
       // this.table1 = res.data
+      console.log(res.data)
       res.data.map(v => {
         this.table1.push({
           离线合同编号: v.离线合同编号,
-          物料名称: v.物料名称,
-          规格型号: v.物料规格 + v.物料型号,
+          离线合同明细流水号: v.离线合同明细流水号,
+          物料流水号: v.物料流水号,
+          组件零件基本件流水号: v.组件零件基本件流水号,
+          物料名称: v.物料名称 ? v.物料名称 : v.零件名称,
+          规格型号: v.物料规格 + (v.零件图号 === null ? v.物料型号 : v.零件图号),
           数量: v.数量,
           到货数量: v.到货数量,
           本次到货数量: v.本次到货数量
@@ -281,21 +284,24 @@ export default {
     // 多选
     handleSelectionChange(val) {
       this.multipleSelection = val
+      console.log(val, 123)
     },
     // 提交入库
     submitInStorage() {
-      if (this.multipleSelection.length === 0) {
-        this.$message.warning('请勾选入库物料')
-      } else if (!this.locateNumber) {
+      if (!this.locateNumber) {
         this.$message.warning('请选择货位或者扫码货位二维码')
       } else {
         const materialGroup = []
+        const BasicGroup = []
         const numberGroup = []
         const partGroup = []
-        for (let i = 0; i < this.multipleSelection.length; i++) {
-          materialGroup.push(this.multipleSelection[i].物料流水号)
-          numberGroup.push(this.multipleSelection[i].本次到货数量)
-          partGroup.push(this.multipleSelection[i].离线合同明细流水号)
+        for (let i = 0; i < this.table1.length; i++) {
+          if (this.table1[i].本次到货数量 !== 0) {
+            materialGroup.push(this.table1[i].物料流水号)
+            BasicGroup.push(this.table1[i].组件零件基本件流水号)
+            numberGroup.push(this.table1[i].本次到货数量)
+            partGroup.push(this.table1[i].离线合同明细流水号)
+          }
         }
         this.$confirm('确认入库?', '提示', {
           confirmButtonText: '确定入库',
@@ -309,7 +315,7 @@ export default {
             data: {
               type: '2',
               name: '采购管理_离线采购件入库_增加数据',
-              param: `物料流水号组=${materialGroup}&离线合同明细流水号组=${partGroup}&数量组=${numberGroup}&货位流水号=${this.locateNumber}&入库人员流水号=${this.inventoryPeople}`
+              param: `物料流水号组=${materialGroup}&组件零件基本件流水号组=${BasicGroup}&离线合同明细流水号组=${partGroup}&数量组=${numberGroup}&货位流水号=${this.locateNumber}&入库人员流水号=${this.inventoryPeople}`
             }
           }
           const res = await axios(param)
diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue
index d9a6b969..ec675d06 100644
--- a/src/views/Inventory/PurchaseInRecord/index.vue
+++ b/src/views/Inventory/PurchaseInRecord/index.vue
@@ -1,83 +1,72 @@
 <template>
   <div class="app-container">
-    <el-card>
-      <div slot="header" class="clearfix">
-        <el-row style="margin-bottom:10px">
-          <el-col style="width:250px">
-            <span>项目名称:</span>
-            <el-select v-model="projectValue" style="width:150px" placeholder="请选择" size="small" clearable filterable @change="projectChange">
-              <el-option
-                v-for="item in project"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-          </el-col>
-          <el-col style="width:250px">
-            <span>机床图号:</span>
-            <el-select v-model="machineValue" style="width:150px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
-              <el-option
-                v-for="item in machine"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-          </el-col>
-          <el-col style="width:250px">
-            <span>组&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号:</span>
-            <el-select v-model="groupValue" style="width:150px" placeholder="请选择" size="small" clearable filterable>
-              <el-option
-                v-for="item in group"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-          </el-col>
-        </el-row>
-        <el-row style="margin-bottom:10px">
-          <el-col style="width:250px">
-            <span>名&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;称:</span>
-            <el-input v-model="name" clearable size="small" style="width:150px" />
-          </el-col>
-          <el-col style="width:250px">
-            <span>规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格:</span>
-            <el-input v-model="spec" clearable size="small" style="width:150px" />
-          </el-col>
-          <span>图号或型号:</span>
-          <el-input v-model="model" clearable size="small" style="width:150px" />
-          <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchRecord()">查询</el-button>
-        </el-row>
-      </div>
-      <h4 style="margin-top: 0">采购合同入库</h4>
-      <el-table :data="tableData1" border stripe size="mini" style="width: 100%;" height="400">
-        <el-table-column label="名称" prop="名称" align="center" width="100" show-overflow-tooltip>
+    <el-card style="width: 900px;margin: 0px 0px 5px 0px">
+      <el-row style="margin-bottom:10px;margin-top: 10px">
+        <el-select v-model="machineValue" filterable placeholder="机床图号" size="small" clearable style="width: 150px" @change="machineChange">
+          <el-option
+            v-for="item in machine"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+          </el-option>
+        </el-select>
+        <el-select v-model="groupValue" style="width:150px;margin-left: 10px" placeholder="组号" size="small" clearable filterable>
+          <el-option
+            v-for="item in group"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <el-input v-model="name" placeholder="名称" style="width:150px;margin-left: 10px" clearable size="small"/>
+        <el-input v-model="model" placeholder="图号或型号" style="width:150px;margin-left: 10px" clearable size="small" />
+      </el-row>
+      <el-row style="margin-bottom:10px">
+        <el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;width:150px" />
+        <el-date-picker
+          v-model="inTime"
+          type="daterange"
+          size="small"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          range-separator="~"
+          style="width:250px;margin-left: 10px"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"/>
+        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchRecord()">查询</el-button>
+      </el-row>
+    </el-card>
+    <el-card style="width: 900px">
+      <el-table :data="tableData1" border stripe size="mini" style="width: 100%;" height="700">
+        <el-table-column label="名称" prop="名称" align="center" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" prop="图号或型号" align="center" 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="规格" prop="规格" align="center" width="120" show-overflow-tooltip>
+        <el-table-column label="规格" prop="规格" align="center" min-width="180" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="入库数量" align="center" width="120" show-overflow-tooltip>
+        <el-table-column label="入库数量" align="center" width="80" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.入库数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="入库人" prop="入库人" align="center" width="100" show-overflow-tooltip>
+        <el-table-column label="入库人" prop="入库人" align="center" width="80" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.入库人 }}
           </template>
         </el-table-column>
-        <el-table-column label="入库时间" prop="入库时间" align="center" min-width="100">
+        <el-table-column label="入库时间" prop="入库时间" align="center" width="145">
           <template slot-scope="scope">
-            {{ scope.row.入库时间 }}
+            {{ scope.row.入库时间 ? scope.row.入库时间.split(' ')[0] : '-' }}
           </template>
         </el-table-column>
       </el-table>
@@ -92,62 +81,16 @@
           @size-change="handleSizeChange1"
           @current-change="handleCurrentChange1"/>
       </div>
-      <h4>离线合同入库</h4>
-      <el-table :data="tableData2" border stripe size="mini" style="width: 100%;" height="400">
-        <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="图号或型号" prop="图号或型号" align="center" width="120" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.图号或型号 }}
-          </template>
-        </el-table-column>
-        <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="入库数量" align="center" width="120" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.入库数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="入库人" prop="入库人" align="center" 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>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent2"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize2"
-          :total="total2"
-          style="display:inline-block;width:50%"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange2"
-          @current-change="handleCurrentChange2"/>
-      </div>
     </el-card>
   </div>
 </template>
 
 <script>
-import { initProject, searchMachine, searchGroup, searchRecord1, searchRecord2 } from '@/api/Inventory/PurchaseInRecord'
+import { initMachineProject, searchGroup, searchRecord1 } from '@/api/Inventory/PurchaseInRecord'
 export default {
   name: 'PurchaseInRecord',
   data() {
     return {
-      projectValue: '', // 项目名称
-      project: [],
       machineValue: '',
       machine: [],
       groupValue: '',
@@ -155,31 +98,27 @@ export default {
       name: '',
       spec: '',
       model: '',
+      inTime: '',
       tableData1: [],
-      tableData2: [],
-      pageSize1: 10,
+      pageSize1: 40,
       pageCurrent1: 1,
-      total1: 0,
-      pageSize2: 10,
-      pageCurrent2: 1,
-      total2: 0
+      total1: 0
     }
   },
+  created() {
+    this.fetchData()
+  },
   mounted() {
-    this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
     this.searchRecord()
   },
   methods: {
-    projectChange() {
-      this.machine = []
-      this.machineValue = ''
-      this.group = []
-      this.groupValue = ''
-      searchMachine(this.projectValue).then(response => {
+    fetchData() {
+      initMachineProject().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.machine.push({
-            value: response.data[i].机床流水号,
-            label: response.data[i].机床图号
+            label: response.data[i].机床图号,
+            name: response.data[i].项目名称,
+            value: response.data[i].机床流水号
           })
         }
       })
@@ -198,35 +137,23 @@ export default {
     },
     searchRecord() {
       this.pageCurrent1 = 1
-      this.pageSize1 = 10
+      this.pageSize1 = 40
       this.searchRecord1()
-      this.pageCurrent2 = 1
-      this.pageSize2 = 10
-      this.searchRecord2()
     },
     searchRecord1() {
-      let check1, check2, check3, check4, check5, check6
+      let check1, check2, check3, check4, check5, check6, check7
       this.projectValue ? check1 = 1 : check1 = 0
       this.machineValue ? check2 = 1 : check2 = 0
       this.groupValue ? check3 = 1 : check3 = 0
       this.name ? check4 = 1 : check4 = 0
       this.spec ? check5 = 1 : check5 = 0
       this.model ? check6 = 1 : check6 = 0
-      searchRecord1(check1, this.projectValue, check2, this.machineValue, check3, this.groupValue, check4, this.name, check5, this.spec, check6, this.model, this.pageCurrent1, this.pageSize1).then(res => {
+      this.outTime ? check7 = 1 : check7 = 0
+      searchRecord1(check1, this.projectValue, check2, this.machineValue, check3, this.groupValue, check4, this.name, check5, this.spec, check6, this.model, check7, this.inTime[0] || '', this.inTime[1] || '', this.pageCurrent1, this.pageSize1).then(res => {
         this.tableData1 = res.data.rows
         this.total1 = res.data.total
       })
     },
-    searchRecord2() {
-      let check4, check5, check6
-      this.name ? check4 = 1 : check4 = 0
-      this.spec ? check5 = 1 : check5 = 0
-      this.model ? check6 = 1 : check6 = 0
-      searchRecord2(check4, this.name, check5, this.spec, check6, this.model, this.pageCurrent2, this.pageSize2).then(res => {
-        this.tableData2 = res.data.rows
-        this.total2 = res.data.total
-      })
-    },
     handleSizeChange1(val) {
       this.pageSize1 = val
       this.pageCurrent1 = 1
@@ -235,15 +162,6 @@ export default {
     handleCurrentChange1(val) {
       this.pageCurrent1 = val
       this.searchRecord1()
-    },
-    handleSizeChange2(val) {
-      this.pageSize2 = val
-      this.pageCurrent2 = 1
-      this.searchRecord2()
-    },
-    handleCurrentChange2(val) {
-      this.pageCurrent2 = val
-      this.searchRecord2()
     }
   }
 }
diff --git a/src/views/Inventory/PurchaseOutRecord/index.vue b/src/views/Inventory/PurchaseOutRecord/index.vue
index cd532135..301e7399 100644
--- a/src/views/Inventory/PurchaseOutRecord/index.vue
+++ b/src/views/Inventory/PurchaseOutRecord/index.vue
@@ -1,85 +1,60 @@
 <template>
   <div class="app-container">
-    <el-card>
-      <div slot="header" class="clearfix">
-        <el-row style="margin-bottom:10px">
-          <el-col style="width:250px">
-            <span>项目名称:</span>
-            <el-select v-model="projectValue" style="width:150px" placeholder="请选择" size="small" clearable filterable @change="projectChange">
-              <el-option
-                v-for="item in project"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-          </el-col>
-          <el-col style="width:250px">
-            <span>机床图号:</span>
-            <el-select v-model="machineValue" style="width:150px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
-              <el-option
-                v-for="item in machine"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-          </el-col>
-          <el-col style="width:250px">
-            <span>组&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号:</span>
-            <el-select v-model="groupValue" style="width:150px" placeholder="请选择" size="small" clearable filterable>
-              <el-option
-                v-for="item in group"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-          </el-col>
-        </el-row>
-        <el-row style="margin-bottom:10px">
-          <el-col style="width:250px">
-            <span>名&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;称:</span>
-            <el-input v-model="name" clearable size="small" style="width:150px" />
-          </el-col>
-          <el-col style="width:250px">
-            <span>规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格:</span>
-            <el-input v-model="spec" clearable size="small" style="width:150px" />
-          </el-col>
-          <el-col style="width:250px">
-            <span>图号或型号:</span>
-            <el-input v-model="model" clearable size="small" style="width:150px" />
-          </el-col>
-        </el-row>
-        <el-row>
-          <span>出库时间:</span>
-          <el-date-picker
-            v-model="outTime"
-            type="daterange"
-            size="small"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            range-separator="~"
-            style="width:250px"
-            start-placeholder=""
-            end-placeholder=""/>
-          <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;searchRecord()">查询</el-button>
-        </el-row>
-      </div>
-      <el-table :data="tableData" border stripe size="mini" style="width: 100%;" height="600">
-        <el-table-column label="名称" align="center" width="100" show-overflow-tooltip>
+    <el-card style="width: 900px;margin: 0px 0px 5px 0px">
+      <el-row style="margin-bottom:10px;margin-top: 10px">
+        <el-select v-model="machineValue" filterable placeholder="机床图号" size="small" clearable style="width: 150px" @change="machineChange">
+          <el-option
+            v-for="item in machine"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+          </el-option>
+        </el-select>
+        <el-select v-model="groupValue" placeholder="组号" size="small" style="width: 150px;margin-left: 10px" clearable filterable>
+          <el-option
+            v-for="item in group"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <el-input v-model="name" placeholder="名称" clearable size="small" style="width:150px;margin-left: 10px" />
+        <el-input v-model="model" placeholder="图号或型号" clearable size="small" style="width:150px;margin-left: 10px" />
+      </el-row>
+      <el-row style="margin-bottom:10px">
+        <el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px" />
+        <el-date-picker
+          v-model="outTime"
+          type="daterange"
+          size="small"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          range-separator="~"
+          style="width:250px;margin-left: 10px"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"/>
+        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=100;searchRecord()">查询</el-button>
+      </el-row>
+    </el-card>
+    <el-card style="width: 900px">
+      <el-table :data="tableData" border stripe size="mini" style="width: 100%;" width="100%" height="700">
+        <el-table-column label="名称" align="center" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" align="center" width="120" show-overflow-tooltip>
+        <el-table-column label="图号或型号" align="center" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.图号或型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" align="center" width="120" show-overflow-tooltip>
+        <el-table-column label="规格" align="center" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="出库数量" align="center" width="100" show-overflow-tooltip>
+        <el-table-column label="出库数量" align="center" width="90" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.出库数量 }}
           </template>
@@ -89,16 +64,16 @@
             {{ scope.row.领料人 }}
           </template>
         </el-table-column>
-        <el-table-column label="出库时间" align="center" min-width="100">
+        <el-table-column label="出库时间" align="center" width="145">
           <template slot-scope="scope">
-            {{ scope.row.出库时间 }}
+            {{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '-' }}
           </template>
         </el-table-column>
       </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination
           :current-page="pageCurrent1"
-          :page-sizes="[10, 20, 30, 40]"
+          :page-sizes="[10, 20, 30, 40, 100]"
           :page-size="pageSize1"
           :total="total1"
           style="display:inline-block;width:50%"
@@ -111,7 +86,7 @@
 </template>
 
 <script>
-import { initProject, searchMachine, searchGroup, searchRecord } from '@/api/Inventory/PurchaseOutRecord'
+import { initMachineProject, searchGroup, searchRecord } from '@/api/Inventory/PurchaseOutRecord'
 export default {
   name: 'PurchaseOutRecord',
   data() {
@@ -126,27 +101,26 @@ export default {
       spec: '',
       model: '',
       tableData: [],
-      pageSize1: 10,
+      pageSize1: 100,
       pageCurrent1: 1,
       total1: 0,
       outTime: '' // 出库时间
     }
   },
+  created() {
+    this.fetchData()
+  },
   mounted() {
-    this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
     this.searchRecord()
   },
   methods: {
-    projectChange() {
-      this.machine = []
-      this.machineValue = ''
-      this.group = []
-      this.groupValue = ''
-      searchMachine(this.projectValue).then(response => {
+    fetchData() {
+      initMachineProject().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.machine.push({
-            value: response.data[i].机床流水号,
-            label: response.data[i].机床图号
+            label: response.data[i].机床图号,
+            name: response.data[i].项目名称,
+            value: response.data[i].机床流水号
           })
         }
       })
diff --git a/src/views/Inventory/PurchasePartsStorage/index.vue b/src/views/Inventory/PurchasePartsStorage/index.vue
index a02e2cfa..648df99e 100644
--- a/src/views/Inventory/PurchasePartsStorage/index.vue
+++ b/src/views/Inventory/PurchasePartsStorage/index.vue
@@ -30,12 +30,7 @@
     <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="合同编号" prop="合同编号" width="120px" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.合同编号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="名称" prop="物料名称" width="150px" align="center" show-overflow-tooltip >
+        <el-table-column label="名称" sortable prop="物料名称" width="150px" align="center" show-overflow-tooltip >
           <template slot-scope="scope">
             {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
           </template>
@@ -308,7 +303,7 @@ export default {
           method: 'post',
           data: {
             type: '1',
-            name: '库存管理_外购件入库_采购部查询',
+            name: '库存管理_外购件入库_采购部查询_新',
             param: `供应商流水号=${this.supplierValue}&采购合同流水号_check=${this.contractValue_check}&采购合同流水号=${this.contractValue}`
           }
         }
@@ -317,17 +312,17 @@ export default {
           this.$set(v, '本次到货数量', v.数量 - v.到货数量)
           return v
         })
-        // this.table1 = res.data
-        res.data.map(v => {
-          this.table1.push({
-            合同编号: v.合同编号,
-            物料名称: v.物料名称,
-            规格型号: v.物料规格 + v.物料型号,
-            数量: v.数量,
-            到货数量: v.到货数量,
-            本次到货数量: v.本次到货数量
-          })
-        })
+        this.table1 = res.data
+        // res.data.map(v => {
+        //   this.table1.push({
+        //     合同编号: v.合同编号,
+        //     物料名称: v.物料名称,
+        //     规格型号: v.物料规格 + v.物料型号,
+        //     数量: v.数量,
+        //     到货数量: v.到货数量,
+        //     本次到货数量: v.本次到货数量
+        //   })
+        // })
       } else if (this.TypeValue === 3) {
         if (this.contractValue) { this.contractValue_check = 1 } else { this.contractValue_check = 0 }
         const param = {
@@ -395,7 +390,6 @@ export default {
         const materialGroup = []
         const numberGroup = []
         const partGroup = []
-        const 组件零件流水号 = []
         const 组件零件基本件流水号 = []
         this.$confirm('确认入库?', '提示', {
           confirmButtonText: '确定入库',
@@ -407,8 +401,6 @@ export default {
             for (let i = 0; i < this.multipleSelection.length; i++) {
               materialGroup.push(this.multipleSelection[i].物料流水号)
               numberGroup.push(this.multipleSelection[i].本次到货数量)
-              partGroup.push(this.multipleSelection[i].采购合同明细流水号)
-              组件零件流水号.push(this.multipleSelection[i].组件零件流水号)
               组件零件基本件流水号.push(this.multipleSelection[i].组件零件基本件流水号)
             }
             const param = {
@@ -416,8 +408,8 @@ export default {
               method: 'post',
               data: {
                 type: '2',
-                name: '采购件入库_外购件入库_循环执行',
-                param: `物料流水号组=${materialGroup}&实际到货数量组=${numberGroup}&货位流水号=${this.locateNumber}&采购合同明细流水号组=${partGroup}&入库人员流水号=${this.inventoryPeople}&组件零件流水号组=${组件零件流水号}&组件零件基本件流水号组=${组件零件基本件流水号}`
+                name: '采购件入库_外购件入库_循环执行_新',
+                param: `物料流水号组=${materialGroup}&实际到货数量组=${numberGroup}&货位流水号=${this.locateNumber}&入库人员流水号=${this.inventoryPeople}&供应商流水号=${this.supplierValue}&采购合同流水号=${this.contractValue}&组件零件基本件流水号组=${组件零件基本件流水号}`
               }
             }
             const res = await axios(param)
diff --git a/src/views/ManufacturingCenter/ParseQuery/index.vue b/src/views/ManufacturingCenter/ParseQuery/index.vue
index 0d8f492e..3a3b6ce6 100644
--- a/src/views/ManufacturingCenter/ParseQuery/index.vue
+++ b/src/views/ManufacturingCenter/ParseQuery/index.vue
@@ -3,134 +3,134 @@
     <el-card>
       <div class="main">
         <div class="process" @click.stop="chaxun">
-          <div id="son" :class="[isActive ? color[22] : 'weikaishi']" class="module" style="position: relative;left: 1543px;top:190px; width: 80px;height: 48px;">
+          <div id="son" :class="[isActive ? color[22] : 'weikaishi']" class="module" style="position: relative;left: 1543px;top:188px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">单击查看发货详情</div>
               <el-button :disabled="disabled" :class="[isActive ? color[22] : 'weikaishi']" type="text" @click.stop="searchDiv23">发货</el-button>
             </el-tooltip>
           </div>
-          <div id="son1" :class="[isActive ? color[21] : 'weikaishi']" class="module" style="position: relative;left: 1355px;top:190px; width: 80px;height: 48px;">
+          <div id="son1" :class="[isActive ? color[21] : 'weikaishi']" class="module" style="position: relative;left: 1355px;top:185px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">总装开始时间：{{ `${data2[0].总装调试}` }}<br>总装结束时间：{{ `${data2[0].机床装配实际完成时间}` }}</div>
               <el-button v-if="data2[0].总装调试状态===2" :disabled="disabled" :class="[isActive ? color[21] : 'weikaishi']" type="text" @click.stop="searchDiv22">总装调试<br>{{ `${data2[0].机床装配实际完成时间}` }}</el-button>
               <el-button v-else :disabled="disabled" :class="[isActive ? color[21] : 'weikaishi']" type="text" @click.stop="searchDiv22">总装调试<br>{{ `${data2[0].总装调试}` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son2" :class="[isActive ? color[20] : 'weikaishi']" class="module" style="position: relative;left: 1168px;top:190px; width: 80px;height: 48px;">
+          <div id="son2" :class="[isActive ? color[20] : 'weikaishi']" class="module" style="position: relative;left: 1168px;top:185px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">装配质检合格率：{{ `${data2[0].装配质检 === 11111111 ? '-' : data2[0].装配质检}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[20] : 'weikaishi']" type="text" @click.stop="searchDiv21">装配质检<br>{{ `${data2[0].装配质检 === 11111111 ? '-' : data2[0].装配质检}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son3" :class="[isActive ? color[19] : 'weikaishi']" class="module" style="position: relative;left: 965px;top:62px; width: 80px;height: 48px;">
+          <div id="son3" :class="[isActive ? color[19] : 'weikaishi']" class="module" style="position: relative;left: 963px;top:135px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">电气装配计划完成率：{{ `${data2[0].电气装配}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[19] : 'weikaishi']" type="text" @click.stop="searchDiv6">电气装配<br>{{ `${data2[0].电气装配}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son4" :class="[isActive ? color[18] : 'weikaishi']" class="module" style="position: relative;left: 878px;top:140px; width: 80px;height: 48px;">
+          <div id="son4" :class="[isActive ? color[18] : 'weikaishi']" class="module" style="position: relative;left: 878px;top:215px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">机械装配计划完成率：{{ `${data2[0].机械装配}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[18] : 'weikaishi']" type="text" @click.stop="searchDiv5">机械装配<br>{{ `${data2[0].机械装配}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son5" :class="[isActive ? color[17] : 'weikaishi']" class="module" style="position: relative;left: 795px;top:220px; width: 80px;height: 48px;">
-            <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">冷作计划完成率：{{ `${data2[0].冷作}%` }}</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[17] : 'weikaishi']" type="text" @click.stop="searchDiv7">冷作<br>{{ `${data2[0].冷作}%` }}</el-button>
-            </el-tooltip>
-          </div>
-          <div id="son6" :class="[isActive ? color[16] : 'weikaishi']" class="module" style="position: relative;left: 710px;top:300px; width: 80px;height: 48px;">
-            <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">油漆计划完成率：{{ `${data2[0].油漆}%` }}</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[16] : 'weikaishi']" type="text" @click.stop="searchDiv8">油漆<br>{{ `${data2[0].油漆}%` }}</el-button>
-            </el-tooltip>
-          </div>
-          <div id="son7" :class="[isActive ? color[15] : 'weikaishi']" class="module" style="position: relative;left: 500px;top:190px; width: 80px;height: 48px;">
+          <!--<div id="son5" :class="[isActive ? color[17] : 'weikaishi']" class="module" style="position: relative;left: 795px;top:220px; width: 80px;height: 48px;">-->
+          <!--<el-tooltip :open-delay="600" placement="top">-->
+          <!--<div slot="content">冷作计划完成率：{{ `${data2[0].冷作}%` }}</div>-->
+          <!--<el-button :disabled="disabled" :class="[isActive ? color[17] : 'weikaishi']" type="text" @click.stop="searchDiv7">冷作<br>{{ `${data2[0].冷作}%` }}</el-button>-->
+          <!--</el-tooltip>-->
+          <!--</div>-->
+          <!--<div id="son6" :class="[isActive ? color[16] : 'weikaishi']" class="module" style="position: relative;left: 710px;top:300px; width: 80px;height: 48px;">-->
+          <!--<el-tooltip :open-delay="600" placement="top">-->
+          <!--<div slot="content">油漆计划完成率：{{ `${data2[0].油漆}%` }}</div>-->
+          <!--<el-button :disabled="disabled" :class="[isActive ? color[16] : 'weikaishi']" type="text" @click.stop="searchDiv8">油漆<br>{{ `${data2[0].油漆}%` }}</el-button>-->
+          <!--</el-tooltip>-->
+          <!--</div>-->
+          <div id="son7" :class="[isActive ? color[15] : 'weikaishi']" class="module" style="position: relative;left: 670px;top:185px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">成组配套率：{{ `${data2[0].成组配套}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[15] : 'weikaishi']" type="text" @click.stop="searchDiv9">成组配套<br>{{ `${data2[0].成组配套}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son8" :class="[isActive ? color[14] : 'weikaishi']" class="module" style="position: relative;left: 280px;top:95px; width: 80px;height: 48px;">
+          <div id="son8" :class="[isActive ? color[14] : 'weikaishi']" class="module" style="position: relative;left: 448px;top:92px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">自制质检合格率：{{ `${data2[0].自制质检 === 11111111 ? '-' : data2[0].自制质检}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[14] : 'weikaishi']" type="text" @click.stop="searchDiv12">自制质检<br>{{ `${data2[0].自制质检 === 11111111 ? '-' : data2[0].自制质检}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son9" :class="[isActive ? color[13] : 'weikaishi']" class="module" style="position: relative;left: 197px;top:286px; width: 80px;height: 48px;">
+          <div id="son9" :class="[isActive ? color[13] : 'weikaishi']" class="module" style="position: relative;left: 367px;top:279px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">采购质检合格率：{{ `${data2[0].采购质检 === 11111111 ? '-' : data2[0].采购质检}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[13] : 'weikaishi']" type="text" @click.stop="searchDiv19">采购质检<br>{{ `${data2[0].采购质检 === 11111111 ? '-' : data2[0].采购质检}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son10" :class="[isActive ? color[12] : 'weikaishi']" class="module" style="position: relative;left: -10px;top:155px; width: 80px;height: 48px;">
+          <div id="son10" :class="[isActive ? color[12] : 'weikaishi']" class="module" style="position: relative;left: 157px;top:153px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">车间加工计划完成率：{{ `${data2[0].车间加工}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[12] : 'weikaishi']" type="text" @click.stop="searchDiv10">车间加工<br>{{ `${data2[0].车间加工}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son11" :class="[isActive ? color[11] : 'weikaishi']" class="module" style="position: relative;left: -175px;top:33px; width: 80px;height: 48px;">
+          <div id="son11" :class="[isActive ? color[11] : 'weikaishi']" class="module" style="position: relative;left: -6px;top:33px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">外协计划完成率：{{ `${data2[0].外协}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[11] : 'weikaishi']" type="text" @click.stop="searchDiv18">工序外协<br>{{ `${data2[0].外协}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son12" :class="[isActive ? color[10] : 'weikaishi']" class="module" style="position: relative;left: -378px;top:94px; width: 80px;height: 48px;">
+          <div id="son12" :class="[isActive ? color[10] : 'weikaishi']" class="module" style="position: relative;left: -208px;top:92px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">能力平衡计划完成率：{{ `${data2[0].能力平衡}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[10] : 'weikaishi']" type="text" @click.stop="searchDiv15">能力平衡<br>{{ `${data2[0].能力平衡}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son14" :class="[isActive ? color[8] : 'weikaishi']" class="module" style="position: relative;left: -560px;top:93px; width: 80px;height: 48px;">
+          <div id="son14" :class="[isActive ? color[8] : 'weikaishi']" class="module" style="position: relative;left: -390px;top:92px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">工艺定额计划完成率：{{ `${data2[0].工艺定额}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[8] : 'weikaishi']" type="text" @click.stop="searchDiv13">工艺定额<br>{{ `${data2[0].工艺定额}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son15" :class="[isActive ? color[7] : 'weikaishi']" class="module" style="position: relative;left: -766px;top:33px; width: 80px;height: 48px;">
+          <div id="son15" :class="[isActive ? color[7] : 'weikaishi']" class="module" style="position: relative;left: -598px;top:33px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">自家备料计划完成率：{{ `${data2[0].自家备料}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[7] : 'weikaishi']" type="text" @click.stop="searchDiv11">自家备料<br>{{ `${data2[0].自家备料}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son16" :class="[isActive ? color[0] : 'weikaishi']" class="module" style="position: relative;left: -1295px;top:236px; width: 80px;height: 48px;">
+          <div id="son16" :class="[isActive ? color[0] : 'weikaishi']" class="module" style="position: relative;left: -1125px;top:236px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">回款进度：{{ parseInt(`${data2[0].签订合同}`) + '%' }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[0] : 'weikaishi']" type="text" @click.stop="searchDiv1">签订合同<br>{{ parseInt(`${data2[0].签订合同}`) + '%' }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son17" :class="[isActive ? color[1] : 'weikaishi']" class="module" style="position: relative;left: -1280px;top:238px; width: 80px;height: 48px;">
+          <div id="son17" :class="[isActive ? color[1] : 'weikaishi']" class="module" style="position: relative;left: -1111px;top:236px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">产品设计计划完成率：{{ `${data2[0].产品设计}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[1] : 'weikaishi']" type="text" @click.stop="searchDiv2">产品设计<br>{{ `${data2[0].产品设计}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son18" :class="[isActive ? color[6] : 'weikaishi']" class="module" style="position: relative;left: -1020px;top:155px; width: 80px;height: 48px;">
+          <div id="son18" :class="[isActive ? color[6] : 'weikaishi']" class="module" style="position: relative;left: -850px;top:155px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">外购备料计划完成率：{{ `${data2[0].外购备料}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[6] : 'weikaishi']" type="text" @click.stop="searchDiv20">外购备料<br>{{ `${data2[0].外购备料}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son19" :class="[isActive ? color[2] : 'weikaishi']" class="module" style="position: relative;left: -1350px;top:238px; width: 80px;height: 48px;">
+          <div id="son19" :class="[isActive ? color[2] : 'weikaishi']" class="module" style="position: relative;left: -1182px;top:236px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">零件分配计划完成率：{{ `${data2[0].零件分配}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[2] : 'weikaishi']" type="text" @click.stop="searchDiv3">零件分配<br>{{ `${data2[0].零件分配}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son20" :class="[isActive ? color[3] : 'weikaishi']" class="module" style="position: relative;left: -382px;top:55px; width: 80px;height: 48px;">
+          <div id="son20" :class="[isActive ? color[3] : 'weikaishi']" class="module" style="position: relative;left: -1142px;top:100px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">自制投产计划完成率：{{ `${data2[0].自制件}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[3] : 'weikaishi']" type="text" @click.stop="searchDiv4">自制投产<br>{{ `${data2[0].自制件}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son21" :class="[isActive ? color[5] : 'weikaishi']" class="module" style="position: relative;left: -468px;top:190px; width: 80px;height: 48px;">
+          <div id="son21" :class="[isActive ? color[5] : 'weikaishi']" class="module" style="position: relative;left: -1225px;top:235px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">采购计划完成率：{{ `${data2[0].车间采购}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[5] : 'weikaishi']" type="text" @click.stop="searchDiv17">车间采购<br>{{ `${data2[0].车间采购}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div id="son22" :class="[isActive ? color[4] : 'weikaishi']" class="module" style="position: relative;left: -550px;top:282px; width: 80px;height: 48px;">
+          <div id="son22" :class="[isActive ? color[4] : 'weikaishi']" class="module" style="position: relative;left: -465px;top:278px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
               <div slot="content">采购计划完成率：{{ `${data2[0].采购部采购}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[4] : 'weikaishi']" type="text" @click.stop="searchDiv16">采购部采购<br>{{ `${data2[0].采购部采购}%` }}</el-button>
@@ -4491,7 +4491,7 @@ export default {
     width: 1680px;
     height: 400px;
     /*border: 1px solid red;*/
-    background: url('../../../assets/img/img16.png') repeat;
+    background: url('../../../assets/img/img28.png') repeat;
     background-repeat:no-repeat;
     background-size:100% 100%;-moz-background-size:100% 100%;
   }
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index 15e60a53..b6f8bf9a 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -1,249 +1,596 @@
 <template>
   <div class="app-container">
-    <el-card>
-      <div slot="header">
-        <el-row>
-          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
-          <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
-          <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
-          <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="物料状态" 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-card>
-    <el-card>
-      <div slot="header">
-        <el-row>
-          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
-          <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
-          <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
-          <el-select v-model="inventoryStateValue" placeholder="库存状态" size="small" clearable style="width: 80px">
-            <el-option
-              v-for="item in inventoryState"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-          <el-select v-model="purchaseStateValue" placeholder="库存状态" size="small" style="width: 80px">
-            <el-option
-              v-for="item in purchaseState"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-          <el-button
-            type="success"
-            size="small"
-            icon="el-icon-search"
-            style="margin-left: 10px"
-            @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
-          <el-button style="float: right; padding: 10px" type="text" @click="showMaterialTable=!showMaterialTable">{{ showMaterialTable ? '收起' : '展开' }}</el-button>
-        </el-row>
-      </div>
-      <div v-show="showMaterialTable">
-        <el-table
-          v-loading="loading1"
-          :data="tableData1"
-          border
-          style="width: 100%;max-height: 460px;"
-          height="460"
-          size="mini"
-          @selection-change="handleSelectionChange">
-          <el-table-column type="selection" align="center" width="55"/>
-          <el-table-column label="库存状态" width="100" align="center">
-            <template slot-scope="scope">
-              <el-tag v-if="parseInt(scope.row.库存是否不足)===1" type="danger" size="small">不足</el-tag>
-              <el-tag v-else type="success" size="small">充足</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column label="物料名称" min-width="150" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.物料名称 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="物料型号" min-width="150" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.物料型号 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="物料规格" min-width="150" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.物料规格 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="供货商" min-width="150" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.供货商 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="参考价格" min-width="100" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.参考价格 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="当前库存量" min-width="70" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.当前库存量 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="安全库存量" min-width="150" align="center">
-            <template slot-scope="scope">
-              <template v-if="scope.row.changeSafeValue">
-                <el-input v-model="scope.row.安全库存量" class="edit-input" size="mini"/>
-                <el-button class="cancel-btn" size="mini" icon="el-icon-refresh" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
-              </template>
-              <span v-else>{{ scope.row.安全库存量 }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="设置" min-width="70" align="center">
-            <template slot-scope="scope">
-              <el-tooltip :open-delay="1000" effect="dark" content="设置安全库存量" placement="top">
-                <el-button v-if="scope.row.changeSafeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
-                <el-button
-                  v-else
-                  type="warning"
-                  size="mini"
-                  plain
-                  icon="el-icon-edit"
-                  @click="scope.row.changeSafeValue=!scope.row.changeSafeValue">设置</el-button>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="block" style="margin-top: 10px;">
-          <el-pagination
-            :current-page="pageCurrent1"
-            :page-sizes="[10, 20, 30, 40]"
-            :page-size="pageSize1"
-            :total="total1"
-            style="display:inline-block;width:800px"
-            layout="total, sizes, prev, pager, next, jumper"
-            @size-change="handleSizeChange1"
-            @current-change="handleCurrentChange1"/>
-        </div>
-      </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>
+              <el-select v-model="projectValue" style="width:120px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
+                <el-option
+                  v-for="item in project"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+              <el-select v-model="machineValue" style="width:120px;margin-left: 10px" placeholder="机床图号" size="small" clearable filterable @change="machineChange">
+                <el-option
+                  v-for="item in machine"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+              <el-select v-model="groupValue" style="width:120px;margin-left: 10px" placeholder="组号" size="small" clearable filterable>
+                <el-option
+                  v-for="item in group"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+              <el-input v-model="materialName" style="width: 120px;margin-left: 10px" placeholder="物料名称" size="small" clearable/>
+              <el-input v-model="materialSpec" style="width: 120px;margin-left: 10px" placeholder="物料规格" size="small" clearable/>
+              <el-input v-model="materialModel" style="width: 120px;margin-left: 10px" placeholder="物料型号" size="small" clearable/>
+            </el-row>
+            <el-row>
+              <span>物料状态:</span>
+              <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="width: 120px"/>
+              <el-date-picker
+                v-model="startTime"
+                size="small"
+                type="daterange"
+                align="center"
+                value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd"
+                range-separator="～"
+                style="width:250px;margin-left: 10px"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"/>
+              <el-button
+                type="success"
+                size="small"
+                icon="el-icon-search"
+                style="margin-left: 10px"
+                @click="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()">查询</el-button>
+              <el-popover v-model="visible1" 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" @click="visible1 = false;tiaozheng1()">确定</el-button>
+                </div>
+                <el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
+              </el-popover>
+            </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">已采购</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.任务分配时间 ? 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="170" 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">
+                  {{ scope.row.库存 = Number(scope.row.货位存量 ? scope.row.货位存量 : 0) - Number(scope.row.占用数量) }}
+                </template>
+              </el-table-column>
+              <el-table-column label="使用库存数量" align="center" min-width="105" prop="使用库存数">
+                <template slot-scope="scope">
+                  <el-input-number v-model="scope.row.使用库存数" :min="0" :max="Number(scope.row.零件数量) > Number(scope.row.货位存量) ? (Number(scope.row.货位存量) - Number(scope.row.占用数量)) : Number(scope.row.零件数量)" :disabled="Number(scope.row.货位存量) === 0 || parseInt(scope.row.采购状态编号)===3" size="mini" style="width: 90px" @change="changeNumber(scope.row)"/>
+                </template>
+              </el-table-column>
+              <el-table-column label="待采购数量" align="center" min-width="100" 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="pageCurrent11"
+                :page-sizes="[10, 20, 30, 40, 100]"
+                :page-size="pageSize11"
+                :total="total11"
+                style="display:inline-block;width:800px"
+                layout="total, sizes, prev, pager, next, jumper"
+                @size-change="handleSizeChange11"
+                @current-change="handleCurrentChange11"/>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="外购件" name="外购件">
+            <el-row>
+              <el-select v-model="projectValue" style="width:120px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
+                <el-option
+                  v-for="item in project"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+              <el-select v-model="machineValue" style="width:120px;margin-left: 10px" placeholder="机床图号" size="small" clearable filterable @change="machineChange">
+                <el-option
+                  v-for="item in machine"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+              <el-select v-model="groupValue" style="width:120px;margin-left: 10px" placeholder="组号" size="small" clearable filterable>
+                <el-option
+                  v-for="item in group"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+              <el-input v-model="materialName" style="width: 120px;margin-left: 10px" placeholder="物料名称" size="small" clearable/>
+              <el-input v-model="materialSpec" style="width: 120px;margin-left: 10px" placeholder="物料规格" size="small" clearable/>
+              <el-input v-model="materialModel" style="width: 120px;margin-left: 10px" placeholder="物料型号" size="small" clearable/>
+            </el-row>
+            <el-row>
+              <span>物料状态:</span>
+              <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="width: 120px"/>
+              <el-date-picker
+                v-model="startTime"
+                size="small"
+                type="daterange"
+                align="center"
+                value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd"
+                range-separator="～"
+                style="width:250px;margin-left: 10px"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"/>
+              <el-button
+                type="success"
+                size="small"
+                icon="el-icon-search"
+                style="margin-left: 10px"
+                @click="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()">查询</el-button>
+              <el-popover v-model="visible" 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" @click="visible = false;tiaozheng1()">确定</el-button>
+                </div>
+                <el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
+              </el-popover>
+            </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">已采购</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.任务分配时间 ? 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="70">
+                <template slot-scope="scope">
+                  <template v-if="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1||Number(scope.row.滞货数量)===0">
+                    —
+                  </template>
+                  <el-button v-else :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1||Number(scope.row.滞货数量)===0" icon="el-icon-goods" plain type="primary" size="mini" @click="useInventory(scope.row)"/>
+                </template>
+              </el-table-column>
+              <el-table-column label="可用滞货数量" align="center" min-width="100">
+                <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="pageCurrent11"
+                :page-sizes="[10, 20, 30, 40, 100]"
+                :page-size="pageSize11"
+                :total="total11"
+                style="display:inline-block;width:800px"
+                layout="total, sizes, prev, pager, next, jumper"
+                @size-change="handleSizeChange11"
+                @current-change="handleCurrentChange11"/>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="基本件" name="基本件">
+            <el-row style="margin-bottom: 5px">
+              <el-select v-model="projectValue" style="width:120px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
+                <el-option
+                  v-for="item in project"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+              <el-select v-model="machineValue" style="width:120px;margin-left: 10px" placeholder="机床图号" size="small" clearable filterable @change="machineChange">
+                <el-option
+                  v-for="item in machine"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+              <el-select v-model="groupValue" style="width:120px;margin-left: 10px" placeholder="组号" size="small" clearable filterable>
+                <el-option
+                  v-for="item in group"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+              <el-input v-model="partNum" style="width: 120px;margin-left: 10px" placeholder="零件图号" size="small" clearable/>
+              <el-input v-model="partName" style="width: 120px;margin-left: 10px" placeholder="零件名称" size="small" clearable/>
+              <el-input v-model="partSpec" style="width: 120px;margin-left: 10px" placeholder="零件规格" size="small" clearable/>
+            </el-row>
+            <el-row>
+              <span style="margin-right: -10px">物料状态:</span>
+              <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="width: 120px;margin-left: 10px"/>
+              <el-date-picker
+                v-model="startTime"
+                size="small"
+                type="daterange"
+                align="center"
+                value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd"
+                range-separator="～"
+                style="width:250px;margin-left: 10px"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"/>
+              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent12=1;pageSize12=100;total12=0;searchTable12()">查询</el-button>
+              <el-popover v-model="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" @click="visible2 = false;tiaozheng2()">确定</el-button>
+                </div>
+                <el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
+              </el-popover>
+            </el-row>
+            <el-row style="margin-bottom: 10px">
+              <el-table
+                v-loading=""
+                :data="tableData12"
+                :row-class-name="tableRowClassName"
+                border
+                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="零件状态" 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">已采购</el-tag>
+                  </template>
+                </el-table-column>
+                <el-table-column :filters="supplierFilters" :filter-method="filterHandler" label="供货商" align="center" min-width="100" prop="供货商">
+                  <template slot-scope="scope">
+                    {{ scope.row.供货商 }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="任务分配时间" align="center" min-width="100">
+                  <template slot-scope="scope">
+                    {{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
+                  </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="机床图号" align="center" min-width="100">
+                  <template slot-scope="scope">
+                    {{ scope.row.机床图号 }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="设计者" align="center" min-width="80">
+                  <template slot-scope="scope">
+                    {{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="组号" 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="名称" align="center" min-width="100">
+                  <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="材料" align="center" min-width="100">
+                  <template slot-scope="scope">
+                    {{ scope.row.材料 }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="数量" align="center" min-width="80">
+                  <template slot-scope="scope">
+                    {{ scope.row.待采购数量 }}
+                  </template>
+                </el-table-column>
+                <el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注">
+                  <template slot-scope="scope">
+                    {{ scope.row.备注 }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-row>
+            <div class="block">
+              <el-pagination
+                :current-page="pageCurrent12"
+                :page-sizes="[10, 50, 100, 150]"
+                :page-size="pageSize12"
+                :total="total12"
+                style="display:inline-block;width:50%"
+                layout="total, sizes, prev, pager, next, jumper"
+                @size-change="handleSizeChange12"
+                @current-change="handleCurrentChange12"/>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="仓库" name="仓库">
+            <el-row style="margin-bottom: 10px">
+              <el-input v-model="materialName" style="width: 120px;margin-left: 10px" placeholder="物料名称" size="small" clearable/>
+              <el-input v-model="materialSpec" style="width: 120px;margin-left: 10px" placeholder="物料规格" size="small" clearable/>
+              <el-input v-model="materialModel" style="width: 120px;margin-left: 10px" placeholder="物料型号" size="small" clearable/>
+              <span>物料状态:</span>
+              <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="width: 120px;margin: 0px"/>
+              <el-date-picker
+                v-model="startTime"
+                size="small"
+                type="daterange"
+                align="center"
+                value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd"
+                range-separator="～"
+                style="width:250px;margin-left: 10px"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"/>
+              <el-button
+                type="success"
+                size="small"
+                icon="el-icon-search"
+                style="margin-left: 10px"
+                @click="searchTable22()">查询</el-button>
+            </el-row>
+            <el-table
+              v-loading=""
+              :data="tableData22"
+              :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">已采购</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.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
+                </template>
+              </el-table-column>
+              <el-table-column label="机床图号" prop="机床图号" align="center" min-width="100">
+                <template slot-scope="scope">
+                  {{ scope.row.机床图号 ? scope.row.机床图号 : '-' }}
+                </template>
+              </el-table-column>
+              <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="名称" 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 :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.零件类型) === 4 ? '仓库' : '-' }}
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+        </el-tabs>
+      </el-col>
+    </el-row>
 
     <el-card>
       <div slot="header">
@@ -357,6 +704,15 @@
         <el-button v-if="quickChangePrice" size="mini" style="float:right;" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>
         <el-button v-else size="mini" style="float:right;" @click="quickChangePrice=!quickChangePrice">还原</el-button>
       </div>
+      <el-dialog v-el-drag-dialog :visible.sync="dialogVisible4" title="使用滞货" center style="min-height: 300px;" width="400px">
+        <span>使用滞货数量：</span>
+        <el-input-number :min="0" :max="maxUseNumber" v-model="useNumber" controls-position="right"/>
+        <div style="margin: 10px 0 0 10px;color: red">注意：确定后将不可取消使用滞货</div>
+        <div slot="footer" class="dialog-footer">
+          <el-button size="small" @click="dialogVisible4=false">取消</el-button>
+          <el-button :disabled="Number(useNumber)===0" type="primary" size="small" @click="submitUseInventory">确定</el-button>
+        </div>
+      </el-dialog>
       <!--<h3>合同详细信息</h3>-->
       <el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border style="max-height: 500px;" height="450px" size="mini" show-summary>
         <el-table-column label="离线合同编号" align="center" width="110">
@@ -366,17 +722,17 @@
         </el-table-column>
         <el-table-column label="物料名称" align="center" min-width="150">
           <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
+            {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料规格" align="center" min-width="100">
+        <el-table-column label="规格" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.物料规格 || '—' }}
+            {{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料型号" align="center" min-width="200">
+        <el-table-column label="图号或型号" align="center" min-width="200">
           <template slot-scope="scope">
-            {{ scope.row.物料型号 || '—' }}
+            {{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
           </template>
         </el-table-column>
         <el-table-column label="数量" align="center" min-width="100">
@@ -607,44 +963,6 @@
       </div>
     </el-dialog>
 
-    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible0" title="绑定到离线合同" center style="min-height: 300px">
-      <el-table :data="tableData02" border show-summary height="300" size="mini">
-        <el-table-column label="名称" align="center" min-width="100">
-          <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="规格" align="center" min-width="200">
-          <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>
-      确认将以上物料绑定到离线合同
-      <el-select v-model="offlineContractsValue" placeholder="离线合同号" filterable size="small" style="margin: 10px">
-        <el-option
-          v-for="item in offlineContracts"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      上。
-      <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="dialogVisible0=false">取消</el-button>
-        <el-button type="primary" size="small" @click="submitBind">确定</el-button>
-      </div>
-    </el-dialog>
-
     <div id="offlineContract" style="width: 800px;margin: 0 auto;display: none">
       <table class="offlineContract" cellspacing="0px" align="center" border="1 solid black" width="100%">
         <tr>
@@ -688,17 +1006,20 @@
 </template>
 
 <script>
-import { searchInventoryNum, searchOfflineContract, searchOfflineContract2, searchSupplier, addOfflineContract, editOfflineContract, deleteOfflineContract, searchMateriel,
-  addMateriel, deleteMateriel, saveOfflineContact, doneOfflineContact, setSafeValue, searchMaterial, initOfflineContract, submitBind, changeInquiryStatus } from '@/api/PurchasingCenter/OfflineContract'
+import { tiaozheng2, tiaozheng1, searchOfflineContract, searchOfflineContract2, searchSupplier, addOfflineContract, editOfflineContract, deleteOfflineContract, searchMateriel, searchMaterial1,
+  addMateriel, deleteMateriel, saveOfflineContact, doneOfflineContact, searchMaterial22, searchMachine, searchGroup, initProject, changeNum, submitUseInventory,
+  searchPart, getPerson } from '@/api/PurchasingCenter/OfflineContract'
 import QRCode from 'qrcode'
 import $ from 'jquery'
 import { mapGetters } from 'vuex'
-import request from '@/utils/request'
 
 export default {
   name: '', // 离线合同
   data() {
     return {
+      startTime: '',
+      标准件和外购件流水号: [],
+      基本件流水号: [],
       quickChangePrice: true,
       hasTax: '含税',
       taxRate: 0.13,
@@ -715,9 +1036,14 @@ export default {
       remarkFilters: [],
       supplierFilters: [],
       groupPartNumGroup: [], // 组件零件流水号组
+      groupBasicPartNumGroup: [], // 组件零件基本件流水号组
+      materielNumGroup: [], // 物料流水号组
+      idNumGroup: [], // id组
+      NumGroup: [], // 数量组
       offlineContractsValue: '',
       offlineContracts: [],
       tableData02: [],
+      tableData22: [],
       dialogVisible0: false,
       materialStatusValue: [0], // 物料状态
       materialStatus: [
@@ -750,8 +1076,21 @@ export default {
       ], // 物料状态
       total00: 0,
       pageCurrent00: 1,
-      pageSize00: 10,
+      pageSize00: 40,
       tableData00: [],
+      total11: 0,
+      pageCurrent11: 1,
+      pageSize11: 20,
+      tableData12: [], // 基本件列表
+      total12: 0,
+      pageCurrent12: 1,
+      pageSize12: 100,
+      partNum: '',
+      partName: '',
+      partSpec: '',
+      endTime: '',
+      Person: [],
+      PersonValue: '',
       showMaterialTable: true,
       loading1: false,
       title2: '',
@@ -793,6 +1132,12 @@ export default {
       supplierName: '', // 供应商名称
       payTime: [], // 付款时间节点
       tableData2: [],
+      projectValue: '',
+      project: [],
+      machineValue: '',
+      machine: [],
+      groupValue: '',
+      group: [],
       total2: 0,
       pageCurrent2: 1,
       pageSize2: 10,
@@ -823,7 +1168,11 @@ export default {
       phone: '', // 电话号码
       fax: '', // 传真
       tableData01: [],
+      partType: 1,
       dialogVisible2: false,
+      visible: false,
+      visible1: false,
+      visible2: false,
       form2: {
         离线合同流水号: '',
         离线合同编号: '',
@@ -841,7 +1190,12 @@ export default {
         运费: [{ required: true, message: '请填写运费' }],
         付款方式: [{ required: true, message: '请选择付款方式' }]
       },
+      backlogGroupPartNum: '',
+      backlogMaterialNum: '',
       tableData3: [],
+      useNumber: '',
+      maxUseNumber: '',
+      dialogVisible4: false,
       materielGroup: [], // 物料流水号组
       partGroup: [], // 离线合同明细流水号组
       numGroup: [], // 数量组
@@ -852,7 +1206,7 @@ export default {
       离线合同状态: '',
       paramRow: '', // 参数row
       disable: true, // 其他的禁用
-      tabName: '外购件'
+      tabName: '标准件'
     }
   },
   computed: {
@@ -862,41 +1216,13 @@ export default {
     ])
   },
   created() {
+    this.getPerson()
     this.fetchData()
-    this.searchTable1()
     this.searchTable2()
-    this.searchTable00()
+    this.searchTable11()
     this.initDirection()
   },
   methods: {
-    unbindPart(row) {
-      this.$confirm('确定还原状态?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        request({
-          url: '',
-          method: 'post',
-          data: {
-            type: '4',
-            name: `update MRP_计划订单_组件零件清单 set 询价状态编号 = 1 , 采购状态编号 = 1 where 标准件和外购件流水号 =${row.标准件和外购件流水号}`
-          }
-        }).then(res => {
-          if (res.data[0].result === '1') {
-            this.$message.success('操作成功')
-            this.searchTable00()
-          } else {
-            this.$message.error('操作失败')
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消操作'
-        })
-      })
-    },
     initDirection() {
       const direction = this.$getDirection()
       direction.on('keyup', function(e, val) {
@@ -915,6 +1241,94 @@ export default {
         }
       })
     },
+    projectChange() {
+      this.machine = []
+      this.machineValue = ''
+      this.group = []
+      this.groupValue = ''
+      searchMachine(this.projectValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machine.push({
+            value: response.data[i].机床流水号,
+            label: response.data[i].机床图号
+          })
+        }
+      })
+    },
+    machineChange() {
+      this.group = []
+      this.groupValue = ''
+      searchGroup(this.machineValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.group.push({
+            value: response.data[i].组件流水号,
+            label: response.data[i].组号
+          })
+        }
+      })
+    },
+    tiaozheng1() {
+      if (this.标准件和外购件流水号.length !== 0) {
+        if (this.PersonValue) {
+          tiaozheng1(this.PersonValue, this.标准件和外购件流水号).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('调整成功')
+              this.searchTable11()
+            } else {
+              this.$message.warning('调整失败')
+            }
+          })
+        } else {
+          this.$message.warning('请选择人员')
+        }
+      } else {
+        this.$message.warning('请选择物料')
+      }
+    },
+    tiaozheng2() {
+      if (this.基本件流水号.length !== 0) {
+        if (this.PersonValue) {
+          tiaozheng2(this.PersonValue, this.基本件流水号).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('调整成功')
+              this.searchTable12()
+            } else {
+              this.$message.warning('调整失败')
+            }
+          })
+        } else {
+          this.$message.warning('请选择人员')
+        }
+      } else {
+        this.$message.warning('请选择物料')
+      }
+    },
+    getPerson() {
+      getPerson().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Person.push({
+            value: response.data[i].人员编号,
+            label: response.data[i].姓名
+          })
+        }
+      })
+    },
+    submitUseInventory() {
+      submitUseInventory(this.backlogMaterialNum, this.useNumber, this.backlogGroupPartNum, this.id).then(response => {
+        if (response.data[0].result === '1') {
+          this.searchTable11()
+          this.dialogVisible4 = false
+          this.$message.success('操作成功')
+        } else { this.$message.error('操作失败') }
+      })
+    },
+    useInventory(row) { // 使用滞货
+      this.useNumber = 0
+      row.滞货数量 < row.待询价数量 ? this.maxUseNumber = Number(row.滞货数量) : this.maxUseNumber = Number(row.待询价数量)
+      this.backlogMaterialNum = row.物料流水号
+      this.backlogGroupPartNum = row.组件零件流水号
+      this.dialogVisible4 = true
+    },
     filterHandler0(value, row) { // 筛选备注
       return row['备注'].trim() === value
     },
@@ -924,27 +1338,17 @@ export default {
     filterSource(value, row) {
       return Number(row['零件类型']) === Number(value)
     },
-    // 变更询价状态
-    changeInquiryStatus() {
-      this.$confirm('确定变更询价状态?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        changeInquiryStatus(this.groupPartNumGroup).then(res => {
-          if (res.data[0].result === '1') {
-            this.$message.success('变更成功')
-            this.searchTable00()
-          } else {
-            this.$message.error('变更失败')
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消操作'
-        })
-      })
+    unInquiry(row) {
+      return parseInt(row.询价状态编号) === 1
+    },
+    inquiry(row) {
+      return parseInt(row.询价状态编号) === 3 && parseInt(row.采购状态编号) === 1
+    },
+    approval(row) {
+      return parseInt(row.询价状态编号) !== 1 && parseInt(row.采购状态编号) === 2
+    },
+    purchased(row) {
+      return parseInt(row.询价状态编号) !== 1 && parseInt(row.采购状态编号) === 3
     },
     editing(row) {
       return Number(row.离线合同状态) === 1
@@ -969,57 +1373,32 @@ export default {
         img.src = url
       })
     },
-    fetchData() {},
-    searchTable1() { // 查询物料库物料
-      this.loading1 = true
-      let check2, check3
-      this.materialSpec ? check2 = 1 : check2 = 0
-      this.materialModel ? check3 = 1 : check3 = 0
-      this.materialName ? this.check1 = 1 : this.check1 = 0
-      this.inventoryStateValue ? this.check2 = 1 : this.check2 = 0
-      searchInventoryNum(this.pageCurrent1, this.pageSize1, this.check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.check2, this.inventoryStateValue, this.purchaseStateValue).then(response => {
-        this.tableData1 = response.data.rows
-        this.tableData1.map(v => {
-          this.$set(v, 'changeSafeValue', false)
-          v.原安全库存量 = v.安全库存量
-          return v
-        })
-        this.total1 = response.data.total
-        this.loading1 = false
-      })
-    },
-    handleSizeChange1(val) {
-      this.pageSize1 = val
-      this.pageCurrent1 = 1
-      this.searchTable1()
-    },
-    handleCurrentChange1(val) {
-      this.pageCurrent1 = val
-      this.searchTable1()
-    },
-    handleSelectionChange(val) {
-      this.materielGroup = []
-      for (let i = 0; i < val.length; i++) {
-        this.materielGroup.push(val[i].物料流水号)
-      }
-    },
-    cancelEdit(row) { // 取消设置
-      row.安全库存量 = row.原安全库存量
-      row.changeSafeValue = false
-      this.$message('取消修改')
-    },
-    confirmEdit(row) { // 确认设置
-      Number(row.安全库存量) ? row.安全库存量 = Number(row.安全库存量) : row.安全库存量 = 0
-      setSafeValue(row.物料流水号, parseInt(row.安全库存量)).then(response => {
-        if (response.data[0].result === '1') {
-          row.changeSafeValue = false
-          this.$message.success('设置成功')
-          this.searchTable1()
-        } else {
-          this.$message.error('设置失败')
+    fetchData() {
+      initProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.project.push({
+            label: response.data[i].项目名称,
+            value: response.data[i].项目流水号
+          })
         }
       })
     },
+    tabClick(tab) {
+      console.log(tab.name, 1111)
+      if (tab.name === '外购件') {
+        this.tabName = '外购件'
+        this.searchTable11()
+      } else if (tab.name === '标准件') {
+        this.tabName = '标准件'
+        this.searchTable11()
+      } else if (tab.name === '基本件') {
+        this.tabName = '基本件'
+        this.searchTable12()
+      } else {
+        this.tabName = '仓库'
+        this.searchTable22()
+      }
+    },
     searchTable2() { // 查询离线合同列表
       this.offlineContract ? this.check3 = 1 : this.check3 = 0
       this.supplierName0 ? this.check4 = 1 : this.check4 = 0
@@ -1036,6 +1415,16 @@ export default {
       this.pageCurrent2 = val
       this.searchTable2()
     },
+    changeNumber(row) {
+      changeNum(row.物料流水号, row.使用库存数, row.机床流水号, row.组件零件流水号, row.零件数量).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('使用成功')
+          this.searchTable11()
+        } else {
+          this.$message.success('使用失败')
+        }
+      })
+    },
     addOfflineContract() { // 创建离线合同
       if (this.$refs['form2'] !== undefined) {
         this.$refs['form2'].resetFields()
@@ -1214,7 +1603,7 @@ export default {
           this.$set(v, '未税单价', v.单价 / (1 + this.taxRate))
         })
       })
-      this.arrival(row) ? this.disable = true : this.disable = false // 是否为编辑模式
+      this.arrival(row) || this.purchasing(row) ? this.disable = true : this.disable = false // 是否为编辑模式
     },
     getSummaries(param) { // 合计
       const { columns, data } = param
@@ -1261,12 +1650,19 @@ export default {
         this.$message.warning('请选择离线合同')
       } else if (Number(this.离线合同状态) !== 1) {
         this.$message.warning('请选择可编辑的离线合同')
-      } else if (this.materielGroup.length === 0) {
+      } else if (this.materielNumGroup.length === 0) {
         this.$message.warning('请勾选物料')
       } else {
-        addMateriel(this.offlineContractNum, this.materielGroup).then(response => {
+        addMateriel(this.offlineContractNum, this.groupPartNumGroup, this.groupBasicPartNumGroup, this.materielNumGroup, this.idNumGroup, this.NumGroup).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('选入成功')
+            if (this.tabName === '外购件' || this.tabName === '标准件') {
+              this.searchTable11()
+            } else if (this.tabName === '基本件') {
+              this.searchTable12()
+            } else {
+              this.searchTable22()
+            }
             searchMateriel(this.offlineContractNum).then(response => {
               this.tableData3 = response.data
               this.tableData3.map(v => {
@@ -1286,6 +1682,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        console.log(row.离线合同明细流水号, 1111)
         deleteMateriel(row.离线合同明细流水号).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('移除成功')
@@ -1298,6 +1695,13 @@ export default {
                 this.$set(v, '未税单价', v.单价 / (1 + this.taxRate))
               })
             })
+            if (this.tabName === '外购件' || this.tabName === '标准件') {
+              this.searchTable11()
+            } else if (this.tabName === '基本件') {
+              this.searchTable12()
+            } else if (this.tabName === '仓库') {
+              this.searchTable22()
+            }
           } else { this.$message.error('移除失败') }
         })
       }).catch(() => {
@@ -1425,9 +1829,9 @@ export default {
         let total = 0
         for (let j = 0; j < this.tableData3.length; j++) {
           document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
-          document.getElementsByClassName('tableData')[j].children[1].innerHTML = this.tableData3[j].物料名称
-          document.getElementsByClassName('tableData')[j].children[2].innerHTML = this.tableData3[j].物料规格
-          document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.tableData3[j].物料型号
+          document.getElementsByClassName('tableData')[j].children[1].innerHTML = this.tableData3[j].物料名称 ? this.tableData3[j].物料名称 : this.tableData3[j].零件名称
+          document.getElementsByClassName('tableData')[j].children[2].innerHTML = this.tableData3[j].物料规格 ? this.tableData3[j].物料规格 : this.tableData3[j].规格
+          document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.tableData3[j].物料型号 ? this.tableData3[j].物料型号 : this.tableData3[j].零件图号
           document.getElementsByClassName('tableData')[j].children[4].innerHTML = this.tableData3[j].数量
           document.getElementsByClassName('tableData')[j].children[5].innerHTML = this.tableData3[j].单价
           document.getElementsByClassName('tableData')[j].children[6].innerHTML = this.tableData3[j].计量单位
@@ -1471,31 +1875,88 @@ export default {
       return ''
     },
     handleSelectionChange1(val) { // 标准件和外购件多选
+      this.标准件和外购件流水号 = []
+      this.基本件流水号 = []
       this.groupPartNumGroup = []
-      this.tableData02 = val
+      this.groupBasicPartNumGroup = []
+      this.materielNumGroup = []
+      this.idNumGroup = []
+      this.NumGroup = []
       for (let i = 0; i < val.length; i++) {
+        this.标准件和外购件流水号.push(val[i].标准件和外购件流水号)
+        this.基本件流水号.push(val[i].基本件流水号)
         this.groupPartNumGroup.push(val[i].组件零件流水号)
+        this.groupBasicPartNumGroup.push(val[i].组件零件基本件流水号)
+        this.materielNumGroup.push(val[i].物料流水号)
+        this.idNumGroup.push(val[i].id)
+        this.NumGroup.push(val[i].待采购数量)
       }
+      console.log(this.materielNumGroup, 222)
     },
     selectable(row, index) { // 控制某行是否可选
       return Number(row.采购状态编号) < 3 && Number(row.是否确认) === 1 // 未采购&&确认物料修改
     },
-    searchTable00() { // 查询标准件和外购件列表
-      this.pageCurrent1 = 1
-      this.pageSize1 = 10
-      this.total1 = 0
-      this.searchTable1()
-      let check1, check2, check3
+    searchTable11() { // 查询外购件列表
+      let check1, check2, check3, check4, check5, check6, check7
       this.materialName ? check1 = 1 : check1 = 0
       this.materialSpec ? check2 = 1 : check2 = 0
       this.materialModel ? check3 = 1 : check3 = 0
-      searchMaterial(this.pageCurrent00, this.pageSize00, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, 1).then(response => {
+      this.projectValue ? check4 = 1 : check4 = 0
+      this.machineValue ? check5 = 1 : check5 = 0
+      this.groupValue ? check6 = 1 : check6 = 0
+      this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
+      console.log(this.tabName)
+      if (this.tabName === '外购件') { this.partType = 2 }
+      if (this.tabName === '标准件') { this.partType = 1 }
+      console.log(this.partType)
+      searchMaterial1(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, this.partType, check7, this.startTime[0], this.startTime[1]).then(response => {
         this.tableData00 = response.data.rows
-        this.total00 = response.data.total
+        console.log(this.tableData00, 111222)
+        this.total11 = response.data.total
         const remark = []
         const supplier = []
         this.remarkFilters = []
         this.supplierFilters = []
+        response.data.rows.map(v => {
+          if (v.备注 === null) { v.备注 = '' }
+          if (v.供货商 === null) { v.供货商 = '' }
+          if (!remark.includes(v.备注)) {
+            remark.push(v.备注)
+            this.remarkFilters.push({ text: v.备注, value: v.备注 })
+          }
+          if (!supplier.includes(v.供货商)) {
+            supplier.push(v.供货商)
+            this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
+          }
+        })
+      })
+    },
+    handleSizeChange11(val) { // 标准件和外购件列表分页
+      this.pageSize11 = val
+      this.pageCurrent11 = 1
+      this.searchTable11()
+    },
+    handleCurrentChange11(val) { // 标准件和外购件列表分页
+      this.pageCurrent11 = val
+      this.searchTable11()
+    },
+    searchTable12() { // 查询基本件列表
+      let check1, check2, check3, check4, check5, check6, check7
+      this.partNum ? check1 = 1 : check1 = 0
+      this.partName ? check2 = 1 : check2 = 0
+      this.partSpec ? check3 = 1 : check3 = 0
+      this.projectValue ? check4 = 1 : check4 = 0
+      this.machineValue ? check5 = 1 : check5 = 0
+      this.groupValue ? check6 = 1 : check6 = 0
+      this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
+      searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.startTime[0], this.startTime[1]).then(response => {
+        this.tableData12 = response.data.rows
+        this.total12 = response.data.total
+        const remark = []
+        const supplier = []
+        this.remarkFilters = []
+        this.supplierFilters = []
+        console.log(response.data.rows, 111)
         response.data.rows.map(v => {
           if (!remark.includes(v.备注)) {
             remark.push(v.备注)
@@ -1506,40 +1967,40 @@ export default {
         })
       })
     },
-    handleSizeChange00(val) { // 标准件和外购件列表分页
-      this.pageSize00 = val
-      this.pageCurrent00 = 1
-      this.searchTable00()
+    handleSizeChange12(val) { // 基本件列表分页
+      this.pageSize12 = val
+      this.pageCurrent12 = 1
+      this.searchTable12()
     },
-    handleCurrentChange00(val) { // 标准件和外购件列表分页
-      this.pageCurrent00 = val
-      this.searchTable00()
+    handleCurrentChange12(val) { // 基本件列表分页
+      this.pageCurrent12 = val
+      this.searchTable12()
     },
-    // 绑定离线合同
-    bindOfflineContract() {
-      this.offlineContracts = []
-      initOfflineContract().then(res => {
-        for (let i = 0; i < res.data.length; i++) {
-          this.offlineContracts.push({
-            value: res.data[i].离线合同流水号,
-            label: res.data[i].离线合同编号
-          })
-        }
-      })
-      this.dialogVisible0 = true
-    },
-    submitBind() {
-      if (this.offlineContractsValue) {
-        submitBind(this.groupPartNumGroup, this.offlineContractsValue).then(res => {
-          if (res.data[0].result === '1') {
-            this.$message.success('操作成功')
-            this.searchTable00()
-            this.dialogVisible0 = false
-          } else { this.$message.error('操作失败') }
+    searchTable22() {
+      let check1, check2, check3, check7
+      this.materialName ? check1 = 1 : check1 = 0
+      this.materialSpec ? check2 = 1 : check2 = 0
+      this.materialModel ? check3 = 1 : check3 = 0
+      this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
+      searchMaterial22(this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check7, this.startTime[0], this.startTime[1]).then(response => {
+        this.tableData22 = response.data
+        const remark = []
+        const supplier = []
+        this.remarkFilters = []
+        this.supplierFilters = []
+        response.data.map(v => {
+          if (v.备注 === null) { v.备注 = '' }
+          if (v.供货商 === null) { v.供货商 = '' }
+          if (!remark.includes(v.备注)) {
+            remark.push(v.备注)
+            this.remarkFilters.push({ text: v.备注, value: v.备注 })
+          }
+          if (!supplier.includes(v.供货商)) {
+            supplier.push(v.供货商)
+            this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
+          }
         })
-      } else {
-        this.$message.warning('请选择需要绑定的离线合同')
-      }
+      })
     }
   }
 }
diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
index b4879183..7b03788a 100644
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -175,7 +175,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="100" fixed="right">
           <template slot-scope="scope">
-            <el-button :disabled="true" type="danger" plain size="mini" icon="el-icon-delete" @click="deleteContract(scope.row)">删除</el-button>
+            <el-button :disabled="false" type="danger" plain size="mini" icon="el-icon-delete" @click="deleteContract(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue
index 9cb2b2de..3c5fdf18 100644
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -36,7 +36,6 @@
       <el-table
         v-loading="listLoading"
         :data="tableData"
-        :row-class-name="tableRowClassName"
         size="mini"
         border
         stripe
@@ -476,12 +475,6 @@ export default {
     pagination(pageCurrent, pageSize) {
       this.tableData = this.tableDataAll.slice((pageCurrent - 1) * pageSize, pageCurrent * pageSize)
     },
-    tableRowClassName({ row }) {
-      if (this.unSpecification.data.indexOf(row) > -1) {
-        return 'warning-row'
-      }
-      return ''
-    },
     handleEdit(row) {
       this.editForm(row, 'form', [this.title = '编辑零件信息', this.dialogFormVisible = true])
       if (this.type === 2) {
@@ -628,9 +621,6 @@ export default {
 </script>
 
 <style>
-  .el-table .warning-row {
-    background: yellowgreen;
-  }
   .rgb196{
     background: palevioletred !important;
   }