diff --git a/src/api/Inventory/CreatePickingList.js b/src/api/Inventory/CreatePickingList.js
new file mode 100644
index 00000000..bbf40ff2
--- /dev/null
+++ b/src/api/Inventory/CreatePickingList.js
@@ -0,0 +1,122 @@
+import request from '@/utils/request'
+
+// 初始化人员
+export function initPickPerson() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: 'select 姓名,人员编号 from 人事档案管理_人员名单 where 是否离职 = 0'
+    }
+  })
+}
+// 初始化机床项目
+export function initMachineProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_项目名称_查询数据'
+    }
+  })
+}
+// 组件查询
+export function searchgroup(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_组件名称_查询数据',
+      param: '机床流水号=' + num
+    }
+  })
+}
+// 查询三表
+export function searchTable(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间装配管理_领料单_三表_查询数据',
+      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}`,
+      Pagination: params[4] + '&' + params[5]
+    }
+  })
+}
+// 领料单查询
+export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间装配管理_领料单_查询数据',
+      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 创建领料单
+export function createList(num, remark) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间装配管理_领料单_增加数据',
+      param: '领料人流水号=' + num + '&领料单备注=' + remark
+    }
+  })
+}
+// 删除领料单
+export function dropList(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间装配管理_领料单_删除数据',
+      param: '领料单流水号=' + num
+    }
+  })
+}
+// 查询领料单明细
+export function searchListDetail(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间装配管理_领料单明细_查询数据',
+      param: `领料单流水号=${params[0]}`
+    }
+  })
+}
+// 选入领料单
+export function selectIntoList(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间装配管理_领料单明细_增加数据',
+      param: `基本件流水号组=${params[0]}&标准件和外购件流水号组=${params[1]}&领料单流水号=${params[2]}`
+    }
+  })
+}
+// 删除领料单
+export function dropListDetail(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间装配管理_领料单明细_删除数据',
+      param: '领料单明细流水号=' + num
+    }
+  })
+}
diff --git a/src/api/Inventory/MaterialOut.js b/src/api/Inventory/MaterialOut.js
new file mode 100644
index 00000000..01fb227d
--- /dev/null
+++ b/src/api/Inventory/MaterialOut.js
@@ -0,0 +1,39 @@
+import request from '@/utils/request'
+
+// 领料单查询
+export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间装配管理_领料单_查询数据',
+      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 查询领料单明细
+export function searchListDetail(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间装配管理_领料单明细_查询数据',
+      param: `领料单流水号=${params[0]}`
+    }
+  })
+}
+// 查看领料单明细相关的物料货位数量
+export function searchStockNumber(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '库存管理_物料出库_标准件和外购件_查询数据',
+      param: `物料流水号=${params[0]}`
+    }
+  })
+}
diff --git a/src/api/ManufacturingCenter/InitialProduction.js b/src/api/ManufacturingCenter/InitialProduction.js
index 20649ab8..8f674b1f 100644
--- a/src/api/ManufacturingCenter/InitialProduction.js
+++ b/src/api/ManufacturingCenter/InitialProduction.js
@@ -61,6 +61,18 @@ export function production(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q,
     }
   })
 }
+// 合并投产
+export function production2(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_合并投产',
+      param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int'
+    }
+  })
+}
 // 获取表2的值
 export function getTable1(num, pageList, pageSize) {
   return request({
diff --git a/src/api/TechnologyCenter/ImportParts.js b/src/api/TechnologyCenter/ImportParts.js
index 63672b54..85eb72c7 100644
--- a/src/api/TechnologyCenter/ImportParts.js
+++ b/src/api/TechnologyCenter/ImportParts.js
@@ -400,3 +400,36 @@ export function getMachineNames(num) {
     }
   })
 }
+export function machineSelect(projectValue) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_机床名称_查询数据2',
+      param: `项目流水号=${projectValue}`
+    }
+  })
+}
+export function getFileData(MachineDrawValue) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_机床总图_查询数据',
+      param: `机床流水号=${MachineDrawValue}`
+    }
+  })
+}
+export function deleteFileData(id) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: 'PDM_机床总图_删除数据',
+      param: `文件标识=${id}`
+    }
+  })
+}
diff --git a/src/icons/svg/CreatePickingList.svg b/src/icons/svg/CreatePickingList.svg
new file mode 100644
index 00000000..343a5d73
--- /dev/null
+++ b/src/icons/svg/CreatePickingList.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1553579626916" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2009" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M65.344 944.64l893.312 0 0 72.064-893.312 0 0-72.064Z" p-id="2010"></path><path d="M838.016 40 185.984 40c-70.656 0-128 57.344-128 128l0 531.968c0 70.656 57.344 128 128 128l652.032 0c70.656 0 128-57.344 128-128L966.016 168C966.016 97.344 908.672 40 838.016 40zM832 486.656l-60.032 0 0 193.344L254.976 680 256 486.656 192 486.656 192 416l325.312-275.968L832 428.032 832 486.656z" p-id="2011"></path><path d="M512 266.304 316.032 436.288 316.032 620.352 446.72 620.352 446.72 494.976 577.344 494.976 577.344 620.352 707.968 620.352 707.968 436.288Z" p-id="2012"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/MaterialOut.svg b/src/icons/svg/MaterialOut.svg
new file mode 100644
index 00000000..2cb31100
--- /dev/null
+++ b/src/icons/svg/MaterialOut.svg
@@ -0,0 +1 @@
+<svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><defs><style/></defs><path d="M365.694 365.688h292.551v46.223h-292.55zm-73.137 219.413h438.826v46.223H292.557z"/><path d="M870.198 1023.927c-28.085 0-54.049-14.481-67.726-37.74a47.54 47.54 0 0 0-82.499 0 78.477 78.477 0 0 1-67.798 37.74h-31.157c-28.085 0-54.122-14.481-67.799-37.74a47.54 47.54 0 0 0-82.499 0 78.55 78.55 0 0 1-67.725 37.74h-31.157c-28.085 0-54.049-14.481-67.799-37.74a47.54 47.54 0 0 0-82.426 0 78.55 78.55 0 0 1-67.798 37.74 81.329 81.329 0 0 1-80.671-81.914V243.987C73.144 109.414 180.876 0 313.182 0h397.576c132.379 0 240.038 109.414 240.038 243.987v698.099c0 45.126-36.13 81.84-80.598 81.84zM761.223 910.783c35.106 0 66.774 18.284 84.84 48.929a27.792 27.792 0 0 0 24.135 12.653 30.06 30.06 0 0 0 29.84-30.28V243.988c0-106.05-84.913-192.352-189.28-192.352H313.182c-104.368-.073-189.28 86.23-189.28 192.279v698.099c0 16.675 13.384 30.279 29.84 30.279a27.792 27.792 0 0 0 24.208-12.726c18.065-30.572 49.734-48.856 84.84-48.856 35.033 0 66.701 18.284 84.693 48.929a27.792 27.792 0 0 0 24.282 12.653h31.157a27.792 27.792 0 0 0 24.281-12.726c17.992-30.572 49.734-48.856 84.767-48.856 35.106 0 66.774 18.284 84.84 48.929a27.792 27.792 0 0 0 24.135 12.653h31.23a27.792 27.792 0 0 0 24.281-12.653c17.992-30.718 49.734-49.002 84.767-49.002z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/doc.svg b/src/icons/svg/doc.svg
new file mode 100644
index 00000000..04117746
--- /dev/null
+++ b/src/icons/svg/doc.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1559456604103" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3611" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M535.119473 0h69.599248v95.247413C729.226717 96.331138 853.614299 93.92286 977.881468 96.331138a40.459078 40.459078 0 0 1 44.914393 45.516463c2.047037 234.566322 0 469.614299 1.204139 703.819379-1.204139 24.082785 2.287865 50.694262-11.318909 72.248354-16.978363 12.041392-38.893697 10.837253-58.761994 12.041392h-349.200376V1023.518344h-72.248354C354.980245 990.886171 177.490122 960.541863 0 928.752587V95.488241C178.33302 63.578551 356.786453 32.511759 535.119473 0z" fill="#2A5699" p-id="3612"></path><path d="M604.718721 131.010348H988.598307v761.979304H604.718721v-95.247413h302.479774v-48.165569H604.718721v-59.002822h302.479774v-48.16557H604.718721v-59.002822h302.479774v-48.165569H604.718721v-60.206961h302.479774V428.673565H604.718721v-60.206961h302.479774v-46.96143H604.718721v-59.604892h302.479774V214.336783H604.718721zM240.827846 341.373471c22.156162-1.324553 44.19191-2.287865 66.348071-3.492003 15.533396 80.4365 31.30762 160.632173 48.165569 240.827845 13.125118-82.724365 27.695202-165.087488 41.783632-247.571025 23.239887-0.842897 46.479774-2.167451 69.719661-3.612418-26.370649 115.356538-49.369708 231.796802-78.148636 346.430856-19.386642 10.355597-48.165569 0-71.52587 1.204139C301.034807 596.169332 283.093133 517.779868 269.245532 438.667921c-13.606773 76.944497-31.30762 153.16651-46.841016 229.508937-22.39699-1.204139-44.793979-2.528692-67.311383-4.094073-19.266228-104.760113-42.024459-208.918156-60.206962-313.919097 19.868297-0.963311 39.857008-1.806209 60.206962-2.528693 12.041392 75.860771 25.648166 151.360301 36.124177 227.341487 16.135466-77.907808 32.873001-155.695202 49.610536-233.603011z" fill="#FFFFFF" p-id="3613"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/excel.svg b/src/icons/svg/excel.svg
new file mode 100644
index 00000000..efbf9848
--- /dev/null
+++ b/src/icons/svg/excel.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1559456699825" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5265" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M728.345 64.223H224.056V321.34h68.687V133.019h378.844v187.78h186.917v569.777H292.743v-84.271h-0.715v-68.796h0.715v-53.046h-68.687v274.909h703.135V256.486z" fill="#819292" p-id="5266"></path><path d="M660.276 418.403h129.217v67.077H660.276zM660.276 578.386h129.217v67.077H660.276zM660.276 738.369h129.217v67.077H660.276z" fill="#819292" p-id="5267"></path><path d="M586.15 408.784h-68.687v328.725H292.028v68.796H586.15z" fill="#50A135" p-id="5268"></path><path d="M460.55 684.463V321.34H98.004v363.123H460.55z m-234.043-70.305l-85.787 0.722 93.843-110.912-93.843-113.045 81.805 0.225 53.747 63.523 53.747-63.523 81.805-0.225-93.843 113.044 93.843 110.912-85.787-0.722-49.765-59.948-49.765 59.949z" fill="#50A135" p-id="5269"></path><path d="M326.038 614.158l85.787 0.722-93.843-110.913 93.843-113.044-81.805 0.225-53.747 63.524-53.748-63.524-81.805-0.225 93.844 113.044L140.72 614.88l85.787-0.722 49.766-59.948z" fill="#FFFFFF" p-id="5270"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/file.svg b/src/icons/svg/file.svg
new file mode 100644
index 00000000..a36bf667
--- /dev/null
+++ b/src/icons/svg/file.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1559456774760" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7063" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M692.312 956.978c-59.656 0-112.963-25.778-148.221-66.23H214.286V133.034h400.115v187.818h197.413v310.98c42.357 31.932 70.176 80.457 72.544 135.214v-510.52L674.346 64.223H141.742v895.335h742.615V782.244c-4.202 97.174-88.568 174.734-192.045 174.734z" fill="#819292" p-id="7064"></path><path d="M301.326 418.477h437.601v67.091H301.326zM301.326 578.493h219.957v67.091H301.326zM301.326 738.509h138.34V805.6h-138.34z" fill="#819292" p-id="7065"></path><path d="M811.814 631.832c-32.811-24.735-74.334-39.519-119.502-39.519-106.162 0-192.224 81.633-192.224 182.333 0 44.113 16.517 84.567 44.003 116.103 35.258 40.452 88.565 66.23 148.221 66.23 103.477 0 187.843-77.56 192.045-174.734 0.109-2.521 0.179-5.052 0.179-7.599s-0.07-5.078-0.179-7.599c-2.368-54.759-30.186-103.283-72.543-135.215zM660.869 888.809l-38.472-36.492 0.92-0.872-69.159-65.6 38.472-36.492 69.159 65.6 130.205-123.505 38.472 36.492-169.597 160.869z" fill="#50A135" p-id="7066"></path><path d="M791.994 691.447L661.789 814.952l-69.159-65.6-38.472 36.492 69.159 65.6-0.92 0.873 38.472 36.492L830.466 727.94z" fill="#FFFFFF" p-id="7067"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/pdf.svg b/src/icons/svg/pdf.svg
new file mode 100644
index 00000000..b2117fb9
--- /dev/null
+++ b/src/icons/svg/pdf.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1559456551095" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2809" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M145.6 0C100.8 0 64 36.8 64 81.6v860.8C64 987.2 100.8 1024 145.6 1024h732.8c44.8 0 81.6-36.8 81.6-81.6V324.8L657.6 0h-512z" fill="#8C181A" p-id="2810"></path><path d="M960 326.4v16H755.2s-100.8-20.8-97.6-107.2c0 0 3.2 91.2 96 91.2H960z" fill="#6B0D12" p-id="2811"></path><path d="M657.6 0v233.6c0 27.2 17.6 92.8 97.6 92.8H960L657.6 0z" fill="#FFFFFF" opacity=".5" p-id="2812"></path><path d="M302.4 784h-52.8v65.6c0 6.4-4.8 11.2-12.8 11.2-6.4 0-11.2-4.8-11.2-11.2V686.4c0-9.6 8-17.6 17.6-17.6h59.2c38.4 0 60.8 27.2 60.8 57.6 0 32-22.4 57.6-60.8 57.6z m-1.6-94.4h-51.2v73.6h51.2c22.4 0 38.4-14.4 38.4-36.8s-16-36.8-38.4-36.8z m166.4 171.2h-48c-9.6 0-17.6-8-17.6-17.6v-156.8c0-9.6 8-17.6 17.6-17.6h48c59.2 0 99.2 41.6 99.2 96s-38.4 96-99.2 96z m0-171.2h-41.6v148.8h41.6c46.4 0 73.6-33.6 73.6-75.2 1.6-40-25.6-73.6-73.6-73.6z m260.8 0h-92.8V752h91.2c6.4 0 9.6 4.8 9.6 11.2s-4.8 9.6-9.6 9.6h-91.2v76.8c0 6.4-4.8 11.2-12.8 11.2-6.4 0-11.2-4.8-11.2-11.2V686.4c0-9.6 8-17.6 17.6-17.6h99.2c6.4 0 9.6 4.8 9.6 11.2 1.6 4.8-3.2 9.6-9.6 9.6z" fill="#FFFFFF" p-id="2813"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/pic.svg b/src/icons/svg/pic.svg
new file mode 100644
index 00000000..ca2f133a
--- /dev/null
+++ b/src/icons/svg/pic.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1559456734634" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6070" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M633.222 304.176m-102.92 0a102.92 102.92 0 1 0 205.84 0 102.92 102.92 0 1 0-205.84 0Z" fill="#CEE8FA" p-id="6071"></path><path d="M633.216 435.568c-72.444 0-131.382-58.938-131.382-131.382s58.938-131.382 131.382-131.382 131.382 58.938 131.382 131.382-58.936 131.382-131.382 131.382z m0-205.86c-41.066 0-74.474 33.408-74.474 74.474s33.408 74.474 74.474 74.474 74.474-33.408 74.474-74.474c0-41.062-33.408-74.474-74.474-74.474z" fill="#2D527C" p-id="6072"></path><path d="M638.072 893.886L385.766 428.298 76.548 893.886z" fill="#CEE8FA" p-id="6073"></path><path d="M638.068 922.342H76.548a28.45 28.45 0 0 1-23.704-44.194l309.218-465.59a28.408 28.408 0 0 1 24.978-12.682 28.454 28.454 0 0 1 23.742 14.868l252.302 465.586a28.452 28.452 0 0 1-25.016 42.012zM129.604 865.432h460.682L383.292 483.456 129.604 865.432z" fill="#2D527C" p-id="6074"></path><path d="M947.452 893.886L695.148 585.72 442.844 893.886z" fill="#CEE8FA" p-id="6075"></path><path d="M947.456 922.342H442.846a28.46 28.46 0 0 1-22.016-46.482l252.304-308.166a28.456 28.456 0 0 1 44.032 0L969.47 875.86a28.46 28.46 0 0 1 3.7 30.208 28.46 28.46 0 0 1-25.714 16.274z m-444.54-56.91h384.47l-192.234-234.794-192.236 234.794z" fill="#2D527C" p-id="6076"></path><path d="M945.608 924.26H78.392C35.166 924.26 0 889.092 0 845.868V178.132C0 134.908 35.166 99.74 78.392 99.74h867.216C988.834 99.74 1024 134.908 1024 178.132v667.734c0 43.226-35.164 78.394-78.392 78.394zM78.392 156.65c-11.846 0-21.484 9.638-21.484 21.484v667.734c0 11.846 9.638 21.484 21.484 21.484h867.216c11.846 0 21.482-9.638 21.482-21.484V178.132c0-11.846-9.638-21.484-21.482-21.484H78.392z" fill="#2D527C" p-id="6077"></path><path d="M247.382 274.88H28.454C12.74 274.88 0 262.142 0 246.426s12.74-28.454 28.454-28.454h218.928c15.716 0 28.454 12.738 28.454 28.454s-12.738 28.454-28.454 28.454zM193.314 390.596h-164.86C12.74 390.596 0 377.856 0 362.14s12.74-28.454 28.454-28.454h164.858c15.716 0 28.454 12.738 28.454 28.454 0.002 15.716-12.738 28.456-28.452 28.456z" fill="#2D527C" p-id="6078"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/ppt.svg b/src/icons/svg/ppt.svg
new file mode 100644
index 00000000..27dcc3e8
--- /dev/null
+++ b/src/icons/svg/ppt.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1559456658409" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4469" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M538.731891 0h65.98683v107.168391c124.387582 0.722484 248.895579-1.324553 373.28316 0a40.699906 40.699906 0 0 1 45.034808 46.118533c2.047037 222.404516 0 444.929445 1.204139 667.454374-1.204139 24.082785 2.287865 50.694262-11.198495 72.248354-16.978363 12.041392-39.014111 10.957667-59.002822 12.041392-116.319849-0.60207-232.639699 0-349.200376 0V1023.518344h-72.248354C355.100659 990.886171 177.490122 960.662277 0 928.752587V95.488241C179.537159 63.698965 359.074318 31.30762 538.731891 0z" fill="#D24625" p-id="4470"></path><path d="M604.718721 142.931326H988.598307v726.216369H604.718721v-95.247413h279.239887v-47.563499H604.718721v-60.206962h279.239887v-46.96143H604.839135v-69.960489c46.118532 14.570085 98.619003 14.208843 139.800564-14.088429 44.553151-27.093133 67.793039-78.630292 71.646284-130.047036H663.119473c0-51.777987 0.60207-103.555974-0.963311-155.213547-19.145814 3.732832-38.171214 7.826905-57.196614 12.041392z" fill="#FFFFFF" p-id="4471"></path><path d="M686.35936 224.69238a165.689558 165.689558 0 0 1 153.16651 156.5381c-51.055503 0.60207-102.111007 0-153.286924 0 0.120414-52.380056 0.120414-104.278457 0.120414-156.5381z" fill="#D24625" p-id="4472"></path><path d="M186.64158 314.521167c63.21731 3.130762 139.680151-25.527752 192.662277 22.878645 50.092192 62.374412 36.84666 176.888053-37.44873 214.095955-26.370649 13.847601-56.714958 12.041392-85.373471 10.957667v139.68015l-69.238006-5.900282c-1.806209-127.157103-2.047037-254.434619-0.60207-381.712135z" fill="#FFFFFF" p-id="4473"></path><path d="M255.759172 378.942615c22.878645-0.963311 51.296331-5.298213 66.709313 16.737536a87.902164 87.902164 0 0 1 1.565381 78.148635c-13.245532 24.082785-43.228598 22.035748-66.468485 24.925682-2.408278-39.857008-2.167451-79.714017-1.806209-119.811853z" fill="#D24625" p-id="4474"></path></svg>
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index 8d46ce0f..c609d18e 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -11,11 +11,14 @@ export const name1 = `OP1000`
 export const readFile = `http://192.168.1.231:8411/webpage/file/` // invoice
 export const readImg = `http://192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond
 export const upload = `http://192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement
+export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图  发布时改成0.231
 export const upload2 = `http://192.168.1.231:8411/submit/upload2.ashx` // delivery
 export const upload3 = `http://192.168.1.231:8411/submit/upload3.ashx` // performancebond
 export const uploadInvoiceScan = `http://192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice
 export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoiceScan1.ashx` // invoice(workshop)
 export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
+export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图   发布时改成0.231
+
 const service = axios.create({
   baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue
new file mode 100644
index 00000000..09584add
--- /dev/null
+++ b/src/views/Inventory/CreatePickingList/index.vue
@@ -0,0 +1,645 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <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>
+        <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>
+      </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" label="机床图号" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.机床图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="组号" min-width="80px">
+              <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">
+              <template slot-scope="scope">
+                {{ scope.row.物料型号 || '—' }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="规格" min-width="200px">
+              <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">
+              <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>
+          <div class="block" style="float:right;">
+            <el-pagination
+              :current-page="pageCurrent0"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="pageSize0"
+              :total="total0"
+              style="margin-top:10px;display:inline-block;width:50%"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange0"
+              @current-change="handleCurrentChange0"/>
+          </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" label="机床图号" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.机床图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="组号" min-width="80px">
+              <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">
+              <template slot-scope="scope">
+                {{ scope.row.物料型号 || '—' }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="规格" min-width="200px">
+              <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">
+              <template slot-scope="scope">
+                {{ scope.row.备件总数量 }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block" style="float:right;">
+            <el-pagination
+              :current-page="pageCurrent1"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="pageSize1"
+              :total="total1"
+              style="margin-top:10px;display:inline-block;width:50%"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange1"
+              @current-change="handleCurrentChange1"/>
+          </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" label="机床图号" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.机床图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="组号" min-width="80px">
+              <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">
+              <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">
+              <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">
+              <template slot-scope="scope">
+                {{ scope.row.备件总数量 }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block" style="float:right;">
+            <el-pagination
+              :current-page="pageCurrent2"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="pageSize2"
+              :total="total2"
+              style="margin-top:10px;display:inline-block;width:50%"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange2"
+              @current-change="handleCurrentChange2"/>
+          </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>
+        <el-button size="small" type="primary" icon="el-icon-bottom" style="margin: 0 0 0 10px" @click="selectInto()">选入</el-button>
+      </div>
+      <h4 style="margin-top:0">领料单</h4>
+      <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 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="领料人" 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.是否启用)===1" type="warning">未确认</el-tag>
+            <el-tag v-else type="success">已确认</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="200px">
+          <template slot-scope="scope" align="center">
+            <el-button :disabled="Number(scope.row.是否启用)===0" size="mini" type="primary" icon="el-icon-check" @click="checkList(scope.row)">确认</el-button>
+            <el-button :disabled="Number(scope.row.是否启用)===0" size="mini" 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" 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="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 v-if="true" label="操作" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button :disabled="!!scope.row.是否出库" size="mini" type="danger" icon="el-icon-delete" @click="dropListDetail(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+
+    <el-dialog :visible.sync="dialogFormVisible1" title="创建领料单" center width="380px">
+      <el-form ref="form1" :model="form1" :rules="rules1" label-position="left">
+        <el-form-item label="领料人" prop="领料人流水号" label-width="100px" size="small">
+          <el-select v-model="form1.领料人流水号" placeholder="请选择" size="small" clearable filterable>
+            <el-option
+              v-for="item in pickPerson"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="领料单备注" prop="领料单备注" label-width="100px">
+          <el-input v-model="form1.领料单备注" size="small" placeholder="备注" style="width: 200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible1=false">取消</el-button>
+        <el-button type="primary" @click="submitCreateList()">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { initPickPerson, initMachineProject, searchgroup, searchTable, searchList, createList, dropList, selectIntoList, searchListDetail, dropListDetail } from '@/api/Inventory/CreatePickingList'
+import request from '@/utils/request'
+export default {
+  name: 'CreatePickingList',
+  data() {
+    return {
+      PartType: '基本件',
+      machineNumberValue: '',
+      machineNumber: [],
+      groupNumberValue: '',
+      groupNumber: [],
+      tableData0: [],
+      tableData1: [],
+      tableData2: [],
+      pageCurrent0: 1,
+      pageSize0: 20,
+      total0: 0,
+      pageCurrent1: 1,
+      pageSize1: 20,
+      total1: 0,
+      pageCurrent2: 1,
+      pageSize2: 20,
+      total2: 0,
+      pickListTable1: [],
+      pageCurrent3: 1,
+      pageSize3: 20,
+      total3: 0,
+      pickListTable2: [],
+      dialogFormVisible1: false,
+      form1: {
+        领料人流水号: '',
+        领料单备注: ''
+      },
+      rules1: {
+        领料人流水号: [{ required: true, message: '请选择领料人' }]
+      },
+      pickPerson: [],
+      pickingListNumber: '', // 领料单编号
+      pickingListNumberShow: '', // 领料单编号
+      pickingListNum: '', // 领料单流水号
+      multipleSelection: []
+    }
+  },
+  mounted() {
+    this.fetchData()
+    this.searchTable()
+    this.searchList()
+  },
+  methods: {
+    // 初始化数据
+    fetchData() {
+      initPickPerson().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.pickPerson.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      })
+      initMachineProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machineNumber.push({
+            label: response.data[i].机床图号,
+            name: response.data[i].项目名称,
+            value: response.data[i].机床流水号
+          })
+        }
+      })
+    },
+    // 根据机床查分组
+    machineChange() {
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      searchgroup(this.machineNumberValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNumber.push({
+            label: response.data[i].组号,
+            value: response.data[i].组件流水号
+          })
+        }
+      })
+    },
+    // 查三表
+    searchTable() {
+      this.multipleSelection = []
+      if (this.PartType === '标准件') {
+        this.searchTable0()
+      } else if (this.PartType === '外购件') {
+        this.searchTable1()
+      } else if (this.PartType === '基本件') {
+        this.searchTable2()
+      }
+    },
+    // 标准件
+    searchTable0() {
+      let check1, check2
+      this.machineNumberValue ? check1 = 1 : check1 = 0
+      this.groupNumberValue ? check2 = 1 : check2 = 0
+      searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1).then(response => {
+        this.tableData0 = response.data.rows
+        this.total0 = response.data.total
+      })
+    },
+    // 外购件
+    searchTable1() {
+      let check1, check2
+      this.machineNumberValue ? check1 = 1 : check1 = 0
+      this.groupNumberValue ? check2 = 1 : check2 = 0
+      searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2).then(response => {
+        this.tableData1 = response.data.rows
+        this.total1 = response.data.total
+      })
+    },
+    // 基本件
+    searchTable2() {
+      let check1, check2
+      this.machineNumberValue ? check1 = 1 : check1 = 0
+      this.groupNumberValue ? check2 = 1 : check2 = 0
+      searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, 3).then(response => {
+        this.tableData2 = response.data.rows
+        this.total2 = response.data.total
+      })
+    },
+    handleSizeChange0(val) {
+      this.pageSize0 = val
+      this.pageCurrent0 = 1
+      this.searchTable0()
+    },
+    handleCurrentChange0(val) {
+      this.pageCurrent0 = val
+      this.searchTable0()
+    },
+    handleSizeChange1(val) {
+      this.pageSize1 = val
+      this.pageCurrent1 = 1
+      this.searchTable1()
+    },
+    handleCurrentChange1(val) {
+      this.pageCurrent1 = val
+      this.searchTable1()
+    },
+    handleSizeChange2(val) {
+      this.pageSize2 = val
+      this.pageCurrent2 = 1
+      this.searchTable2()
+    },
+    handleCurrentChange2(val) {
+      this.pageCurrent2 = val
+      this.searchTable2()
+    },
+    // 查询领料单列表
+    searchList() {
+      let check
+      this.pickingListNumber ? check = 1 : check = 0
+      searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber).then(response => {
+        this.pickListTable1 = response.data.rows
+        this.total3 = response.data.total
+      })
+    },
+    handleSizeChange3(val) {
+      this.pageSize3 = val
+      this.pageCurrent3 = 1
+      this.searchList()
+    },
+    handleCurrentChange3(val) {
+      this.pageCurrent3 = val
+      this.searchList()
+    },
+    // 创建领料单
+    createList() {
+      if (this.$refs['form1'] !== undefined) {
+        this.$refs['form1'].resetFields()
+      }
+      this.form1.领料人流水号 = ''
+      this.form1.领料单备注 = ''
+      this.dialogFormVisible1 = true
+    },
+    // 提交创建领料单
+    submitCreateList() {
+      createList(this.form1.领料人流水号, this.form1.领料单备注).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('创建成功')
+          this.dialogFormVisible1 = false
+          this.searchList()
+        } else { this.$message.error('操作失败') }
+      })
+    },
+    // 确认领料单
+    checkList(row) {
+      this.$confirm('是否确认领回?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const param = {
+          url: '',
+          method: 'post',
+          data: {
+            type: '4',
+            name: `update 车间装配管理_领料单 set 是否启用 = 0 where 领料单流水号 = ${row.领料单流水号}`
+          }
+        }
+        request(param).then(res => {
+          if (res.data[0].result === '1') {
+            this.$message.success('操作成功')
+            this.pickingListNumber = ''
+            this.searchList()
+          } else {
+            this.$message.error('操作失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
+      })
+    },
+    // 删除领料单
+    dropList(row) {
+      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        dropList(row.领料单流水号).then(response => {
+          if (Number(response.data[0].result) === 1) {
+            this.$message.success('删除成功')
+            this.searchList()
+          } else {
+            this.$message.error('数据占用')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 多选
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 选入
+    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 (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) {
+      row ? this.pickingListNum = row.领料单流水号 : this.pickingListNum
+      row ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow
+      searchListDetail(this.pickingListNum).then(res => {
+        this.pickListTable2 = res.data
+      })
+    },
+    // 删除领料单明细
+    dropListDetail(row) {
+      console.log(row)
+      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        dropListDetail(row.领料单明细流水号).then(response => {
+          if (Number(response.data[0].result) === 1) {
+            this.$message.success('删除成功')
+            this.clickList()
+          } else {
+            this.$message.error('已确认领回，不可删除')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .el-card{
+    margin-bottom: 15px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  span{
+    margin: 10px 0 10px 10px;
+  }
+  .el-tag{
+    margin: 0
+  }
+</style>
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
new file mode 100644
index 00000000..22fd780a
--- /dev/null
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -0,0 +1,235 @@
+<template>
+  <div class="app-container">
+    <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>
+      </div>
+      <h4 style="margin-top:0">领料单</h4>
+      <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 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="领料人" 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.是否启用)===1" type="warning">未确认</el-tag>
+            <el-tag v-else type="success">已确认</el-tag>
+          </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" highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="clickListDetail">
+        <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.名称 }}
+          </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="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.备件数量 }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+
+    <el-card>
+      <h4 style="margin-top:0">物料货位数量信息</h4>
+      <el-table :data="StockNumberTable" border style="width: 100%;" size="mini" height="300">
+        <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">
+          <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 size="mini" type="primary" @click="outStore(scope.row)">出库</el-button>
+            <el-button size="mini" type="warning" @click="errorRecord(scope.row)">异常记录</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { searchList, searchListDetail, searchStockNumber } from '@/api/Inventory/MaterialOut'
+export default {
+  name: 'MaterialOut',
+  data() {
+    return {
+      pickingListNumber: '',
+      pickingListNumberShow: '',
+      pickListTable1: [],
+      pageCurrent3: 1,
+      pageSize3: 20,
+      total3: 0,
+      pickListTable2: [],
+      StockNumberTable: []
+    }
+  },
+  mounted() {
+    this.searchList()
+  },
+  methods: {
+    // 查询领料单列表
+    searchList() {
+      let check
+      this.pickingListNumber ? check = 1 : check = 0
+      searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber).then(response => {
+        this.pickListTable1 = response.data.rows
+        this.total3 = response.data.total
+      })
+    },
+    handleSizeChange3(val) {
+      this.pageSize3 = val
+      this.pageCurrent3 = 1
+      this.searchList()
+    },
+    handleCurrentChange3(val) {
+      this.pageCurrent3 = val
+      this.searchList()
+    },
+    // 查看领料单明细
+    clickList(row) {
+      row ? this.pickingListNum = row.领料单流水号 : this.pickingListNum
+      row ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow
+      searchListDetail(this.pickingListNum).then(res => {
+        this.pickListTable2 = res.data
+      })
+    },
+    // 查看领料单明细相关的物料货位数量
+    clickListDetail(row) {
+      console.log(row)
+      if (row.物料流水号) {
+        searchStockNumber(row.物料流水号).then(res => {
+          this.StockNumberTable = res.data
+        })
+      } else if (row.基本件流水号) {
+        console.log(row.基本件流水号)
+      }
+    },
+    // 出库
+    outStore(row) {
+      console.log(row)
+    },
+    // 异常记录
+    errorRecord(row) {
+      console.log(row)
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .el-card{
+    margin-bottom: 15px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  span{
+    margin: 10px 0 10px 10px;
+  }
+  .el-tag{
+    margin: 0
+  }
+</style>
diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index 72f38820..c213cdb2 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -164,6 +164,7 @@
           <el-table-column label="操作" width="200px" fixed="right" align="center">
             <template slot-scope="scope">
               <el-button
+                :disabled="checked_hebing"
                 size="mini"
                 type="primary"
                 @click="handleEdit(scope.$index, scope.row, 'form')">分批投产</el-button>
@@ -185,8 +186,8 @@
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"/>
           <!--<el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox>-->
-          <!--<el-checkbox v-model="checked_gaonandu">是否高难度</el-checkbox>-->
-          <el-button :loading="listLoading3" type="primary" size="small" style="float:right;margin-top:10px" @click="production">投产</el-button>
+          <el-button :loading="listLoading3" type="primary" size="small" style="float:right;" @click="production">投产</el-button>
+          <el-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox>
         </div>
       </div>
     </el-card>
@@ -331,12 +332,13 @@
 </template>
 
 <script>
-import { getEntryNameValue, getToolNum, getNum, getTable, production, getTable1, revisionBatch, editList, dele } from '@/api/ManufacturingCenter/InitialProduction'
+import { getEntryNameValue, getToolNum, getNum, getTable, production, getTable1, revisionBatch, editList, dele, production2 } from '@/api/ManufacturingCenter/InitialProduction'
 import { mapGetters } from 'vuex'
 
 export default {
   data() {
     return {
+      checked_hebing: true,
       maxmax: '',
       clearTable: 0,
       readonly: true,
@@ -801,52 +803,102 @@ export default {
           if (this.multipleSelection.length === 0) {
             this.$message.error('请至少选择一个零件')
           } else {
-            this.listLoading3 = true
-            for (let i = 0; i < this.multipleSelection.length; i++) {
-              if (this.multipleSelection[i].checked_waixie === false) {
-                this.multipleSelection[i].checked_waixie = 1
-              } else {
-                this.multipleSelection[i].checked_waixie = 2
-              }
-              if (this.multipleSelection[i].checked_zhaoji === false) {
-                this.multipleSelection[i].checked_zhaoji = 0
-              } else {
-                this.multipleSelection[i].checked_zhaoji = 1
-              }
-              if (this.multipleSelection[i].checked_dailiao === true) {
-                this.multipleSelection[i].checked_dailiao = 2
-              } else {
-                this.multipleSelection[i].checked_dailiao = 1
-              }
-              if (this.checked_gaonandu === false) {
-                this.checked_gaonandu = 0
-              } else {
-                this.checked_gaonandu = 1
-              }
-              if (this.checked_baitu === false) {
-                this.checked_baitu = 0
-              } else {
-                this.checked_baitu = 1
-              }
-              production(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu).then(response => {
-                this.result += parseInt(response.data[0].result)
-                if (this.result === this.multipleSelection.length) {
-                  this.$message.success('投产成功')
-                  this.total = 0
-                  this.pageList = 1
-                  this.getTable()
-                  this.checked_baitu = false
-                  this.checked_gaonandu = false
-                  this.tableData1 = []
-                  this.listLoading3 = false
-                } else if (response.data[0].result === '0') {
-                  this.listLoading3 = false
-                  this.$message.error('投产失败')
+            if (this.checked_hebing === true) {
+              this.listLoading3 = true
+              for (let i = 0; i < this.multipleSelection.length; i++) {
+                if (this.multipleSelection[i].checked_waixie === false) {
+                  this.multipleSelection[i].checked_waixie = 1
+                } else {
+                  this.multipleSelection[i].checked_waixie = 2
                 }
-              })
-              this.shijiancuo1 = 0
-              this.shijiancuo = 0
-              this.jieguo = 0
+                if (this.multipleSelection[i].checked_zhaoji === false) {
+                  this.multipleSelection[i].checked_zhaoji = 0
+                } else {
+                  this.multipleSelection[i].checked_zhaoji = 1
+                }
+                if (this.multipleSelection[i].checked_dailiao === true) {
+                  this.multipleSelection[i].checked_dailiao = 2
+                } else {
+                  this.multipleSelection[i].checked_dailiao = 1
+                }
+                if (this.checked_gaonandu === false) {
+                  this.checked_gaonandu = 0
+                } else {
+                  this.checked_gaonandu = 1
+                }
+                if (this.checked_baitu === false) {
+                  this.checked_baitu = 0
+                } else {
+                  this.checked_baitu = 1
+                }
+                production2(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu).then(response => {
+                  this.result += parseInt(response.data[0].result)
+                  if (this.result === this.multipleSelection.length) {
+                    this.$message.success('投产成功')
+                    this.total = 0
+                    this.pageList = 1
+                    this.getTable()
+                    this.checked_baitu = false
+                    this.checked_gaonandu = false
+                    this.tableData1 = []
+                    this.listLoading3 = false
+                  } else if (response.data[0].result === '0') {
+                    this.listLoading3 = false
+                    this.$message.error('投产失败')
+                  }
+                })
+                this.shijiancuo1 = 0
+                this.shijiancuo = 0
+                this.jieguo = 0
+              }
+            } else {
+              this.listLoading3 = true
+              for (let i = 0; i < this.multipleSelection.length; i++) {
+                if (this.multipleSelection[i].checked_waixie === false) {
+                  this.multipleSelection[i].checked_waixie = 1
+                } else {
+                  this.multipleSelection[i].checked_waixie = 2
+                }
+                if (this.multipleSelection[i].checked_zhaoji === false) {
+                  this.multipleSelection[i].checked_zhaoji = 0
+                } else {
+                  this.multipleSelection[i].checked_zhaoji = 1
+                }
+                if (this.multipleSelection[i].checked_dailiao === true) {
+                  this.multipleSelection[i].checked_dailiao = 2
+                } else {
+                  this.multipleSelection[i].checked_dailiao = 1
+                }
+                if (this.checked_gaonandu === false) {
+                  this.checked_gaonandu = 0
+                } else {
+                  this.checked_gaonandu = 1
+                }
+                if (this.checked_baitu === false) {
+                  this.checked_baitu = 0
+                } else {
+                  this.checked_baitu = 1
+                }
+                production(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu).then(response => {
+                  this.result += parseInt(response.data[0].result)
+                  if (this.result === this.multipleSelection.length) {
+                    this.$message.success('投产成功')
+                    this.total = 0
+                    this.pageList = 1
+                    this.getTable()
+                    this.checked_baitu = false
+                    this.checked_gaonandu = false
+                    this.tableData1 = []
+                    this.listLoading3 = false
+                  } else if (response.data[0].result === '0') {
+                    this.listLoading3 = false
+                    this.$message.error('投产失败')
+                  }
+                })
+                this.shijiancuo1 = 0
+                this.shijiancuo = 0
+                this.jieguo = 0
+              }
             }
           }
         }
diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
index 7f13feea..8a3308e0 100644
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -93,75 +93,77 @@
           @current-change="handleCurrentChange"/>
       </div>
     </el-card>
-    <el-card v-if="tableData2.length">
+    <el-card>
       <div slot="header">
         <el-button v-show="true" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>
       </div>
-      <table class="tg">
-        <tr>
-          <td class="tg-x61c" colspan="4" rowspan="2">江苏高精</td>
-          <td class="tg-c3ow" colspan="2" rowspan="2">零件条码</td>
-          <td class="tg-c3ow" colspan="3">零件图号</td>
-          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件图号 : '' }}</td>
-          <td class="tg-c3ow">数量</td>
-        </tr>
-        <tr>
-          <td class="tg-c3ow" colspan="3">零件名称</td>
-          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件名称 : '' }}</td>
-          <td class="tg-c3ow" rowspan="3">{{ tableData2[0] ? tableData2[0].投产数量 : '' }}</td>
-        </tr>
-        <tr>
-          <td class="tg-c3ow" colspan="2">项目名称</td>
-          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].项目名称 : '' }}</td>
-          <td class="tg-c3ow" colspan="2" rowspan="2">{{ tableData2[0] ? 'P' + tableData2[0].工艺计划流水号 : '' }}</td>
-          <td class="tg-c3ow" colspan="3">机床</td>
-          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机床图号 : '' }}</td>
-        </tr>
-        <tr>
-          <td class="tg-c3ow">材质</td>
-          <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].材料 : '' }}</td>
-          <td class="tg-c3ow">规格</td>
-          <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].原材料规格 : '' }}</td>
-          <td class="tg-c3ow" colspan="3">组号</td>
-          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].组号 : '' }}</td>
-        </tr>
-        <tr>
-          <td class="tg-c3ow">序次</td>
-          <td class="tg-c3ow">工艺名称</td>
-          <td class="tg-c3ow" colspan="3">工艺要求</td>
-          <td class="tg-c3ow">难度系数</td>
-          <td class="tg-c3ow">工作者</td>
-          <td class="tg-c3ow">单件</td>
-          <td class="tg-c3ow">准结</td>
-          <td class="tg-c3ow">检查结果</td>
-          <td class="tg-c3ow">计划完成日期</td>
-          <td class="tg-c3ow">工序条码</td>
-        </tr>
-        <tr v-for="(value,key) in tableData2" :id="key" :key="key">
-          <td class="tg-c3ow">{{ key + 1 }}</td>
-          <td class="tg-c3ow">{{ value.工艺名称 }}</td>
-          <td class="tg-c3ow" colspan="3">{{ value.工艺要求 }}</td>
-          <td class="tg-c3ow">{{ value.工艺难度等级 }}</td>
-          <td class="tg-c3ow"/>
-          <td class="tg-c3ow">{{ value.单件定额工时 }}</td>
-          <td class="tg-c3ow">{{ value.准结定额工时 }}</td>
-          <td class="tg-c3ow"/>
-          <td class="tg-c3ow">{{ value.计划日期 }}</td>
-          <td class="tg-c3ow">{{ value.工序流水号 }}</td>
-        </tr>
-        <tr>
-          <td class="tg-c3ow">工艺员</td>
-          <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].工艺员 : '' }}</td>
-          <td class="tg-c3ow">定额员</td>
-          <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].定额员 : '' }}</td>
-          <td class="tg-c3ow">工艺完成</td>
-          <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }}</td>
-          <td class="tg-c3ow">加工开始</td>
-          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工开始时间 : '' }}</td>
-          <td class="tg-c3ow">加工结束</td>
-          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工结束时间 : '' }}</td>
-        </tr>
-      </table>
+      <div v-if="tableData2.length">
+        <table class="tg">
+          <tr>
+            <td class="tg-x61c" colspan="4" rowspan="2">江苏高精</td>
+            <td class="tg-c3ow" colspan="2" rowspan="2">零件条码</td>
+            <td class="tg-c3ow" colspan="3">零件图号</td>
+            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件图号 : '' }}</td>
+            <td class="tg-c3ow">数量</td>
+          </tr>
+          <tr>
+            <td class="tg-c3ow" colspan="3">零件名称</td>
+            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件名称 : '' }}</td>
+            <td class="tg-c3ow" rowspan="3">{{ tableData2[0] ? tableData2[0].投产数量 : '' }}</td>
+          </tr>
+          <tr>
+            <td class="tg-c3ow" colspan="2">项目名称</td>
+            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].项目名称 : '' }}</td>
+            <td class="tg-c3ow" colspan="2" rowspan="2">{{ tableData2[0] ? 'P' + tableData2[0].工艺计划流水号 : '' }}</td>
+            <td class="tg-c3ow" colspan="3">机床</td>
+            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机床图号 : '' }}</td>
+          </tr>
+          <tr>
+            <td class="tg-c3ow">材质</td>
+            <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].材料 : '' }}</td>
+            <td class="tg-c3ow">规格</td>
+            <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].原材料规格 : '' }}</td>
+            <td class="tg-c3ow" colspan="3">组号</td>
+            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].组号 : '' }}</td>
+          </tr>
+          <tr>
+            <td class="tg-c3ow">序次</td>
+            <td class="tg-c3ow">工艺名称</td>
+            <td class="tg-c3ow" colspan="3">工艺要求</td>
+            <td class="tg-c3ow">难度系数</td>
+            <td class="tg-c3ow">工作者</td>
+            <td class="tg-c3ow">单件</td>
+            <td class="tg-c3ow">准结</td>
+            <td class="tg-c3ow">检查结果</td>
+            <td class="tg-c3ow">计划完成日期</td>
+            <td class="tg-c3ow">工序条码</td>
+          </tr>
+          <tr v-for="(value,key) in tableData2" :id="key" :key="key">
+            <td class="tg-c3ow">{{ key + 1 }}</td>
+            <td class="tg-c3ow">{{ value.工艺名称 }}</td>
+            <td class="tg-c3ow" colspan="3">{{ value.工艺要求 }}</td>
+            <td class="tg-c3ow">{{ value.工艺难度等级 }}</td>
+            <td class="tg-c3ow"/>
+            <td class="tg-c3ow">{{ value.单件定额工时 }}</td>
+            <td class="tg-c3ow">{{ value.准结定额工时 }}</td>
+            <td class="tg-c3ow"/>
+            <td class="tg-c3ow">{{ value.计划日期 }}</td>
+            <td class="tg-c3ow">{{ value.工序流水号 }}</td>
+          </tr>
+          <tr>
+            <td class="tg-c3ow">工艺员</td>
+            <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].工艺员 : '' }}</td>
+            <td class="tg-c3ow">定额员</td>
+            <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].定额员 : '' }}</td>
+            <td class="tg-c3ow">工艺完成</td>
+            <td class="tg-c3ow">{{ tableData2[0].工艺实际完成时间 ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }}</td>
+            <td class="tg-c3ow">加工开始</td>
+            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工开始时间 : '' }}</td>
+            <td class="tg-c3ow">加工结束</td>
+            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工结束时间 : '' }}</td>
+          </tr>
+        </table>
+      </div>
     </el-card>
   </div>
 </template>
@@ -173,6 +175,7 @@ import { initMachineProject, searchgroup, initPerson, search, searchtable1,
 export default {
   data() {
     return {
+      partNumValue: '',
       machineNumberValue: '',
       machineNumber: [],
       groupNumberValue: '',
diff --git a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
index 187e0364..ed6bdd7f 100644
--- a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
@@ -63,18 +63,17 @@
             </el-select>
           </el-col>
 
-          <el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="20">
+          <el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="15">
             <span>直径:</span>
             <el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
             <span>长度:</span>
             <el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
-            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量
-            </el-button>
+            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量</el-button>
             <span>重量:</span>
             <el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
               <el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
             </el-input>
-            <!--<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="insertThestring()">计算重量</el-button>-->
+            <el-button style="margin-left: 10px;" type="primary" size="small" @click="insertThestring()">合并生产</el-button>
           </el-col>
 
           <el-col v-show="materielValue==='2'||materielValue==='9'||materielValue==='10'||materielValue==='11'" :span="20">
diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue
index 83014f1a..c2c4da9f 100644
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -476,7 +476,7 @@ export default {
                 return Number(prev)
               }
             }, 0)
-            sums[index] += ' 元(含税)'
+            sums[index] += ' 万元(含税)'
           } else {
             sums[index] = 'N/A'
           }
@@ -484,10 +484,10 @@ export default {
           sums[index] = this.taxRate * 100 + '% (税率)'
           return
         } else if (index === 9) {
-          sums[index] = (parseInt(sums[7]) * 100 * this.taxRate) / 100 + ' 万元(税额)'
+          sums[index] = (parseFloat(sums[7]) - (parseFloat(sums[7]) / (1 + parseFloat(sums[8]) / 100)).toFixed(2)).toFixed(2) + ' 万元(税额)'
           return
         } else if (index === 10) {
-          sums[index] = parseFloat(sums[7]) - parseFloat(sums[9]) + ' 万元(未税)'
+          sums[index] = (parseFloat(sums[7]) / (1 + parseFloat(sums[8]) / 100)).toFixed(2) + ' 万元(未税)'
           return
         }
       })
diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue
index c7a33ef5..550df1b7 100644
--- a/src/views/TechnologyCenter/ImportParts/index.vue
+++ b/src/views/TechnologyCenter/ImportParts/index.vue
@@ -20,6 +20,7 @@
                 :label="item.label"
                 :value="item.value"/>
             </el-select>
+            <el-button type="primary" size="small" @click="opendialogVisibleMachine()">上传总图</el-button>
           </div>
           <upload-excel-component @on-selected-file="selected"/>
         </div>
@@ -44,6 +45,50 @@
     <!--<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>-->
     <!--<div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>-->
     <!--</el-upload>-->
+    <el-dialog
+      :visible.sync="dialogVisibleMachine"
+      width="30%">
+      <el-card>
+        <el-select v-model="machineDrawValue" clearable filterable size="small" placeholder="机床名称" @change="changeMachine">
+          <el-option
+            v-for="item in machineDraw"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <div style="float: right;">
+          <el-upload
+            :disabled="disabledMachine"
+            :action="action"
+            :on-success="uploadSuccess"
+            :on-error="uploadFailure"
+            :show-file-list="showFileList"
+            :file-list="fileList"
+            class="upload-demo"
+            multiple>
+            <el-button :disabled="disabledMachine" size="small" type="primary">点击上传</el-button>
+          </el-upload>
+        </div>
+      </el-card>
+      <el-card>
+        <div v-for="(file, key) in hadFile" :key="key">
+          <div class="wrapper">
+            <div class="content">
+              <div class="action">
+                <a class="delete" @click="deleteFileData(file.id)">删除</a>
+              </div>
+              <div v-if="file.suffix==='pdf'" class="icon"><svg-icon icon-class="pdf" /></div>
+              <div v-else-if="file.suffix==='docx'||file.suffix === 'doc'" class="icon"><svg-icon icon-class="doc" /></div>
+              <div v-else-if="file.suffix==='xlsx' || file.suffix === 'xls'" class="icon"><svg-icon icon-class="excel" /></div>
+              <div v-else-if="file.suffix==='pptx' || file.suffix === 'ppt'" class="icon"><svg-icon icon-class="ppt" /></div>
+              <div v-else-if="file.suffix==='jpg' || file.suffix === 'jpeg'|| file.suffix === 'png'" class="icon"><svg-icon icon-class="pic" /></div>
+              <div v-else class="icon"><svg-icon icon-class="file" /></div>
+              <a :href="file.url"><div class="info">{{ file.name }}</div></a>
+            </div>
+          </div>
+        </div>
+      </el-card>
+    </el-dialog>
   </div>
 </template>
 
@@ -51,13 +96,22 @@
 import UploadExcelComponent from './UploadExcel/index.vue'
 import specificationData from './specificationData'
 import { sleep } from '../../../utils/tool'
-import { initProject, isExit, isExit1, importBasics, importPurcharse, searchMachine, searchGroupNum } from '../../../api/TechnologyCenter/ImportParts'
-
+import { initProject, isExit, isExit1, importBasics, importPurcharse, searchMachine, searchGroupNum, machineSelect, getFileData, deleteFileData } from '../../../api/TechnologyCenter/ImportParts'
+import { uploadFileMachine, downloadFileMachine } from '@/utils/request'
 export default {
   name: 'UploadExcel',
   components: { UploadExcelComponent, specificationData },
   data() {
     return {
+      fileList: [],
+      hadFile: [],
+      showFileList: true,
+      projectId: '',
+      action: '',
+      disabledMachine: true,
+      machineDrawValue: '',
+      machineDraw: [],
+      dialogVisibleMachine: false,
       project: [],
       projectValue: '',
       worksheet: [],
@@ -108,6 +162,57 @@ export default {
     this.fetchData()
   },
   methods: {
+    opendialogVisibleMachine() {
+      this.machineDraw = []
+      this.machineDrawValue = ''
+      this.dialogVisibleMachine = true
+      this.machineDrawValue === '' ? this.disabledMachine = true : this.disabledMachine = false
+      this.getSelect(machineSelect, ['机床图号', '机床流水号'], 'machineDraw', this.projectValue)
+    },
+    changeMachine() {
+      this.machineDrawValue === '' ? this.disabledMachine = true : this.disabledMachine = false
+      this.action = `${uploadFileMachine}?&MachineNum=${this.machineDrawValue}`
+      this.getFileData(this.machineDrawValue)
+      console.log(this.action)
+    },
+    uploadSuccess(res, file, fileList) {
+      if (res[0].result === '1') {
+        const index = fileList.indexOf(file)
+        fileList.splice(index, 1)
+      } else {
+        this.$message.error(`${file.name}文件上传失败，请检查上传文件是否正确！`)
+      }
+      if (fileList.length === 0) {
+        this.$message.success('文件上传成功')
+        this.getFileData(this.machineDrawValue)
+      }
+    },
+    uploadFailure(a, file, fileList) {
+      fileList.map(file => {
+        this.$message.error(`${file.name}文件上传失败，请检查上传文件是否正确！`)
+      })
+    },
+    // 在什么情况下需要查询上传的附件，调用this.getFileData()即可根据
+    getFileData(machineDrawValue) {
+      console.log(machineDrawValue, 88)
+      this.hadFile = []
+      getFileData(machineDrawValue).then(res => {
+        console.log(res)
+        if (res.data.length > 0) {
+          res.data.map(item => {
+            this.hadFile.push({
+              url: `${downloadFileMachine}?id=${item.文件标识}.${item.文件后缀}&name=${item.文件名称}.${item.文件后缀}`,
+              name: `${item.文件名称}.${item.文件后缀}`,
+              suffix: item.文件后缀,
+              id: item.文件标识
+            })
+          })
+        }
+      })
+    },
+    deleteFileData(id) {
+      this.deleteRow(deleteFileData, id, function() { this.getFileData(this.machineDrawValue) })
+    },
     async test() {
       await sleep(10000)
       console.log(1)
@@ -339,8 +444,52 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+/*.wrapper{*/
+  /*width: 100%;*/
+  /*margin: 0 auto;*/
+/*}*/
 .wrapper{
-  width: 100%;
-  margin: 0 auto;
+  width: 225px;
+  height: 50px;
+  overflow: hidden;
+  border: 1px solid #b8c7d9;
+  float: left;
+  margin: 10px;
 }
-</style>
+.content{
+  position: relative;
+  padding: 8px 8px 0 8px;
+}
+.action{
+  position: absolute;
+  top: 4px;
+  right: 8px;
+}
+.delete{
+  padding: 0 5px;
+  border-radius: 3px;
+  color: #0f84b0;
+  font-size: 12px;
+}
+.delete:hover{
+  background: -webkit-linear-gradient(top,#0ba9e3,#0099d3);
+  color: #fff;
+}
+a{
+  text-decoration: none;
+}
+.icon{
+  width: 30px;
+  height: 30px;
+  display: inline-block;
+  margin-right: 7px;
+  margin-top: 2px;
+  font-size: 26px;
+}
+.info{
+  position: absolute;
+  left: 44px;
+  line-height: 30px;
+  display: inline-block;
+  color: #999;
+}</style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index e9fcb8c8..2c4b00bb 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -13,8 +13,8 @@
             主页
           </el-dropdown-item>
         </router-link>
-        <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">退出</span>
+        <el-dropdown-item divided @click.native="logout">
+          <span style="display:block;">退出</span>
         </el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
diff --git a/src/views/layout/components/TagsView.vue b/src/views/layout/components/TagsView.vue
index e37ac230..f50704de 100644
--- a/src/views/layout/components/TagsView.vue
+++ b/src/views/layout/components/TagsView.vue
@@ -7,6 +7,7 @@
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
+      <li @click="refreshSelectedTag(selectedTag)">重新加载</li>
       <li @click="closeSelectedTag(selectedTag)">关闭当前</li>
       <li @click="closeOthersTags">关闭其他</li>
       <li @click="closeAllTags">关闭全部</li>
@@ -20,6 +21,7 @@ import Cookies from 'js-cookie'
 
 export default {
   components: { ScrollPane },
+  inject: ['reload'],
   data() {
     return {
       visible: false,
@@ -78,6 +80,11 @@ export default {
         }
       })
     },
+    refreshSelectedTag() {
+      this.$nextTick(() => {
+        this.reload() // 2019.6.2 cjn
+      })
+    },
     closeSelectedTag(view) {
       this.$store.dispatch('delVisitedViews', view).then((views) => {
         if (this.isActive(view)) {