diff --git a/debug.log b/debug.log
index cf7df822..af455d92 100644
--- a/debug.log
+++ b/debug.log
@@ -1,2 +1,3 @@
 [0301/083149.303:ERROR:http_transport_win.cc(273)] WinHttpSendRequest: 操作成功完成。 (0x0)
 [0515/102246.688:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: 操作成功完成。 (0x0)
+[0531/081503.881:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: 操作成功完成。 (0x0)
diff --git a/src/api/ManufacturingCenter/CreateIntakeList.js b/src/api/ManufacturingCenter/CreateIntakeList.js
new file mode 100644
index 00000000..30f32faa
--- /dev/null
+++ b/src/api/ManufacturingCenter/CreateIntakeList.js
@@ -0,0 +1,187 @@
+import request from '@/utils/request'
+
+// 鍒濆鍖栭」鐩�
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_椤圭洰鍚嶇О_鏌ヨ鏁版嵁_鎸夋椂闂存帓搴�'
+    }
+  })
+}
+// 鏈哄簥鏌ヨ
+export function searchmachine(check, num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_鏈哄簥鍚嶇О_鏌ヨ鏁版嵁',
+      param: '椤圭洰娴佹按鍙穇check=' + check + '=int&椤圭洰娴佹按鍙�=' + num
+    }
+  })
+}
+// 鍒嗙粍鏌ヨ
+export function searchTeam(machineNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_缁勪欢鍚嶇О_鏌ヨ鏁版嵁',
+      param: '鏈哄簥娴佹按鍙�=' + machineNumber
+    }
+  })
+}
+// 澶栬喘浠躲�佹爣鍑嗕欢鏌ヨ
+export function searchPurchasePart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '搴撳瓨绠＄悊_澶栬喘浠跺嚭搴揰闆朵欢鏌ヨ',
+      param: '椤圭洰娴佹按鍙穇check=' + project_check + '&椤圭洰娴佹按鍙�=' + project + '&鏈哄簥娴佹按鍙穇check=' + machine_check + '&鏈哄簥娴佹按鍙�=' + machine + '&缁勪欢娴佹按鍙穇check=' + group_check + '&缁勪欢娴佹按鍙�=' + group,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 鍩烘湰浠躲�侀�氱敤浠舵煡璇�
+export function searchBasicPart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '搴撳瓨绠＄悊_鍩烘湰浠跺嚭搴揰闆朵欢鏌ヨ',
+      param: '椤圭洰娴佹按鍙穇check=' + project_check + '&椤圭洰娴佹按鍙�=' + project + '&鏈哄簥娴佹按鍙穇check=' + machine_check + '&鏈哄簥娴佹按鍙�=' + machine + '&缁勪欢娴佹按鍙穇check=' + group_check + '&缁勪欢娴佹按鍙�=' + group,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 杞﹂棿閲囪喘浠舵煡璇�
+export function searchHoursePart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '搴撳瓨绠＄悊_杞﹂棿閲囪喘鍑哄簱_闆朵欢鏌ヨ',
+      param: '椤圭洰娴佹按鍙穇check=' + project_check + '&椤圭洰娴佹按鍙�=' + project + '&鏈哄簥娴佹按鍙穇check=' + machine_check + '&鏈哄簥娴佹按鍙�=' + machine + '&缁勪欢娴佹按鍙穇check=' + group_check + '&缁勪欢娴佹按鍙�=' + group,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 棰嗘枡鍗曟煡璇�
+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(listNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '杞﹂棿瑁呴厤绠＄悊_棰嗘枡鍗昣棰嗘枡鍗曟槑缁嗘煡璇�',
+      param: '棰嗘枡鍗曟祦姘村彿=' + listNumber
+    }
+  })
+}
+// 鍒涘缓棰嗘枡鍗�
+export function addList(peopleNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '杞﹂棿瑁呴厤绠＄悊_棰嗘枡鍗昣棰嗘枡鍗曞鍔�',
+      param: '棰嗘枡浜烘祦姘村彿=' + peopleNumber
+    }
+  })
+}
+// 鍒犻櫎棰嗘枡鍗�
+export function dropList(PickingListNumberx) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '杞﹂棿瑁呴厤绠＄悊_棰嗘枡鍗昣棰嗘枡鍗曞垹闄�',
+      param: '棰嗘枡鍗曟祦姘村彿=' + PickingListNumberx
+    }
+  })
+}
+// 鍒犻櫎棰嗘枡鍗曟槑缁�
+export function dropListDetail(DetailNumberx, isBacklog) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '杞﹂棿瑁呴厤绠＄悊_棰嗘枡鍗昣棰嗘枡鍗曟槑缁嗗垹闄�',
+      param: '棰嗘枡鍗曟槑缁嗘祦姘村彿=' + DetailNumberx + '&鏄惁鏄粸璐�=' + isBacklog
+    }
+  })
+}
+// 鍒犻櫎棰嗘枡鍗曟槑缁�/鍩烘湰浠�
+export function dropListDetailBasic(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '杞﹂棿瑁呴厤绠＄悊_棰嗘枡鍗昣棰嗘枡鍗曟槑缁嗗垹闄鍩烘湰浠�',
+      param: `棰嗘枡鍗曟槑缁嗘祦姘村彿=${params[0]}&鏀朵欢淇℃伅ID=${params[1]}&杩旇繕鏁伴噺=${params[2]}`
+    }
+  })
+}
+// 澧炲姞棰嗘枡鍗曟槑缁�
+export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, outNumber, partType, Note, data1, data2, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '杞﹂棿瑁呴厤绠＄悊_棰嗘枡鍗昣棰嗘枡鍗曟槑缁嗗鍔�',
+      param: '棰嗘枡鍗曟祦姘村彿=' + PickingListNumberx + '&椤圭洰娴佹按鍙�=' + projectnumber + '&鏈哄簥娴佹按鍙�=' + machinenumber + '&缁勪欢娴佹按鍙�=' + teamNumber + '&鍑哄簱鏁伴噺=' + outNumber + '&闆朵欢绫诲瀷=' + partType + '&澶囨敞\\=' + Note + '&宸ヨ壓璁″垝娴佹按鍙�=' + data1 + '&鏀朵欢淇℃伅ID=' + data2 + '&閲囪喘鍚堝悓鏄庣粏娴佹按鍙�=' + data4 + '&璇疯喘鍗曟槑缁嗘祦姘村彿=' + data5 + '&璐т綅娴佹按鍙�=' + data6 + '&鍑哄簱绫诲瀷=' + data7 + '&鐗╂枡涓庤揣浣嶅鐓ф祦姘村彿=' + data8 + '&鍚嶇О=' + data9 + '&鐗╂枡瑙勬牸\\=' + data10 + '&鐗╂枡鍨嬪彿=' + data11 + '&闆朵欢鍥惧彿=' + data12 + '&鏉愭枡=' + data13
+    }
+  })
+}
+// 鏌ヨ婊炶揣浠�
+export function searchBacklogPart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '閲囪喘绠＄悊_婊炶揣浠堕鏂檁鏌ヨ鏁版嵁',
+      param: '椤圭洰娴佹按鍙穇check=' + project_check + '&椤圭洰娴佹按鍙�=' + project + '&鏈哄簥娴佹按鍙穇check=' + machine_check + '&鏈哄簥娴佹按鍙�=' + machine + '&缁勪欢娴佹按鍙穇check=' + group_check + '&缁勪欢娴佹按鍙�=' + group,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 棰嗘枡婊炶揣浠�
+export function submitAddBacklogList(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    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]}`
+    }
+  })
+}
diff --git a/src/api/ManufacturingCenter/MaterialArrivalManagement.js b/src/api/ManufacturingCenter/MaterialArrivalManagement.js
index b7bb4a4f..5c7cf3b6 100644
--- a/src/api/ManufacturingCenter/MaterialArrivalManagement.js
+++ b/src/api/ManufacturingCenter/MaterialArrivalManagement.js
@@ -1,5 +1,17 @@
 import request from '@/utils/request'
 
+// 澶栬喘澶囨枡鍑哄簱
+export function change3(Number, code, num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '杞﹂棿鐢熶骇绠＄悊宸ヨ壓_鑷澶囨枡鍒拌揣鏇存敼',
+      param: '宸ュ簭娴佹按鍙风粍=' + Number + '&宸ヤ綔鑰呰�冨嫟缂栧彿=' + code + '&宸ヨ壓璁″垝娴佹按鍙风粍=' + num
+    }
+  })
+}
 // 鏌ヨ闆朵欢
 export function searchtable(num1, num2, num3, pageCurrent, pageSize) {
   return request({
diff --git a/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js b/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js
index 7a4fa413..6867c148 100644
--- a/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js
+++ b/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js
@@ -1,5 +1,29 @@
 import request from '@/utils/request'
 
+// 鏌ヨ闆朵欢鏈紪鍒讹紙鍖呭惈鍊熺敤浠讹級
+export function getPartnames3(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '杞﹂棿鐢熶骇绠＄悊宸ヨ壓_闆朵欢宸ヨ壓璁″垝_缂栧埗宸ヨ壓_鎸変汉鍛樻満搴婄粍鍙锋垨鍥惧彿鏌�',
+      param: '宸ヨ壓浜哄憳缂栧彿=' + num1 + '&鏈哄簥缁勫彿鎴栧浘鍙�=' + num2
+    }
+  })
+}
+// 鏌ヨ闆朵欢宸茬紪鍒讹紙鍖呭惈鍊熺敤浠讹級
+export function getPartnames4(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '杞﹂棿鐢熶骇绠＄悊宸ヨ壓_闆朵欢宸ヨ壓璁″垝_鏌ヨ宸插畬鎴愬伐鑹哄埗瀹氶浂浠禵鎸変汉鍛樻満搴婄粍鍙锋垨鍥惧彿鏌�',
+      param: '宸ヨ壓浜哄憳缂栧彿=' + num1 + '&鏈哄簥缁勫彿鎴栧浘鍙�=' + num2
+    }
+  })
+}
 // 鍏歌壓鏌ヨ<楂樼簿鍘熸湁鏁版嵁>
 export function searchProcess11(num) {
   return request({
@@ -479,3 +503,15 @@ export function TableAddLi(a, b, c, num0, num1) {
     }
   })
 }
+// 淇敼澶囨敞
+export function modifyRemark(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '杞﹂棿鐢熶骇绠＄悊宸ヨ壓_闆朵欢宸ヨ壓璁″垝_宸ヨ壓淇敼璁板綍_澧炲姞鏁版嵁',
+      param: `淇敼浜哄憳缂栧彿=${params[0]}&淇敼澶囨敞=${params[1]}&宸ヨ壓璁″垝娴佹按鍙�=${params[2]}`
+    }
+  })
+}
diff --git a/src/api/ManufacturingCenter/SparePartsOut.js b/src/api/ManufacturingCenter/SparePartsOut.js
new file mode 100644
index 00000000..b7bb4a4f
--- /dev/null
+++ b/src/api/ManufacturingCenter/SparePartsOut.js
@@ -0,0 +1,88 @@
+import request from '@/utils/request'
+
+// 鏌ヨ闆朵欢
+export function searchtable(num1, num2, num3, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '杞﹂棿鐢熶骇绠＄悊宸ヨ壓_闆朵欢宸ヨ壓璁″垝_缂栧埗宸ヨ壓_澶囨枡鍒拌揣鏌ヨ',
+      param: '闆朵欢鍥惧彿_check=' + num1 + '&闆朵欢鍥惧彿=' + num2 + '&澶囨枡鍒拌揣_check=' + num3,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 鏌ヨ闆朵欢宸ヨ壓
+export function searchtable2(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '杞﹂棿鐢熶骇绠＄悊宸ヨ壓_澶囨枡鎵撳嵃_鏌ヨ宸ュ簭淇℃伅',
+      param: '宸ヨ壓璁″垝娴佹按鍙�=' + num1
+    }
+  })
+}
+// 瀹屾垚澶囨枡宸ュ簭
+export function handlechange(Number, code) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '杞﹂棿鐢熶骇绠＄悊宸ヨ壓_闆朵欢宸ュ簭_淇敼鏁版嵁_宸ヤ綔鑰�',
+      param: '宸ュ簭娴佹按鍙�=' + Number + '&宸ヤ綔鑰呰�冨嫟缂栧彿=' + code
+    }
+  })
+}
+// 鏌ヨ澶栬喘澶囨枡闆朵欢
+export function searchtable3(num, num1, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '澶囨枡绠＄悊_澶栬喘澶囨枡鏌ヨ',
+      param: '闆朵欢鍥惧彿_check=' + num + '&闆朵欢鍥惧彿=' + num1,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 鑷澶囨枡鍑哄簱
+export function change(Number, code, num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '杞﹂棿鐢熶骇绠＄悊宸ヨ壓_澶囨枡鍒拌揣_鐘舵�佹洿鏀�',
+      param: '宸ヨ壓璁″垝娴佹按鍙�=' + Number + '&閲嶉噺=' + code + '&鍗曚环=' + num
+    }
+  })
+}
+// 澶栬喘澶囨枡鍑哄簱
+export function change2(Number, code, num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '杞﹂棿鐢熶骇绠＄悊宸ヨ壓_澶栬喘澶囨枡鍒拌揣鏇存敼',
+      param: '宸ュ簭娴佹按鍙风粍=' + Number + '&宸ヤ綔鑰呰�冨嫟缂栧彿=' + code + '&宸ヨ壓璁″垝娴佹按鍙风粍=' + num
+    }
+  })
+}
+export function handlechange2(Number, code) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '杞﹂棿鐢熶骇绠＄悊宸ヨ壓_闆朵欢宸ュ簭_淇敼鏁版嵁_淇敼瀹為檯瀹屾垚鏃堕棿',
+      param: '宸ュ簭娴佹按鍙�=' + Number + '&瀹為檯瀹屾垚鏃堕棿=' + code
+    }
+  })
+}
+
diff --git a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
index 198c845e..8504236a 100644
--- a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
+++ b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
@@ -1,5 +1,32 @@
 import request from '@/utils/request'
 
+// 鏌ヨ鍘熸潗鏂欏簱瀛�
+export function searchRawMaterial(num, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '搴撳瓨绠＄悊_鍘熸潗鏂欏簱瀛樼鐞哶鏌ヨ',
+      param: '鍘熸潗鏂欏悕绉�=' + num,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 澧炲姞閲囪喘璁″垝鏄庣粏
+export function addMateriel2(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '澶囨枡绠＄悊_閲囪喘璁″垝鏄庣粏_澧炲姞鏁版嵁2',
+      param: `閲囪喘璁″垝娴佹按鍙�=${num1}&鍘熸潗鏂欐祦姘村彿缁�=${num2}`
+    }
+  })
+}
+// ////////////////////////////////////////////////////////////////////////////////0529鏂板姞鈫�
+
 // 鏌ヨ澶栬喘澶囨枡鍒楄〃
 export function initPartDrawing(check1, name) {
   return request({
diff --git a/src/views/ManufacturingCenter/CreateIntakeList/index.vue b/src/views/ManufacturingCenter/CreateIntakeList/index.vue
new file mode 100644
index 00000000..b82b79d0
--- /dev/null
+++ b/src/views/ManufacturingCenter/CreateIntakeList/index.vue
@@ -0,0 +1,1139 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <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="searchListinfor()">鏌ヨ</el-button>
+      <el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="addListinfor()">鍒涘缓</el-button>
+    </el-card>
+
+    <el-card>
+      <el-table v-loading="listLoading0" :data="tableData1" highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="chooseListinfor">
+        <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>
+      <div class="block" style="margin: 10px 0;">
+        <el-pagination
+          :current-page="PageCurrent0"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="PageSize0"
+          :total="total0"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange0"
+          @current-change="handleCurrentChange0"/>
+      </div>
+      <el-table :data="tableDataPicking" 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="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="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.璐т綅鍚嶇О }}
+          </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 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-card>
+      <span>椤圭洰鍚嶇О:</span>
+      <el-select v-model="ProjectValue" filterable clearable size="small" placeholder="璇烽�夋嫨椤圭洰鍚嶇О" style="width: 200px;margin-right:10px" @change="searchMachine()">
+        <el-option
+          v-for="item in Project"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span>鏈哄簥鍥惧彿:</span>
+      <el-select v-model="MachineValue" filterable clearable size="small" placeholder="鏈哄簥鍥惧彿" style="width: 200px;margin-right:10px" @change="searchGroupList()">
+        <el-option
+          v-for="item in Machine"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span>缁勫彿:</span>
+      <el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="缁勫彿" style="width: 200px">
+        <el-option
+          v-for="item in GroupNum"
+          :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="searchPartinfo()">鏌ヨ</el-button>
+    </el-card>
+
+    <el-card>
+      <h4>鑷埗浠�</h4>
+      <el-table v-loading="listLoading1" :data="tableDataBasic" border style="width: 100%;" size="mini" height="440">
+        <el-table-column label="搴忓彿" align="center" type="index" width="50"/>
+        <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="80">
+          <template slot-scope="scope">
+            {{ scope.row.鏈哄簥鍥惧彿 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="缁勫彿" align="center" width="70">
+          <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 label="璁″垝鏁伴噺" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.鎵规鏁伴噺 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="搴撳瓨鏁伴噺" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.鍏ュ簱鏁伴噺 - scope.row.鍑哄簱鎬绘暟閲� }}
+          </template>
+        </el-table-column>
+        <el-table-column label="寰呭嚭搴撴暟閲�" align="center" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.寰呭嚭搴撴暟閲� }}
+          </template>
+        </el-table-column>
+        <el-table-column label="鍙嚭搴撴暟閲�" align="center" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.鍙嚭搴撴暟閲� = scope.row.鍏ュ簱鏁伴噺 - 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="80">
+          <template slot-scope="scope">
+            {{ scope.row.璐т綅鍚嶇О }}
+          </template>
+        </el-table-column>
+        <el-table-column label="闆朵欢鍥惧彿" align="center" min-width="80">
+          <template slot-scope="scope" align="center">
+            {{ scope.row.闆朵欢鍥惧彿 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="闆朵欢绫诲瀷" align="center" width="80">
+          <template slot-scope="scope" align="center">
+            {{ scope.row.闆朵欢绫诲瀷鍚嶇О }}
+          </template>
+        </el-table-column>
+        <el-table-column label="鎿嶄綔" align="center" width="100">
+          <template slot-scope="scope" align="center">
+            <el-button :disabled="scope.row.鍙嚭搴撴暟閲�===0" size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="addBasicList(scope.row)">棰嗘枡</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin: 10px 0;">
+        <el-pagination
+          :current-page="PageCurrent1"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="PageSize1"
+          :total="total1"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange1"
+          @current-change="handleCurrentChange1"/>
+      </div>
+      <hr>
+      <h4>閲囪喘閮ㄩ噰璐欢</h4>
+      <el-table v-loading="listLoading2" :data="tableDataPurchase" border style="width: 100%;" size="mini" height="440">
+        <el-table-column label="搴忓彿" align="center" type="index" width="50"/>
+        <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="150">
+          <template slot-scope="scope">
+            {{ scope.row.鐗╂枡瑙勬牸 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="鍥惧彿鎴栧瀷鍙�" align="center" min-width="120">
+          <template slot-scope="scope">
+            {{ scope.row.鐗╂枡鍨嬪彿 || 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" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.缁勫彿 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="閲囪喘鏁伴噺" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.鏁伴噺 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="浠撳簱鍚嶇О" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.浠撳簱鍚嶇О }}
+          </template>
+        </el-table-column>
+        <el-table-column label="璐т綅鍚嶇О" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.璐т綅鍚嶇О }}
+          </template>
+        </el-table-column>
+        <el-table-column label="璐т綅瀛橀噺" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.璐т綅瀛橀噺 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="寰呭嚭搴撴暟閲�" align="center" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.寰呭嚭搴撴暟閲� }}
+          </template>
+        </el-table-column>
+        <el-table-column label="鍙嚭搴撴暟閲�" align="center" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.鍙嚭搴撴暟閲� = scope.row.璐т綅瀛橀噺 - scope.row.寰呭嚭搴撴暟閲� }}
+          </template>
+        </el-table-column>
+        <el-table-column label="闆朵欢绫诲瀷" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.绫诲瀷鍚嶇О }}
+          </template>
+        </el-table-column>
+        <el-table-column label="鎿嶄綔" align="center" width="100">
+          <template slot-scope="scope" align="center">
+            <el-button :disabled="scope.row.鍙嚭搴撴暟閲�===0" size="mini" type="primary" icon="el-icon-edit" @click="addPurchaseList(scope.row)">棰嗘枡</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin: 10px 0;">
+        <el-pagination
+          :current-page="PageCurrent1"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="PageSize1"
+          :total="total1"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange1"
+          @current-change="handleCurrentChange1"/>
+      </div>
+      <hr>
+      <h4>鍙婊炶揣浠�</h4>
+      <el-table v-loading="listLoading3" :data="tableDataBacklog" border style="width: 100%;" size="mini" height="440">
+        <el-table-column label="搴忓彿" align="center" type="index" width="50"/>
+        <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="150">
+          <template slot-scope="scope">
+            {{ scope.row.鐗╂枡瑙勬牸 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="鍥惧彿鎴栧瀷鍙�" align="center" min-width="120">
+          <template slot-scope="scope">
+            {{ scope.row.鐗╂枡鍨嬪彿 || 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" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.缁勫彿 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="浠撳簱鍚嶇О" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.浠撳簱鍚嶇О }}
+          </template>
+        </el-table-column>
+        <el-table-column label="璐т綅鍚嶇О" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.璐т綅鍚嶇О }}
+          </template>
+        </el-table-column>
+        <el-table-column label="璐т綅瀛橀噺" align="center" width="120">
+          <template slot-scope="scope">
+            {{ scope.row.璐т綅浣欓噺 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="寰呭嚭搴撴暟閲�" align="center" width="120">
+          <template slot-scope="scope">
+            {{ scope.row.寰呭嚭搴撴暟閲� }}
+          </template>
+        </el-table-column>
+        <el-table-column label="鍙嚭搴撴暟閲�" align="center" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.鍙嚭搴撴暟閲� = scope.row.璐т綅浣欓噺 - scope.row.寰呭嚭搴撴暟閲� }}
+          </template>
+        </el-table-column>
+        <el-table-column label="鎿嶄綔" align="center" width="100">
+          <template slot-scope="scope" align="center">
+            <el-button :disabled="scope.row.鍙嚭搴撴暟閲�===0" size="mini" type="primary" icon="el-icon-edit" @click="addBacklogList(scope.row)">棰嗘枡</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <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>
+      <hr>
+      <h4>杞﹂棿閲囪喘浠�</h4>
+      <el-table v-loading="listLoading4" :data="tableDataHouse" border size="mini" style="width: 100%;" height="440">
+        <el-table-column label="搴忓彿" align="center" type="index" width="50"/>
+        <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="80">
+          <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 label="鏈哄簥鍥惧彿" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.鏈哄簥鍥惧彿 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="缁勫彿" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.缁勫彿 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="閲囪喘鏁伴噺" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.闆朵欢鏁伴噺 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="浠撳簱鍚嶇О" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.浠撳簱鍚嶇О }}
+          </template>
+        </el-table-column>
+        <el-table-column label="璐т綅鍚嶇О" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.璐т綅鍚嶇О }}
+          </template>
+        </el-table-column>
+        <el-table-column label="璐т綅瀛橀噺" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.璐т綅瀛橀噺 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="寰呭嚭搴撴暟閲�" align="center" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.寰呭嚭搴撴暟閲� }}
+          </template>
+        </el-table-column>
+        <el-table-column label="鍙嚭搴撴暟閲�" align="center" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.鍙嚭搴撴暟閲� = scope.row.璐т綅瀛橀噺 - scope.row.寰呭嚭搴撴暟閲� }}
+          </template>
+        </el-table-column>
+        <el-table-column label="闆朵欢绫诲瀷" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.绫诲瀷鍚嶇О }}
+          </template>
+        </el-table-column>
+        <el-table-column label="鎿嶄綔" align="center" width="100">
+          <template slot-scope="scope" align="center">
+            <el-button :disabled="scope.row.鍙嚭搴撴暟閲�===0" size="mini" type="primary" icon="el-icon-edit" @click="addWorkshopList(scope.row)">棰嗘枡</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin: 10px 0;">
+        <el-pagination
+          :current-page="PageCurrent4"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="PageSize4"
+          :total="total4"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange4"
+          @current-change="handleCurrentChange4"/>
+      </div>
+    </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="棰嗘枡鍗曞彿" label-width="100px" size="small">
+          <el-input v-model="pickingListNumber" size="small" placeholder="绌�" readonly style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="鍑哄簱鏁伴噺" prop="outNumber" label-width="100px" size="small">
+          <el-input-number v-model="form1.outNumber" :min="0" :max="enableOut" controls-position="right" style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="鍑哄簱澶囨敞" prop="outNote" label-width="100px">
+          <el-input v-model="form1.outNote" 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="submitAddBasicList()">纭� 瀹�</el-button>
+      </div>
+    </el-dialog>
+    <!--澶栬喘浠堕鏂欏璇濇-->
+    <el-dialog :visible.sync="dialogFormVisible2" title="澶栬喘浠舵爣鍑嗕欢棰嗘枡" center width="380px">
+      <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" class="demo-ruleForm">
+        <el-form-item label="棰嗘枡鍗曞彿" label-width="100px" size="small">
+          <el-input v-model="pickingListNumber" size="small" placeholder="绌�" readonly style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="鍑哄簱鏁伴噺" prop="outNumber" label-width="100px" size="small">
+          <el-input-number v-model="form2.outNumber" :min="0" :max="enableOut" controls-position="right" style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="鍑哄簱澶囨敞" prop="outNote" label-width="100px">
+          <el-input v-model="form2.outNote" size="small" placeholder="娉ㄦ槑棰嗘枡浜哄鍚�" style="width: 200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible2=false">鍙栨秷</el-button>
+        <el-button type="primary" @click="submitAddPurchaseList()">纭� 瀹�</el-button>
+      </div>
+    </el-dialog>
+    <!--婊炶揣浠堕鏂欏璇濇-->
+    <el-dialog :visible.sync="dialogFormVisible3" title="婊炶揣浠堕鏂�" center width="380px">
+      <el-form ref="form3" :model="form3" :rules="rules3" label-position="left" class="demo-ruleForm">
+        <el-form-item label="棰嗘枡鍗曞彿" label-width="100px" size="small">
+          <el-input v-model="pickingListNumber" size="small" placeholder="绌�" readonly style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="鍑哄簱鏁伴噺" prop="outNumber" label-width="100px" size="small">
+          <el-input-number v-model="form3.outNumber" :min="0" :max="enableOut" controls-position="right" style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="鍑哄簱澶囨敞" prop="outNote" label-width="100px">
+          <el-input v-model="form3.outNote" size="small" placeholder="娉ㄦ槑棰嗘枡浜哄鍚�" style="width: 200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible3=false">鍙栨秷</el-button>
+        <el-button type="primary" @click="submitAddBacklogList()">纭� 瀹�</el-button>
+      </div>
+    </el-dialog>
+    <!--杞﹂棿閲囪喘浠堕鏂欏璇濇-->
+    <el-dialog :visible.sync="dialogFormVisible4" title="杞﹂棿閲囪喘浠堕鏂�" center width="380px">
+      <el-form ref="form4" :model="form4" :rules="rules4" label-position="left" class="demo-ruleForm">
+        <el-form-item label="棰嗘枡鍗曞彿" label-width="100px" size="small">
+          <el-input v-model="pickingListNumber" size="small" placeholder="绌�" readonly style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="鍑哄簱鏁伴噺" prop="outNumber" label-width="100px" size="small">
+          <el-input-number v-model="form4.outNumber" :min="0" :max="enableOut" controls-position="right" style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="鍑哄簱澶囨敞" prop="outNote" label-width="100px">
+          <el-input v-model="form4.outNote" size="small" placeholder="娉ㄦ槑棰嗘枡浜哄鍚�" style="width: 200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible4=false">鍙栨秷</el-button>
+        <el-button type="primary" @click="submitAddWorkshopList()">纭� 瀹�</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { initProject, searchmachine, searchTeam, searchPurchasePart, searchBasicPart, searchList, addList, dropList,
+  addListDetail, searchListDetail, dropListDetail, searchHoursePart, searchBacklogPart, submitAddBacklogList, dropListDetailBasic } from '@/api/ManufacturingCenter/CreateIntakeList'
+import request from '@/utils/request'
+import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      listLoading0: false, // 棰嗘枡鍗�
+      listLoading1: false, // 鑷埗浠�
+      listLoading2: false, // 閲囪喘閮ㄩ噰璐欢
+      listLoading3: false, // 婊炶揣浠�
+      listLoading4: false, // 杞﹂棿閲囪喘浠�
+      PageCurrent0: 1,
+      PageSize0: 10,
+      total0: 0,
+      PageCurrent1: 1,
+      PageSize1: 10,
+      total1: 0,
+      PageCurrent2: 1,
+      PageSize2: 10,
+      total2: 0,
+      PageCurrent3: 1,
+      PageSize3: 10,
+      total3: 0,
+      PageCurrent4: 1,
+      PageSize4: 10,
+      total4: 0,
+      ProjectValue: '',
+      Project: [],
+      ProjectValue_check: 0,
+      MachineValue: '',
+      Machine: [],
+      MachineValue_check: 0,
+      GroupNumValue: '',
+      GroupNum: [],
+      GroupNumValue_check: 0,
+      tableData1: [], // 棰嗘枡鍗�
+      tableDataPicking: [], // 棰嗘枡鍗曟槑缁�
+      tableDataBasic: [], // 鑷埗浠�
+      tableDataPurchase: [], // 閲囪喘閮ㄩ噰璐欢
+      tableDataBacklog: [], // 婊炶揣浠�
+      tableDataHouse: [], // 杞﹂棿閲囪喘浠�
+      form1: { // 鍩烘湰浠跺嚭搴�
+        outNumber: '', // 鍑哄簱鏁伴噺
+        outNote: '' // 鍑哄簱澶囨敞
+      },
+      rules1: { // 琛ㄥ崟楠岃瘉瑙勫垯
+        outNumber: [{ required: true, message: '璇疯緭鍏ュ嚭搴撴暟閲�', trigger: 'blur' }],
+        outNote: [{ required: true, message: '璇疯緭鍏ュ嚭搴撳娉�', trigger: 'blur' }]
+      },
+      form2: { // 澶栬喘浠跺嚭搴�
+        outNumber: '', // 鍑哄簱鏁伴噺
+        outNote: '' // 鍑哄簱澶囨敞
+      },
+      rules2: { // 琛ㄥ崟楠岃瘉瑙勫垯
+        outNumber: [{ required: true, message: '璇疯緭鍏ュ嚭搴撴暟閲�', trigger: 'blur' }],
+        outNote: [{ required: true, message: '璇疯緭鍏ュ嚭搴撳娉�', trigger: 'blur' }]
+      },
+      form3: { // 杞﹂棿閲囪喘鍑哄簱
+        outNumber: '', // 鍑哄簱鏁伴噺
+        outNote: '' // 鍑哄簱澶囨敞
+      },
+      rules3: { // 琛ㄥ崟楠岃瘉瑙勫垯
+        outNumber: [{ required: true, message: '璇疯緭鍏ュ嚭搴撴暟閲�', trigger: 'blur' }],
+        outNote: [{ required: true, message: '璇疯緭鍏ュ嚭搴撳娉�', trigger: 'blur' }]
+      },
+      form4: {
+        outNumber: '', // 鍑哄簱鏁伴噺
+        outNote: '' // 鍑哄簱澶囨敞
+      },
+      rules4: { // 琛ㄥ崟楠岃瘉瑙勫垯
+        outNumber: [{ required: true, message: '璇疯緭鍏ュ嚭搴撴暟閲�', trigger: 'blur' }],
+        outNote: [{ required: true, message: '璇疯緭鍏ュ嚭搴撳娉�', trigger: 'blur' }]
+      },
+      dialogFormVisible1: false, // 鑷埗浠�
+      dialogFormVisible2: false, // 閲囪喘閮ㄩ噰璐欢
+      dialogFormVisible3: false, // 婊炶揣浠�
+      dialogFormVisible4: false, // 杞﹂棿閲囪喘浠�
+      enableOut: '', // 鍙嚭搴撴暟閲�
+      partPiant: '', // 闆朵欢鍥惧彿
+      material: '', // 鏉愭枡
+      outType: '',
+      pickingListNumber: null, // 棰嗘枡鍗曠紪鍙�
+      pickingListNumberx: '', // 棰嗘枡鍗曟祦姘村彿
+      picikingPeople: '', // 棰嗘枡浜烘祦姘村彿
+      partProjectNumber: '', // 椤圭洰娴佹按鍙�
+      partMachineNumber: '', // 鏈哄簥娴佹按鍙�
+      partGroupNumber: '', // 鍒嗙粍娴佹按鍙�
+      receive: '', // 鏀朵欢淇℃伅ID
+      locatenumber: '', // 璐т綅娴佹按鍙�
+      materialName: '',
+      materialNumber: '',
+      materialType: '',
+      purchaseDetailNum: '', // 閲囪喘鍚堝悓鏄庣粏娴佹按鍙�
+      askPurchaseNumber: '', // 璇疯喘鍗曟槑缁嗘祦姘村彿
+      materialLocate: '',
+      partType: '', // 闆朵欢绫诲瀷
+      craftplannumber: '' // 宸ヨ壓璁″垝娴佹按鍙�
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'id'
+    ])
+  },
+  created() {
+    this.fetchData()
+    this.searchListinfor()
+    this.searchPartinfo()
+  },
+  methods: {
+    // 鍒濆鍖栭」鐩�,鑾峰彇浜哄憳缂栧彿
+    fetchData() {
+      this.getSelect(initProject, ['椤圭洰鍚嶇О', '椤圭洰娴佹按鍙�'], 'Project') // 椤圭洰鍚嶇О
+      this.picikingPeople = this.id
+    },
+    // 鏌ヨ棰嗘枡鍗�
+    searchListinfor() {
+      let check
+      this.pickingListNumber ? check = 1 : check = 0
+      this.listLoading0 = true
+      searchList(this.PageCurrent0, this.PageSize0, check, this.pickingListNumber).then(response => {
+        this.tableData1 = response.data.rows
+        this.total0 = response.data.total
+        this.listLoading0 = false
+      })
+    },
+    // 棰嗘枡鍗曞垎椤�
+    handleSizeChange0(val) {
+      this.PageCurrent0 = 1
+      this.PageSize0 = val
+      this.searchListinfor()
+    },
+    handleCurrentChange0(val) {
+      this.PageCurrent0 = val
+      this.searchListinfor()
+    },
+    // 鍒涘缓棰嗘枡鍗�
+    addListinfor() {
+      this.$confirm('纭鍒涘缓鏂扮殑棰嗘枡鍗�?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        addList(this.picikingPeople).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('澧炲姞鎴愬姛')
+            this.searchListinfor()
+          } else {
+            this.$message.error('澧炲姞澶辫触')
+          }
+        })
+      }).catch(() => {
+        this.$message('宸插彇娑堟搷浣�')
+      })
+    },
+    // 纭棰嗘枡鍗�
+    checkListinfor(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.searchListinfor()
+          } else {
+            this.$message.error('鎿嶄綔澶辫触')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '宸插彇娑堟搷浣�'
+        })
+      })
+    },
+    // 鍒犻櫎棰嗘枡鍗�
+    dropListinfor(row) {
+      this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ヨ, 鏄惁缁х画?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        if (this.tableDataPicking.length === 0) {
+          dropList(row.棰嗘枡鍗曟祦姘村彿).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('鍒犻櫎鎴愬姛')
+              this.searchListinfor()
+            } else {
+              this.$message.error('鏁版嵁鍗犵敤')
+            }
+          })
+        } else {
+          this.$message.error('鏁版嵁鍗犵敤')
+        }
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '宸插彇娑堝垹闄�'
+        })
+      })
+    },
+    // 鍒犻櫎棰嗘枡鍗曟槑缁�
+    dropListdetail(row) {
+      console.log(row)
+      if (Number(row.闆朵欢绫诲瀷) === 3) { // 鍩烘湰浠�
+        this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ヨ, 鏄惁缁х画?', '鎻愮ず', {
+          confirmButtonText: '纭畾',
+          cancelButtonText: '鍙栨秷',
+          type: 'warning'
+        }).then(() => {
+          dropListDetailBasic(row.棰嗘枡鍗曟槑缁嗘祦姘村彿, row.鏀朵欢淇℃伅ID, row.鍑哄簱鏁伴噺).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('鍒犻櫎鎴愬姛')
+              this.searchListDetailt()
+              this.searchPartinfo()
+            } else {
+              this.$message.error('鏁版嵁鍗犵敤')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '宸插彇娑堝垹闄�'
+          })
+        })
+      } else { // 閲囪喘閮ㄩ噰璐欢銆佹粸璐т欢
+        let isBacklog
+        Number(row.鍑哄簱绫诲瀷) === 4 ? isBacklog = 1 : isBacklog = 0
+        this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ヨ, 鏄惁缁х画?', '鎻愮ず', {
+          confirmButtonText: '纭畾',
+          cancelButtonText: '鍙栨秷',
+          type: 'warning'
+        }).then(() => {
+          dropListDetail(row.棰嗘枡鍗曟槑缁嗘祦姘村彿, isBacklog).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('鍒犻櫎鎴愬姛')
+              this.searchListDetailt()
+              this.searchPartinfo()
+            } else {
+              this.$message.error('鏁版嵁鍗犵敤')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '宸插彇娑堝垹闄�'
+          })
+        })
+      }
+    },
+    // 鏌ヨ鏈哄簥
+    searchMachine() {
+      this.MachineValue = ''
+      this.Machine = []
+      this.GroupNumValue = ''
+      this.GroupNum = []
+      this.ProjectValue ? this.ProjectValue_check = 1 : this.ProjectValue_check = 0
+      searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Machine.push({
+            label: response.data[i].鏈哄簥鍥惧彿,
+            value: response.data[i].鏈哄簥娴佹按鍙�
+          })
+        }
+      })
+    },
+    // 鏌ヨ缁勫彿
+    searchGroupList() {
+      this.GroupNumValue = ''
+      this.GroupNum = []
+      searchTeam(this.MachineValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.GroupNum.push({
+            label: response.data[i].缁勫彿,
+            value: response.data[i].缁勪欢娴佹按鍙�
+          })
+        }
+      })
+    },
+    // 鏍规嵁椤圭洰鏈哄簥鍒嗙粍鏌ラ浂浠�/鐗╂枡
+    searchPartinfo() {
+      this.ProjectValue ? this.ProjectValue_check = 1 : this.ProjectValue_check = 0
+      this.MachineValue ? this.MachineValue_check = 1 : this.MachineValue_check = 0
+      this.GroupNumValue ? this.GroupNumValue_check = 1 : this.GroupNumValue_check = 0
+      this.searchOwnPart() // 鑷埗浠�
+      this.searchPurchasePart() // 閲囪喘閮ㄩ噰璐欢
+      this.searchBacklogPart() // 婊炶揣浠�
+      this.searchWorkshopPart() // 杞﹂棿閲囪喘浠�
+    },
+    // 鏌ヨ鑷埗浠�
+    searchOwnPart() {
+      this.tableDataBasic = []
+      this.listLoading1 = true
+      searchBasicPart(this.PageCurrent1, this.PageSize1, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
+        const data = response.data.rows
+        console.log(response.data.rows)
+        for (let i = 0; i < data.length; i++) {
+          data[i].鍙嚭搴撴暟閲� === '0' ? data[i].鏄惁绂佺敤 = true : data[i].鏄惁绂佺敤 = false
+        }
+        this.tableDataBasic = response.data.rows
+        this.total1 = response.data.total
+        this.listLoading1 = false
+      })
+    },
+    // 鑷埗浠跺垎椤�
+    handleSizeChange1(val) {
+      this.PageCurrent1 = 1
+      this.PageSize1 = val
+      this.searchOwnPart()
+    },
+    handleCurrentChange1(val) {
+      this.PageCurrent1 = val
+      this.searchOwnPart()
+    },
+    // 鏌ヨ閲囪喘閮ㄩ噰璐欢
+    searchPurchasePart() {
+      this.tableDataPurchase = []
+      this.listLoading2 = true
+      searchPurchasePart(this.PageCurrent2, this.PageSize2, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
+        for (let i = 0; i < response.data.rows.length; i++) {
+          if (response.data.rows[i].缁勪欢闆朵欢鍩烘湰浠舵祦姘村彿 === '0') {
+            response.data.rows[i].闆朵欢绫诲瀷 = response.data.rows[i].闆朵欢绫诲瀷浠ｇ爜
+            response.data.rows[i].绫诲瀷鍚嶇О = response.data.rows[i].澶栬喘浠剁被鍨�
+          }
+        }
+        for (let i = 0; i < response.data.rows.length; i++) {
+          if (response.data.rows[i].缁勪欢闆朵欢娴佹按鍙� === '0') {
+            response.data.rows[i].鐗╂枡鍚嶇О = response.data.rows[i].闆朵欢鍚嶇О
+            response.data.rows[i].椤圭洰鍚嶇О = response.data.rows[i].鍩烘湰浠堕」鐩悕绉�
+            response.data.rows[i].鏈哄簥鍥惧彿 = response.data.rows[i].鍩烘湰浠舵満搴婂浘鍙�
+            response.data.rows[i].缁勫彿 = response.data.rows[i].鍩烘湰浠剁粍鍙�
+            response.data.rows[i].椤圭洰娴佹按鍙� = response.data.rows[i].鍩烘湰浠堕」鐩祦姘村彿
+            response.data.rows[i].鏈哄簥娴佹按鍙� = response.data.rows[i].鍩烘湰浠舵満搴婃祦姘村彿
+            response.data.rows[i].缁勪欢娴佹按鍙� = response.data.rows[i].鍩烘湰浠剁粍浠舵祦姘村彿
+          }
+        }
+        this.tableDataPurchase = response.data.rows
+        this.listLoading2 = false
+        this.total2 = response.data.total
+      })
+    },
+    // 閲囪喘閮ㄩ噰璐欢鍒嗛〉
+    handleSizeChange2(val) {
+      this.PageCurrent2 = 1
+      this.PageSize2 = val
+      this.searchPurchasePart()
+    },
+    handleCurrentChange2(val) {
+      this.PageCurrent2 = val
+      this.searchPurchasePart()
+    },
+    // 鏌ヨ婊炶揣浠�
+    searchBacklogPart() {
+      this.listLoading3 = true
+      this.tableDataBacklog = []
+      searchBacklogPart(this.PageCurrent3, this.PageSize3, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
+        console.log(response.data.rows, 123)
+        this.tableDataBacklog = response.data.rows
+        this.listLoading3 = false
+        this.total3 = response.data.total
+      })
+    },
+    // 婊炶揣浠跺垎椤�
+    handleSizeChange3(val) {
+      this.PageCurrent3 = 1
+      this.PageSize3 = val
+      this.searchBacklogPart()
+    },
+    handleCurrentChange3(val) {
+      this.PageCurrent3 = val
+      this.searchBacklogPart()
+    },
+    // 鏌ヨ杞﹂棿閲囪喘浠�
+    searchWorkshopPart() {
+      this.tableDataHouse = []
+      this.listLoading4 = true
+      searchHoursePart(this.PageCurrent4, this.PageSize4, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
+        this.tableDataHouse = response.data.rows
+        this.total4 = response.data.total
+        this.listLoading4 = false
+      })
+    },
+    // 杞﹂棿閲囪喘浠跺垎椤�
+    handleSizeChange4(val) {
+      this.PageCurrent4 = 1
+      this.PageSize4 = val
+      this.searchWorkshopPart()
+    },
+    handleCurrentChange4(val) {
+      this.PageCurrent4 = val
+      this.searchWorkshopPart()
+    },
+    // 鏌ヨ棰嗘枡鍗曟槑缁�
+    searchListDetailt() {
+      searchListDetail(this.pickingListNumberx).then(response => {
+        const data = response.data
+        for (let i = 0; i < data.length; i++) {
+          data[i].鏄惁鍑哄簱 === '1' ? data[i].鏄惁绂佺敤 = true : data[i].鏄惁绂佺敤 = false
+        }
+        this.tableDataPicking = data
+      })
+    },
+    // 閫夋嫨棰嗘枡鍗�
+    chooseListinfor(row) {
+      this.pickingListNumberx = row.棰嗘枡鍗曟祦姘村彿
+      this.pickingListNumber = row.棰嗘枡鍗曠紪鍙�
+      this.searchListDetailt()
+    },
+    // 澧炲姞鍩烘湰浠堕鏂欏崟鏄庣粏
+    addBasicList(row) {
+      if (this.$refs['form1'] !== undefined) {
+        this.$refs['form1'].resetFields()
+      }
+      this.dialogFormVisible1 = true
+      this.form1.outNumber = ''
+      this.form1.outNote = ''
+      this.partProjectNumber = row.椤圭洰娴佹按鍙�
+      this.partMachineNumber = row.鏈哄簥娴佹按鍙�
+      this.partGroupNumber = row.缁勪欢娴佹按鍙�
+      this.partType = row.闆朵欢绫诲瀷
+      this.craftplannumber = row.宸ヨ壓璁″垝娴佹按鍙�
+      this.receive = row.鏀朵欢淇℃伅id
+      this.purchaseDetailNum = ''
+      this.askPurchaseNumber = ''
+      this.locatenumber = row.璐т綅娴佹按鍙�
+      this.outType = 1
+      this.materialLocate = ''
+      this.materialName = row.闆朵欢鍚嶇О
+      this.materialType = row.闆朵欢绫诲瀷鍚嶇О
+      this.materialNumber = row.闆朵欢鍥惧彿
+      this.material = ''
+      this.enableOut = Number(row.鍙嚭搴撴暟閲�)
+    },
+    // 鎻愪氦澧炲姞鍩烘湰浠堕鏂欏崟鏄庣粏
+    submitAddBasicList() {
+      if (this.pickingListNumberx === '') {
+        this.$message.error('璇烽�夋嫨棰嗘枡鍗�')
+      } else {
+        this.$refs['form1'].validate((valid) => {
+          if (valid) {
+            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form1.outNumber, this.partType, this.form1.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.materialNumber, this.material).then(response => {
+              if (response.data[0].result === '1') {
+                this.$message.success('澧炲姞鎴愬姛')
+                this.searchPartinfo()
+                this.searchListinfor()
+                this.searchListDetailt()
+                this.dialogFormVisible1 = false
+              } else {
+                this.$message.error('澧炲姞澶辫触')
+              }
+            })
+          }
+        })
+      }
+    },
+    // 澧炲姞澶栬喘浠堕鏂欏崟鏄庣粏
+    addPurchaseList(row) {
+      if (this.$refs['form2'] !== undefined) {
+        this.$refs['form2'].resetFields()
+      }
+      this.dialogFormVisible2 = true
+      this.form2.outNumber = ''
+      this.form2.outNote = ''
+      this.partProjectNumber = row.椤圭洰娴佹按鍙�
+      this.partMachineNumber = row.鏈哄簥娴佹按鍙�
+      this.partGroupNumber = row.缁勪欢娴佹按鍙�
+      this.partType = row.闆朵欢绫诲瀷浠ｇ爜
+      this.craftplannumber = row.宸ヨ壓璁″垝娴佹按鍙�
+      this.receive = row.鏀朵欢淇℃伅ID
+      this.purchaseDetailNum = row.閲囪喘鍚堝悓鏄庣粏娴佹按鍙�
+      this.askPurchaseNumber = ''
+      this.locatenumber = row.璐т綅娴佹按鍙�
+      this.outType = 2
+      this.materialLocate = row.鐗╂枡涓庤揣浣嶅鐓ф祦姘村彿
+      this.materialName = row.鐗╂枡鍚嶇О
+      this.materialType = row.鐗╂枡瑙勬牸
+      this.materialNumber = row.鐗╂枡鍨嬪彿
+      this.partPiant = row.闆朵欢鍥惧彿
+      this.material = row.鏉愭枡
+      this.enableOut = Number(row.璐т綅瀛橀噺 - row.寰呭嚭搴撴暟閲�)
+    },
+    // 鎻愪氦澧炲姞澶栬喘浠堕鏂欏崟鏄庣粏
+    submitAddPurchaseList() {
+      if (this.pickingListNumberx === '') {
+        this.$message.error('璇烽�夋嫨棰嗘枡鍗�')
+      } else {
+        this.$refs['form2'].validate((valid) => {
+          if (valid) {
+            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form2.outNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.partPiant, this.material).then(response => {
+              if (response.data[0].result === '1') {
+                this.$message.success('澧炲姞鎴愬姛')
+                this.searchPartinfo()
+                this.searchListinfor()
+                this.searchListDetailt()
+                this.dialogFormVisible2 = false
+              } else {
+                this.$message.error('澧炲姞澶辫触')
+              }
+            })
+          }
+        })
+      }
+    },
+    // 澧炲姞婊炶揣浠堕鏂欏崟鏄庣粏
+    addBacklogList(row) {
+      if (this.$refs['form3'] !== undefined) {
+        this.$refs['form3'].resetFields()
+      }
+      console.log(row)
+      this.dialogFormVisible3 = true
+      this.partProjectNumber = row.椤圭洰娴佹按鍙�
+      this.partMachineNumber = row.鏈哄簥娴佹按鍙�
+      this.partGroupNumber = row.缁勪欢娴佹按鍙�
+      this.form3.outNumber = ''
+      this.form3.outNote = ''
+      this.locatenumber = row.璐т綅娴佹按鍙�
+      this.materialLocate = row.鐗╂枡涓庤揣浣嶅鐓ф祦姘村彿
+      this.materialName = row.鐗╂枡鍚嶇О
+      this.materialType = row.鐗╂枡瑙勬牸
+      this.materialNumber = row.鐗╂枡鍨嬪彿
+      this.enableOut = Number(row.鍙嚭搴撴暟閲�)
+    },
+    // 鎻愪氦澧炲姞婊炶揣浠堕鏂欏崟鏄庣粏
+    submitAddBacklogList() {
+      console.log(123)
+      this.$refs['form3'].validate((valid) => {
+        if (valid) {
+          if (this.pickingListNumberx === '') {
+            this.$message.error('璇烽�夋嫨棰嗘枡鍗�')
+          } else {
+            submitAddBacklogList(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form3.outNumber, this.form3.outNote, this.locatenumber, this.materialLocate, this.materialName, this.materialType, this.materialNumber).then(response => {
+              if (response.data[0].result === '1') {
+                this.$message.success('澧炲姞鎴愬姛')
+                this.searchPartinfo()
+                this.searchListinfor()
+                this.searchListDetailt()
+                this.dialogFormVisible3 = false
+              } else {
+                this.$message.error('澧炲姞澶辫触')
+              }
+            })
+          }
+        }
+      })
+    },
+    // 澧炲姞杞﹂棿閲囪喘棰嗘枡鍗曟槑缁�
+    addWorkshopList(row) {
+      if (this.$refs['form2'] !== undefined) {
+        this.$refs['form2'].resetFields()
+      }
+      this.dialogFormVisible4 = true
+      this.form4.outNumber = ''
+      this.form4.outNote = ''
+      this.partProjectNumber = row.椤圭洰娴佹按鍙�
+      this.partMachineNumber = row.鏈哄簥娴佹按鍙�
+      this.partGroupNumber = row.缁勪欢娴佹按鍙�
+      this.partType = row.闆朵欢绫诲瀷
+      this.craftplannumber = ''
+      this.receive = ''
+      this.purchaseDetailNum = ''
+      this.askPurchaseNumber = row.璇疯喘鍗曟槑缁嗘祦姘村彿
+      this.locatenumber = row.璐т綅娴佹按鍙�
+      this.outType = 3
+      this.materialName = row.鐗╂枡鍚嶇О
+      this.materialType = row.鐗╂枡瑙勬牸
+      this.materialNumber = row.鐗╂枡鍨嬪彿
+      this.partPiant = row.闆朵欢鍥惧彿
+      this.material = row.鏉愭枡
+      this.enableOut = Number(row.璐т綅瀛橀噺)
+    },
+    // 鎻愪氦澧炲姞杞﹂棿閲囪喘棰嗘枡鍗曟槑缁�
+    submitAddWorkshopList() {
+      this.$refs['form4'].validate((valid) => {
+        if (valid) {
+          if (this.pickingListNumberx === '') {
+            this.$message.error('璇烽�夋嫨棰嗘枡鍗�')
+          } else {
+            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form4.outNumber, this.partType, this.form4.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.partPiant, this.material).then(response => {
+              if (response.data[0].result === '1') {
+                this.$message.success('澧炲姞鎴愬姛')
+                this.searchPartinfo()
+                this.searchListinfor()
+                this.searchListDetailt()
+                this.dialogFormVisible4 = false
+              } else {
+                this.$message.error('澧炲姞澶辫触')
+              }
+            })
+          }
+        }
+      })
+    }
+  }
+}
+</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/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
index e82f8c4a..9a07d8e0 100644
--- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
@@ -5,14 +5,13 @@
         <span>闆朵欢鍥惧彿:</span>
         <el-input v-model="partName" placeholder="闆朵欢鍥惧彿" size="small" clearable style="width:200px"/>
         <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">鏌ヨ</el-button>
-        <!--<el-checkbox v-model="all" size="mini" @change="searchTable">鏌ヨ鍏ㄩ儴</el-checkbox>-->
-        <!--<el-button :disabled="all" size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit()">鑷澶囨枡鍑哄簱</el-button>-->
-        <!--<el-button size="small" icon="el-icon-refresh" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">鍒锋柊</el-button>-->
+        <el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit2()">鑷澶囨枡纭</el-button>
       </el-row>
     </el-card>
 
     <el-card>
-      <el-table v-loading="loading" :data="tableData" height="580" style="width: 100%;" border element-loading-text="鎷煎懡鍔犺浇涓�">
+      <el-table v-loading="loading" :data="tableData" height="580" style="width: 100%;" border element-loading-text="鎷煎懡鍔犺浇涓�" @selection-change="handleSelectionChange2">
+        <el-table-column type="selection" width="55" align="center"/>
         <el-table-column label="闆朵欢鍚嶇О" align="center" width="220px">
           <template slot-scope="scope">
             {{ scope.row.闆朵欢鍚嶇О }}
@@ -28,25 +27,6 @@
             {{ scope.row.宸ヨ壓瑕佹眰 }}
           </template>
         </el-table-column>
-        <el-table-column prop="request" label="閲嶉噺(kg)" align="center" width="150">
-          <template slot-scope="scope">
-            <el-input v-model="scope.row.閲嶉噺" size="mini"/>
-          </template>
-        </el-table-column>
-        <el-table-column prop="request" label="鍗曚环(鍏�)" align="center" width="150">
-          <template slot-scope="scope">
-            <el-input v-model="scope.row.鍗曚环" size="mini"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="鎿嶄綔" align="center" width="150px" fixed="right">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              class="el-icon-edit"
-              @click="handleChange1(scope.row)">鍑哄簱</el-button>
-          </template>
-        </el-table-column>
       </el-table>
       <div class="block">
         <el-pagination
@@ -64,14 +44,11 @@
       <span>闆朵欢鍥惧彿:</span>
       <el-input v-model="partName2" placeholder="闆朵欢鍥惧彿" size="small" clearable style="width:200px"/>
       <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="total2=0;pageSize2=10; pageCurrent2=1;searchTable2()">鏌ヨ</el-button>
-      <el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit()">澶栬喘澶囨枡鍑哄簱</el-button>
+      <el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit()">澶栬喘澶囨枡纭</el-button>
     </el-card>
     <el-card>
       <el-table v-loading="loading2" :data="tableData2" height="580" style="width: 100%;" border element-loading-text="鎷煎懡鍔犺浇涓�" @selection-change="handleSelectionChange">
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center"/>
+        <el-table-column type="selection" width="55" align="center"/>
         <el-table-column label="闆朵欢鍚嶇О" align="center" width="220px">
           <template slot-scope="scope">
             {{ scope.row.闆朵欢鍚嶇О }}
@@ -115,11 +92,12 @@
 </template>
 
 <script>
-import { searchtable, searchtable2, change, handlechange, searchtable3, change2, handlechange2 } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
+import { searchtable, searchtable2, change, handlechange, searchtable3, change2, handlechange2, change3 } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
 import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
+      arrest2: [],
       editTime: '',
       bianliang1: [],
       bianliang2: [],
@@ -153,6 +131,25 @@ export default {
     this.searchTable2()
   },
   methods: {
+    handleSelectionChange2(val) {
+      this.arrest2 = val
+    },
+    edit2() {
+      this.bianliang1 = []
+      this.bianliang2 = []
+      if (this.arrest2.length === 0) {
+        this.$message.warning('璇烽�夋嫨闆朵欢')
+      } else {
+        for (let i = 0; i < this.arrest2.length; i++) {
+          this.bianliang1.push(this.arrest2[i].宸ヨ壓璁″垝娴佹按鍙�)
+          this.bianliang2.push(this.arrest2[i].宸ュ簭娴佹按鍙�)
+        }
+        change3(this.bianliang2, '0000', this.bianliang1).then(response => {
+          this.searchTable()
+        })
+      }
+    },
+    // ////////////////////////////////////////////////////////////////////////////0530鏂扳啈
     // 鏌ヨ琛ㄦ牸鏁版嵁
     searchTable() {
       this.loading = true
@@ -195,25 +192,19 @@ export default {
         return i
       }
     },
-    // 鑷澶囨枡鍑哄簱
+    // 鑷澶囨枡纭
     handleChange1(row) {
-      if (row.閲嶉噺 === '' || row.閲嶉噺 === null) {
-        this.$message.error('璇疯緭鍏ラ噸閲�')
-      } else if (row.鍗曚环 === '' || row.鍗曚环 === null) {
-        this.$message.error('璇疯緭鍏ュ崟浠�')
-      } else {
-        var date = new Date()
-        var month = this.zeroFill(date.getMonth() + 1)
-        var day = this.zeroFill(date.getDate())
-        this.editTime = date.getFullYear() + '-' + month + '-' + day
-        change(row.宸ヨ壓璁″垝娴佹按鍙�, row.閲嶉噺, row.鍗曚环).then(() => {
-          handlechange(row.宸ュ簭娴佹按鍙�, '0000').then(response => {
-            handlechange2(row.宸ュ簭娴佹按鍙�, this.form.瀹屾垚鏃堕棿)
-          })
-        }).then(response => {
-          this.searchTable()
+      var date = new Date()
+      var month = this.zeroFill(date.getMonth() + 1)
+      var day = this.zeroFill(date.getDate())
+      this.editTime = date.getFullYear() + '-' + month + '-' + day
+      change(row.宸ヨ壓璁″垝娴佹按鍙�, row.閲嶉噺, row.鍗曚环).then(() => {
+        handlechange(row.宸ュ簭娴佹按鍙�, '0000').then(response => {
+          handlechange2(row.宸ュ簭娴佹按鍙�, this.form.瀹屾垚鏃堕棿)
         })
-      }
+      }).then(response => {
+        this.searchTable()
+      })
     },
     handleSelectionChange(val) {
       this.arrest = val
diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
index f34f2e1b..7f13feea 100644
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -76,6 +76,11 @@
             {{ scope.row.鎵规鏁伴噺 }}
           </template>
         </el-table-column>
+        <el-table-column label="宸ヨ壓鍛�" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.宸ヨ壓鍛� }}
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination
diff --git a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
index 03fdcf68..187e0364 100644
--- a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
@@ -1,6 +1,10 @@
 <template>
   <div class="app-container">
     <el-card>
+      <el-radio-group v-model="radio" size="small" style="margin: 10px;" @change="checked = false;partNum=[];partNumValue = '';typeValue = '';partName = '';material = '';materialName = '';prepareMateriel = '';spec = '';batchNum = '';searchPartsByMachineGroup();">
+        <el-radio v-model="radio" :label="1">鏈紪鍒�</el-radio>
+        <el-radio v-model="radio" :label="2">宸茬紪鍒�</el-radio>
+      </el-radio-group>
       <span>宸ヨ壓鍛�:</span>
       <el-select v-model="CraftmenValue" placeholder="宸ヨ壓鍛�" size="small" style="width:100px" @change="clearDetail();">
         <el-option
@@ -9,22 +13,28 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span>闆朵欢鍙�:</span>
+      <!--<span>闆朵欢鍙�:</span>
       <el-input v-model="partNumber" clearable placeholder="闆朵欢鍙�" size="small" style="width:200px">
         <el-button slot="append" icon="el-icon-right" @click="searchParts();partNumValue=''"/>
+      </el-input>-->
+      <span>鏈哄簥-鍒嗙粍 鎴� 闆朵欢鍙�:</span>
+      <el-input v-model="machine_Group_part" clearable placeholder="渚嬶細鏈哄簥鍙�-缁勫彿 鎴� 闆朵欢鍙�" size="small" style="width:260px">
+        <el-button slot="append" icon="el-icon-right" @click="searchPartsByMachineGroup();partNumValue=''"/>
       </el-input>
       <el-select v-model="partNumValue" placeholder="閫夋嫨闆朵欢缂栧埗宸ヨ壓瀹氶" size="small" @clear="clearDetail" @change="searchDetail()">
         <el-option
           v-for="item in partNum"
           :key="item.value"
           :label="item.label"
-          :value="item.value"/>
+          :value="item.value">
+          <b style="float: left">{{ item.label }}</b>
+          <b style="float: right; color: #8492a6; font-size: 13px">-{{ item.group }}</b>
+          <b style="float: right; color: #8492a6; font-size: 13px">&nbsp;&nbsp;{{ item.machine }}</b>
+        </el-option>
       </el-select>
       <el-checkbox v-model="checked" :disabled="isShow2" size="small" style="margin:10px">鏄惁鏍稿噯</el-checkbox>
-      <el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">鍦ㄥ埗闆朵欢宸ヨ壓璋冩暣
-      </el-button>
-      <el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">鍒囨崲缂栬緫妯″紡
-      </el-button>
+      <!--<el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">鍦ㄥ埗闆朵欢宸ヨ壓璋冩暣</el-button>-->
+      <!--<el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">鍒囨崲缂栬緫妯″紡</el-button>-->
       <div v-show="isShow">
         <span>绉嶇被:</span>
         <el-input v-model="typeValue" placeholder="绉嶇被" size="small" readonly style="width:100px"/>
@@ -42,7 +52,7 @@
       </div>
       <div>
         <el-row>
-          <el-col :span="4">
+          <el-col style="width:210px">
             <span>鐗╂枡绫诲瀷:</span>
             <el-select v-model="materielValue" size="small" style="margin-top: 20px;width:120px" placeholder="鐗╂枡绫诲瀷" @change="clear()">
               <el-option
@@ -160,6 +170,7 @@
           <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-tickets" @click="saveApprove">淇濆瓨
           </el-button>
         </el-button-group>
+        <el-button v-if="!isShow1" type="warning" size="small" icon="el-icon-tickets" @click="saveCompiled">璁板綍淇敼澶囨敞</el-button>
       </el-row>
       <div style="margin-top: 5px;margin-bottom: 10px;display: inline-block"><span>绗﹀彿锛�</span>
         <el-tag type="info">鈭�</el-tag>
@@ -203,21 +214,10 @@
               @change="handleChange(scope.row)"/>
           </template>
         </el-table-column>
-        <el-table-column v-if="false" prop="name" label="宸ヨ壓鍚嶇О" width="130" align="center">
-          <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.宸ヨ壓鍚嶇О"
-              :disabled="disabled"
-              readonly
-              style="width:100%"
-              @dblclick.native="tableSearch(scope.$index)"/>
-          </template>
-        </el-table-column>
         <el-table-column prop="hard" label="闅惧害绛夌骇" width="110" align="center">
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.宸ヨ壓闅惧害绛夌骇"
-              :disabled="disabled"
               clearable
               placeholder=""
               @change="hardEdit(scope.row)">
@@ -227,17 +227,6 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column v-if="false" prop="request" label="宸ヨ壓瑕佹眰" align="center" min-width="350">
-          <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.宸ヨ壓瑕佹眰"
-              :rows="1"
-              :disabled="disabled"
-              type="textarea"
-              @dblclick.native="tableSearch(scope.$index)"
-              @change="requestEdit(scope.row)"/>
-          </template>
-        </el-table-column>
         <el-table-column prop="request" label="宸ヨ壓瑕佹眰" align="center" min-width="350">
           <template slot-scope="scope">
             <el-autocomplete
@@ -264,22 +253,18 @@
           <template slot-scope="scope">
             <div>
               <el-button
-                :disabled="disabled"
                 icon="el-icon-arrow-up"
                 type="primary"
                 @click="upOne(scope.row)"/>
               <el-button
-                :disabled="disabled"
                 icon="el-icon-arrow-down"
                 type="primary"
                 @click="downOne(scope.row)"/>
               <el-button
-                :disabled="disabled"
                 icon="el-icon-circle-plus-outline"
                 type="primary"
                 @click="insertOne(scope.row)"/>
               <el-button
-                :disabled="disabled"
                 icon="el-icon-delete"
                 type="danger"
                 @click="deleteOne(scope.row)"/>
@@ -543,7 +528,10 @@ import {
   singleChange,
   readyChange,
   TableAddLi1,
-  TableAddLi
+  TableAddLi,
+  getPartnames3,
+  getPartnames4,
+  modifyRemark
 } from '@/api/ManufacturingCenter/ProcessQuotaEstablishment'
 import elInput from 'element-ui/packages/input'
 import { mapGetters } from 'vuex'
@@ -554,6 +542,7 @@ export default {
   },
   data() {
     return {
+      machine_Group_part: '',
       partNumber: '',
       options: [],
       weight: '',
@@ -710,13 +699,33 @@ export default {
       'id'
     ])
   },
-  created() {
+  mounted() {
     this.fetchData()
     this.initPerson()
     this.getList()
     this.openCascader()
   },
   methods: {
+    // 淇濆瓨宸茬紪鍒�
+    saveCompiled() {
+      if (this.partNumValue) {
+        this.$prompt('璇疯緭鍏ュ伐鑹轰慨鏀瑰娉�', '鎻愮ず', {
+          confirmButtonText: '纭畾',
+          cancelButtonText: '鍙栨秷'
+        }).then(({ value }) => {
+          console.log(value, '鏃ユ湡', this.id, this.partNumValue)
+          modifyRemark(this.id, value, this.partNumValue)
+          this.$message.success('璁板綍鎴愬姛')
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '鍙栨秷鎿嶄綔'
+          })
+        })
+      } else {
+        this.$message.warning('璇烽�夋嫨闆朵欢')
+      }
+    },
     blurRequest(row) {
       selectRequest(row.宸ュ簭娴佹按鍙�, row.宸ヨ壓璁″垝娴佹按鍙�, row.宸ヨ壓缂栧彿, row.宸ュ簭椤哄簭, row.宸ヨ壓瑕佹眰).then(response => {
         if (response.data[0].result === '1') {
@@ -1073,6 +1082,43 @@ export default {
         this.tableMaterial = response.data.rows
       })
     },
+    // 鏍规嵁鏈哄簥鍙�-缁勫彿鏌ヨ闆朵欢锛堝寘鍚�熺敤浠讹級
+    searchPartsByMachineGroup() {
+      this.tableData = []
+      this.partNum = []
+      if (this.radio === 1) { // 鏈紪鍒�
+        this.disabled = false
+        this.isShow1 = true
+        this.isShow2 = false
+        this.checked1 = true
+        getPartnames3(this.CraftmenValue, this.machine_Group_part).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.partNum.push({
+              label: response.data[i].闆朵欢鍥惧彿,
+              value: response.data[i].宸ヨ壓璁″垝娴佹按鍙�,
+              machine: response.data[i].鏈哄簥鍥惧彿,
+              group: response.data[i].缁勫彿
+            })
+          }
+        })
+      } else { // 宸茬紪鍒�
+        this.isShow = true
+        this.isShow1 = false
+        this.isShow2 = true
+        this.disabled = true
+        this.checked1 = false
+        getPartnames4(this.CraftmenValue, this.machine_Group_part).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.partNum.push({
+              label: response.data[i].闆朵欢鍥惧彿,
+              value: response.data[i].宸ヨ壓璁″垝娴佹按鍙�,
+              machine: response.data[i].鏈哄簥鍥惧彿,
+              group: response.data[i].缁勫彿
+            })
+          }
+        })
+      }
+    },
     searchParts() { // 鏍规嵁鏉′欢鏌ラ浂浠跺彿
       this.tableData = []
       this.partNum = []
@@ -1457,6 +1503,7 @@ export default {
                   this.spec = ''
                   this.newNum = ''
                   this.searchParts()
+                  this.searchPartsByMachineGroup()
                   this.$message.success('淇濆瓨鎴愬姛')
                 })
               }
diff --git a/src/views/ManufacturingCenter/SparePartsOut/index.vue b/src/views/ManufacturingCenter/SparePartsOut/index.vue
new file mode 100644
index 00000000..264de849
--- /dev/null
+++ b/src/views/ManufacturingCenter/SparePartsOut/index.vue
@@ -0,0 +1,294 @@
+<template>
+  <div>
+    <el-card>
+      <el-row>
+        <span>闆朵欢鍥惧彿:</span>
+        <el-input v-model="partName" placeholder="闆朵欢鍥惧彿" size="small" clearable style="width:200px"/>
+        <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">鏌ヨ</el-button>
+        <!--<el-checkbox v-model="all" size="mini" @change="searchTable">鏌ヨ鍏ㄩ儴</el-checkbox>-->
+        <!--<el-button :disabled="all" size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit()">鑷澶囨枡纭</el-button>-->
+        <!--<el-button size="small" icon="el-icon-refresh" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">鍒锋柊</el-button>-->
+      </el-row>
+    </el-card>
+
+    <el-card>
+      <el-table v-loading="loading" :data="tableData" height="580" style="width: 100%;" border element-loading-text="鎷煎懡鍔犺浇涓�">
+        <el-table-column label="闆朵欢鍚嶇О" align="center" width="220px">
+          <template slot-scope="scope">
+            {{ scope.row.闆朵欢鍚嶇О }}
+          </template>
+        </el-table-column>
+        <el-table-column label="闆朵欢鍥惧彿" align="center" width="240px">
+          <template slot-scope="scope">
+            {{ scope.row.闆朵欢鍥惧彿 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="澶囨枡" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.宸ヨ壓瑕佹眰 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="閲嶉噺(kg)" align="center" width="150">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.閲嶉噺" size="mini"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="鍗曚环(鍏�)" align="center" width="150">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.鍗曚环" size="mini"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="鎿嶄綔" align="center" width="150px" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              class="el-icon-edit"
+              @click="handleChange1(scope.row)">澶囨枡纭</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[10, 20, 30, 40, 100]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+    <el-card>
+      <span>闆朵欢鍥惧彿:</span>
+      <el-input v-model="partName2" placeholder="闆朵欢鍥惧彿" size="small" clearable style="width:200px"/>
+      <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="total2=0;pageSize2=10; pageCurrent2=1;searchTable2()">鏌ヨ</el-button>
+      <el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit()">澶栬喘澶囨枡纭</el-button>
+    </el-card>
+    <el-card>
+      <el-table v-loading="loading2" :data="tableData2" height="580" style="width: 100%;" border element-loading-text="鎷煎懡鍔犺浇涓�" @selection-change="handleSelectionChange">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center"/>
+        <el-table-column label="闆朵欢鍚嶇О" align="center" width="220px">
+          <template slot-scope="scope">
+            {{ scope.row.闆朵欢鍚嶇О }}
+          </template>
+        </el-table-column>
+        <el-table-column label="闆朵欢鍥惧彿" align="center" width="240px">
+          <template slot-scope="scope">
+            {{ scope.row.闆朵欢鍥惧彿 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="閲嶉噺" align="center" width="140px">
+          <template slot-scope="scope">
+            {{ scope.row.閲嶉噺1 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="鍗曚环" align="center" width="140px">
+          <template slot-scope="scope">
+            {{ scope.row.鍗曚环 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="澶囨敞" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.澶囨敞1 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          v-if="!loading2"
+          :current-page="pageCurrent2"
+          :page-sizes="[10, 20, 30, 40, 100]"
+          :page-size="pageSize2"
+          :total="total2"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange2"
+          @current-change="handleCurrentChange2"/>
+      </div>
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import { searchtable, searchtable2, change, handlechange, searchtable3, change2, handlechange2 } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
+import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      editTime: '',
+      bianliang1: [],
+      bianliang2: [],
+      num: 0,
+      arrest: [],
+      all: false,
+      partName: '',
+      loading: false,
+      tableData: [], // 琛ㄦ牸鏁版嵁
+      total: null, // 鎬绘潯鏁�
+      pageSize: 10, // 姣忛〉鏄剧ず鏉℃暟
+      pageCurrent: 1, // 鍚庡彴鑾峰彇椤�
+      loading2: false,
+      partName2: '',
+      tableData2: [], // 琛ㄦ牸鏁版嵁
+      total2: null, // 鎬绘潯鏁�
+      pageSize2: 10, // 姣忛〉鏄剧ず鏉℃暟
+      pageCurrent2: 1 // 鍚庡彴鑾峰彇椤�
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'name',
+      'id'
+    ])
+  },
+  created() {
+    this.searchTable()
+    this.searchTable2()
+  },
+  methods: {
+    // 鏌ヨ琛ㄦ牸鏁版嵁
+    searchTable() {
+      this.loading = true
+      this.tableData = []
+      this.Data = []
+      if (this.partName !== '' && this.partName !== null) {
+        this.partNamecheck = true
+      } else {
+        this.partNamecheck = false
+      }
+      searchtable(this.partNamecheck, this.partName, !this.all, this.pageCurrent, this.pageSize).then(response => {
+        if (response.data.total === 0) {
+          this.loading = false
+        } else {
+          this.Data = response.data.rows
+          this.total = response.data.total
+        }
+      }).then(() => {
+        for (let i = 0; i < this.Data.length; i++) {
+          searchtable2(this.Data[i].宸ヨ壓璁″垝娴佹按鍙�).then(response => {
+            this.tableData.push({
+              宸ヨ壓璁″垝娴佹按鍙�: this.Data[i].宸ヨ壓璁″垝娴佹按鍙�,
+              闆朵欢鍚嶇О: this.Data[i].闆朵欢鍚嶇О,
+              闆朵欢鍥惧彿: this.Data[i].闆朵欢鍥惧彿,
+              澶囨枡鍒拌揣: this.Data[i].澶囨枡鍒拌揣,
+              宸ヨ壓瑕佹眰: response.data[0].宸ヨ壓瑕佹眰,
+              宸ュ簭娴佹按鍙�: response.data[0].宸ュ簭娴佹按鍙�,
+              閲嶉噺: response.data[0].閲嶉噺,
+              鍗曚环: 0
+            })
+          })
+          this.loading = false
+        }
+      })
+    },
+    zeroFill(i) {
+      if (i >= 0 && i <= 9) {
+        return '0' + i
+      } else {
+        return i
+      }
+    },
+    // 鑷澶囨枡纭
+    handleChange1(row) {
+      if (row.閲嶉噺 === '' || row.閲嶉噺 === null) {
+        this.$message.error('璇疯緭鍏ラ噸閲�')
+      } else if (row.鍗曚环 === '' || row.鍗曚环 === null) {
+        this.$message.error('璇疯緭鍏ュ崟浠�')
+      } else {
+        var date = new Date()
+        var month = this.zeroFill(date.getMonth() + 1)
+        var day = this.zeroFill(date.getDate())
+        this.editTime = date.getFullYear() + '-' + month + '-' + day
+        change(row.宸ヨ壓璁″垝娴佹按鍙�, row.閲嶉噺, row.鍗曚环).then(() => {
+          handlechange(row.宸ュ簭娴佹按鍙�, '0000').then(response => {
+            handlechange2(row.宸ュ簭娴佹按鍙�, this.form.瀹屾垚鏃堕棿)
+          })
+        }).then(response => {
+          this.searchTable()
+        })
+      }
+    },
+    handleSelectionChange(val) {
+      this.arrest = val
+    },
+    searchTable2() {
+      this.loading2 = true
+      this.tableData2 = []
+      this.Data2 = []
+      if (this.partName2 !== '' && this.partName2 !== null) {
+        this.partNamecheck2 = 1
+      } else {
+        this.partNamecheck2 = 0
+      }
+      searchtable3(this.partNamecheck2, this.partName2, this.pageCurrent2, this.pageSize2).then(response => {
+        if (response.data.total === 0) {
+          this.loading2 = false
+        } else {
+          this.Data2 = response.data.rows
+          this.total2 = response.data.total
+        }
+      }).then(() => {
+        for (let i = 0; i < this.Data2.length; i++) {
+          searchtable2(this.Data2[i].宸ヨ壓璁″垝娴佹按鍙�).then(response => {
+            this.tableData2.push({
+              宸ヨ壓璁″垝娴佹按鍙�: this.Data2[i].宸ヨ壓璁″垝娴佹按鍙�,
+              闆朵欢鍚嶇О: this.Data2[i].闆朵欢鍚嶇О,
+              闆朵欢鍥惧彿: this.Data2[i].闆朵欢鍥惧彿,
+              閲嶉噺1: this.Data2[i].閲嶉噺1,
+              鍗曚环: this.Data2[i].鍗曚环,
+              澶囨敞1: this.Data2[i].澶囨敞1,
+              宸ュ簭娴佹按鍙�: response.data[0].宸ュ簭娴佹按鍙�
+            })
+          })
+          this.loading2 = false
+        }
+      })
+    },
+    edit() {
+      this.bianliang1 = []
+      this.bianliang2 = []
+      if (this.arrest.length === 0) {
+        this.$message.warning('璇烽�夋嫨闆朵欢')
+      } else {
+        for (let i = 0; i < this.arrest.length; i++) {
+          this.bianliang1.push(this.arrest[i].宸ヨ壓璁″垝娴佹按鍙�)
+          this.bianliang2.push(this.arrest[i].宸ュ簭娴佹按鍙�)
+        }
+        change2(this.bianliang2, '0000', this.bianliang1).then(response => {
+          this.searchTable2()
+        })
+      }
+    },
+    // 鍒嗛〉
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchTable()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchTable()
+    },
+    handleSizeChange2(val) {
+      this.pageCurrent2 = 1
+      this.pageSize2 = val
+      this.searchTable2()
+    },
+    handleCurrentChange2(val) {
+      this.pageCurrent2 = val
+      this.searchTable2()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index 1f6f39b1..2b25c733 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -50,28 +50,28 @@
       <el-table
         v-loading="loading0"
         :data="tableData"
-        style="width: 100%;max-height: 600px"
-        height="600"
+        style="width: 100%;max-height: 610px"
+        height="610"
         size="mini"
         highlight-current-row
         border>
-        <el-table-column align="center" label="搴忓彿" type="index" width="60px"/>
-        <el-table-column align="center" label="鏈哄簥鍥惧彿" width="170px">
+        <el-table-column align="center" label="搴忓彿" type="index" width="50px"/>
+        <el-table-column align="center" label="鏈哄簥鍥惧彿" width="100px">
           <template slot-scope="scope">
             {{ scope.row.鏈哄簥鍥惧彿 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="缁勫彿" width="140px">
+        <el-table-column align="center" label="缁勫彿" width="60px">
           <template slot-scope="scope">
             {{ scope.row.缁勫彿 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="闆朵欢鍥惧彿" width="200px">
+        <el-table-column align="center" label="闆朵欢鍥惧彿" width="150px">
           <template slot-scope="scope">
             {{ scope.row.闆朵欢鍥惧彿 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="闆朵欢鍚嶇О" width="180px">
+        <el-table-column align="center" label="闆朵欢鍚嶇О" width="100px">
           <template slot-scope="scope">
             {{ scope.row.闆朵欢鍚嶇О }}
           </template>
@@ -81,17 +81,17 @@
             {{ scope.row.鎶曚骇鎬绘暟閲� }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="鎶曚骇鏃堕棿" width="130px">
+        <el-table-column align="center" label="鎶曚骇鏃堕棿" width="100px">
           <template slot-scope="scope">
             {{ scope.row.浼犻�掓椂闂� }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="闆朵欢鐘舵��" width="750px">
+        <el-table-column align="center" label="闆朵欢鐘舵��" min-width="960px">
           <template slot-scope="scope">
-            <el-steps :active="scope.row.鑰冩牳鐘舵��" finish-status="success" simple>
+            <el-steps id="StatusQuery" :active="scope.row.鑰冩牳鐘舵��" finish-status="success" simple>
               <el-step title="鎶曚骇" />
-              <el-step title="宸ヨ壓" />
-              <el-step title="瀹氶" />
+              <el-step title="宸ヨ壓瀹氶" />
+              <!--<el-step title="瀹氶" />-->
               <el-step title="骞宠　" />
               <el-step title="瀹屾垚" />
               <el-step title="鍏ュ簱" />
@@ -491,3 +491,8 @@ export default {
     margin: 10px 0 10px 10px;
   }
 </style>
+<style>
+  #StatusQuery {
+    padding: 8px 30px;
+  }
+</style>
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index 2715c39b..59f2d570 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -1,75 +1,69 @@
 <template>
   <div class="app-container">
     <el-card>
-      <div slot="header">
-        <span>闆朵欢鍥惧彿:</span>
-        <el-select v-model="partDrawingNumberValue" placeholder="闆朵欢鍥惧彿" size="small" clearable>
-          <el-option
-            v-for="item in partDrawingNumber"
-            :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>
-      </div>
-      <div v-show="showMaterialTable">
-        <el-table
-          v-loading="loading1"
-          :data="tableData1"
-          border
-          style="width: 100%;max-height: 460px;"
-          height="330"
-          size="mini"
-          @selection-change="handleSelectionChange">
+      <el-col :span="9">
+        <span>鍘熸潗鏂欏悕绉�:</span>
+        <el-input v-model="RawMaterialName" placeholder="鍘熸潗鏂欏悕绉�" size="mini" clearable style="width: 120px"/>
+        <el-button type="success" icon="el-icon-search" size="mini" style="margin-left: 10px" @click="pageCurrent=1;searchRawMaterial()">鏌ヨ</el-button>
+        <el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel2">閫夊叆鍘熸潗鏂�</el-button>
+        <el-table :data="tableData" border style="width: 100%;height: 460px;margin-top: 15px;" height="330" size="mini" @selection-change="handleSelectionChange2">
           <el-table-column type="selection" align="center" width="55"/>
-          <el-table-column label="闆朵欢鍥惧彿" min-width="150" align="center">
+          <el-table-column label="鍘熸潗鏂欏悕绉�" min-width="100" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.鍘熸潗鏂欏悕绉� }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block" style="margin-top: 10px;margin-bottom: 10px;">
+          <el-pagination
+            :current-page="pageCurrent"
+            :page-size="pageSize"
+            :total="total"
+            style="display:inline-block;width:50%"
+            layout="total, prev, pager, next"
+            @size-change="handleSizeChange1"
+            @current-change="handleCurrentChange1"/>
+        </div>
+      </el-col>
+      <el-col :span="14" style="margin-left: 20px">
+        <span>闆朵欢鍥惧彿:</span>
+        <el-input v-model="partDrawingNumber" placeholder="闆朵欢鍥惧彿" size="mini" clearable style="width: 120px"/>
+        <el-button type="success" size="mini" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">鏌ヨ</el-button>
+        <el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">閫夊叆鐗╂枡</el-button>
+        <el-table v-loading="loading1" :data="tableData1" border style="width: 100%;height: 460px;margin-top: 15px;" height="330" size="mini" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" align="center" width="55"/>
+          <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="150" align="center">
+          <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="150" align="center">
+          <el-table-column label="鏁伴噺" width="80" align="center">
             <template slot-scope="scope">
               {{ scope.row.鎵规鏁伴噺 }}
             </template>
           </el-table-column>
-          <el-table-column label="鏉愭枡" min-width="150" align="center">
+          <el-table-column label="鏉愭枡" width="80" align="center">
             <template slot-scope="scope">
               {{ scope.row.鏉愭枡 }}
             </template>
           </el-table-column>
-          <el-table-column label="瑙勬牸" min-width="90" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.鍘熸潗鏂欒鏍� }}
-            </template>
-          </el-table-column>
-          <el-table-column label="閲嶉噺" min-width="90" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.閲嶉噺 }}
-            </template>
-          </el-table-column>
         </el-table>
-        <div class="block" style="margin-top: 10px;">
+        <div class="block" style="margin-top: 10px;margin-bottom: 10px;">
           <el-pagination
             :current-page="pageCurrent1"
-            :page-sizes="[10, 20, 30, 40]"
             :page-size="pageSize1"
             :total="total1"
             style="display:inline-block;width:50%"
-            layout="total, sizes, prev, pager, next, jumper"
+            layout="total, prev, pager, next"
             @size-change="handleSizeChange1"
             @current-change="handleCurrentChange1"/>
         </div>
-      </div>
+      </el-col>
     </el-card>
 
     <el-card>
@@ -78,30 +72,9 @@
         <el-input v-model="purchasingOrder" placeholder="閲囪喘鍗曞彿" size="small" clearable/>
         <span>渚涘簲鍟�:</span>
         <el-input v-model="supplierName0" placeholder="渚涘簲鍟�" size="small" clearable/>
-        <el-button
-          type="success"
-          size="small"
-          icon="el-icon-search"
-          style="margin-left: 10px"
-          @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">鏌ヨ</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          icon="el-icon-plus"
-          style="margin-left: 10px"
-          @click="addPurchaseOrder">鍒涘缓閲囪喘鍗�</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          icon="el-icon-download"
-          style="margin-left: 10px"
-          @click="addMateriel">閫夊叆鐗╂枡</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          icon="el-icon-download"
-          style="margin-left: 10px"
-          @click="saveMateriel">淇濆瓨</el-button>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">鏌ヨ</el-button>
+        <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">鍒涘缓閲囪喘鍗�</el-button>
+        <el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">淇濆瓨</el-button>
       </div>
       <el-table v-loading="" :data="tableData2" border style="max-height: 460px;" height="230px" size="mini" highlight-current-row @row-click="searchTable3">
         <el-table-column label="鍗曞彿鐘舵��" align="center" width="100" fixed="left">
@@ -161,9 +134,14 @@
           @current-change="handleCurrentChange2"/>
       </div>
       <el-table v-loading="" :data="tableData3" border style="max-height: 300px;" height="300px" size="mini">
-        <el-table-column label="闆朵欢鍥惧彿" align="center" min-width="150">
+        <el-table-column label="鐗╂枡缂栫爜" align="center" min-width="150">
           <template slot-scope="scope">
-            {{ scope.row.闆朵欢鍥惧彿 }}
+            {{ scope.row.鐗╂枡闆朵欢缂栫爜 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="鍘熸潗鏂欏悕绉�" align="center" min-width="150">
+          <template slot-scope="scope">
+            {{ scope.row.鍘熸潗鏂欏悕绉� }}
           </template>
         </el-table-column>
         <el-table-column label="闆朵欢鍚嶇О" align="center" min-width="150">
@@ -176,11 +154,6 @@
             {{ scope.row.鏉愭枡 }}
           </template>
         </el-table-column>
-        <el-table-column label="鍗曚綅" align="center" min-width="100">
-          <template slot-scope="scope">
-            <el-input v-model="scope.row.鍗曚綅" :disabled="disable" size="mini" style="width:70px"/>
-          </template>
-        </el-table-column>
         <el-table-column label="鏁伴噺" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.鎵规鏁伴噺 }}
@@ -414,8 +387,9 @@
   </div>
 </template>
 
-<script>import { initPartDrawing, searchPurchasedMaterials, searchPurchaseOrder, searchSupplier, addPurchaseOrder, editPurchaseOrder, deletePurchaseOrder, searchMateriel,
-  addMateriel, deleteMateriel, saveMateriel } from '@/api/WorkshopProcurement/CreatingPurchasingMaterials'
+<script>
+import { initPartDrawing, searchPurchasedMaterials, searchPurchaseOrder, searchSupplier, addPurchaseOrder, editPurchaseOrder, deletePurchaseOrder, searchMateriel,
+  addMateriel, deleteMateriel, saveMateriel, searchRawMaterial, addMateriel2 } from '@/api/WorkshopProcurement/CreatingPurchasingMaterials'
 import QRCode from 'qrcode'
 import $ from 'jquery'
 import { mapGetters } from 'vuex'
@@ -423,10 +397,14 @@ export default {
   name: '', // 閲囪喘璁″垝
   data() {
     return {
-      partDrawingNumberValue: '',
-      partDrawingNumber: [],
+      RawMaterialGroup: [],
+      RawMaterialName: '',
+      tableData: [],
+      pageCurrent: 1,
+      pageSize: 10,
+      total: null,
+      partDrawingNumber: '',
       Buyer: '',
-      showMaterialTable: true,
       loading1: false,
       title2: '',
       check1: 0,
@@ -509,11 +487,43 @@ export default {
     ])
   },
   created() {
-    this.fetchData()
+    this.searchRawMaterial()
     this.searchTable1()
     this.searchTable2()
   },
   methods: {
+    // 鑾峰彇鍘熸潗鏂�
+    searchRawMaterial() {
+      searchRawMaterial(this.RawMaterialName, this.pageCurrent, this.pageSize).then(response => {
+        this.tableData = response.data.rows
+        this.total = parseInt(response.data.total)
+      })
+    },
+    addMateriel2() { // 灏嗘潗鏂欓�夊叆璇疯喘鍗�
+      if (!this.purchasingOrderNumber) {
+        this.$message.warning('璇烽�夋嫨閲囪喘鍗�')
+      } else if (this.RawMaterialGroup.length === 0) {
+        this.$message.warning('璇峰嬀閫夊師鏉愭枡')
+      } else {
+        addMateriel2(this.purchasingOrderNumber, this.RawMaterialGroup).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('閫夊叆鎴愬姛')
+            this.searchTable1()
+            this.searchRawMaterial()
+            searchMateriel(this.purchasingOrderNumber).then(response => {
+              this.tableData3 = response.data
+            })
+          } else { this.$message.error('閫夊叆澶辫触') }
+        })
+      }
+    },
+    handleSelectionChange2(val) {
+      this.RawMaterialGroup = []
+      for (let i = 0; i < val.length; i++) {
+        this.RawMaterialGroup.push(val[i].鍘熸潗鏂欐祦姘村彿)
+      }
+    },
+    // ///////////////////////////////////////////////////////////////////////////////////////0529鏂板姞鈫�
     useqrcode(contractNum) {
       const opts = {
         errorCorrectionLevel: 'H',
@@ -540,8 +550,8 @@ export default {
     },
     searchTable1() { // 鏌ヨ澶栬喘澶囨枡
       this.loading1 = true
-      this.partDrawingNumberValue ? this.check1 = 1 : this.check1 = 0
-      searchPurchasedMaterials(this.pageCurrent1, this.pageSize1, this.check1, this.partDrawingNumberValue).then(response => {
+      this.partDrawingNumber ? this.check1 = 1 : this.check1 = 0
+      searchPurchasedMaterials(this.pageCurrent1, this.pageSize1, this.check1, this.partDrawingNumber).then(response => {
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
         this.loading1 = false
@@ -600,7 +610,6 @@ export default {
             } else { this.$message.error('鏂板缓閲囪喘鍗曞け璐�') }
           })
         } else {
-          console.log('error submit!!')
           return false
         }
       })
@@ -620,7 +629,6 @@ export default {
     submitEditPurchaseOrder() {
       this.$refs['form2'].validate((valid) => {
         if (valid) {
-          console.log(this.form2.閲囪喘璁″垝娴佹按鍙�, this.form2.閲囪喘鍗曞悕绉�, this.form2.渚涘簲鍟嗘祦姘村彿, this.form2.璁″垝瀹屾垚鏃ユ湡)
           editPurchaseOrder(this.form2.閲囪喘璁″垝娴佹按鍙�, this.form2.閲囪喘鍗曞悕绉�, this.form2.渚涘簲鍟嗘祦姘村彿, this.form2.璁″垝瀹屾垚鏃ユ湡).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('淇敼閲囪喘鍗曟垚鍔�')
@@ -629,7 +637,6 @@ export default {
             } else { this.$message.error('淇敼閲囪喘鍗曞け璐�') }
           })
         } else {
-          console.log('error submit!!')
           return false
         }
       })
@@ -717,7 +724,6 @@ export default {
       this.璁″垝瀹屾垚鏃ユ湡 = row.璁″垝瀹屾垚鏃ユ湡.split(' ')[0]
       this.涓嬪崟鏃ユ湡 = row.涓嬪崟鏃ユ湡.split(' ')[0]
       searchMateriel(this.purchasingOrderNumber).then(response => {
-        console.log(response.data)
         this.tableData3 = response.data
       })
     },
@@ -773,7 +779,6 @@ export default {
         cancelButtonText: '鍙栨秷',
         type: 'warning'
       }).then(() => {
-        console.log(row)
         deleteMateriel(row.閲囪喘璁″垝鏄庣粏娴佹按鍙�, row.宸ヨ壓璁″垝娴佹按鍙�).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('绉婚櫎鎴愬姛')
@@ -807,7 +812,6 @@ export default {
         body.children().not('#app').hide()
         printNode.remove()
       }).catch(res => {
-        console.log(res)
         this.$message({
           type: 'info',
           message: '宸插彇娑堟搷浣�'
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
index 3d192ba5..03f99822 100644
--- a/src/views/layout/components/AppMain.vue
+++ b/src/views/layout/components/AppMain.vue
@@ -3,9 +3,9 @@
     <transition name="fade-transform" mode="out-in">
       <!-- or name="fade" -->
       <!-- <router-view :key="key"></router-view> -->
-      <!--<keep-alive>-->
-      <router-view/>
-      <!--</keep-alive>-->
+      <keep-alive>
+        <router-view/>
+      </keep-alive>
     </transition>
   </section>
 </template>