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/Assembly/AssemblyExecution.js b/src/api/Assembly/AssemblyExecution.js
new file mode 100644
index 00000000..f7eff3e2
--- /dev/null
+++ b/src/api/Assembly/AssemblyExecution.js
@@ -0,0 +1,87 @@
+import request from '@/utils/request'
+// 鍒濆鍖栨満搴婇」鐩�
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_椤圭洰鍚嶇О_鏌ヨ鏁版嵁'
+    }
+  })
+}
+// 缁勪欢鏌ヨ
+export function searchgroup(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_缁勪欢鍚嶇О_鏌ヨ鏁版嵁',
+      param: '鏈哄簥娴佹按鍙�=' + num
+    }
+  })
+}
+// 鏈哄簥鏌ヨ
+export function searchTable1(machineNumberValue, check2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '杞﹂棿瑁呴厤绠＄悊_鏈哄簥淇℃伅_鏌ヨ鏁版嵁',
+      param: '鏈哄簥娴佹按鍙穇check=' + check2 + '&鏈哄簥娴佹按鍙�=' + machineNumberValue
+    }
+  })
+}
+// 缁勪欢鏌ヨ
+export function searchTable2(machineNumberValue, check2, groupNumberValue, check3) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '杞﹂棿绠＄悊_鍩烘湰浠堕噰璐璤鏌ヨ鏁版嵁',
+      param: '鏈哄簥娴佹按鍙穇check=' + check2 + '&鏈哄簥娴佹按鍙�=' + machineNumberValue + '&缁勪欢娴佹按鍙穇check=' + check3 + '&缁勪欢娴佹按鍙�=' + groupNumberValue
+    }
+  })
+}
+// 鏈哄簥鍚嶇О_鏈哄簥鐘舵�乢淇敼鏁版嵁
+export function MachineToolStateUpdate(machineNumberValue, check) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_鏈哄簥鍚嶇О_鏈哄簥鐘舵�乢淇敼鏁版嵁',
+      param: '鏈哄簥娴佹按鍙�=' + machineNumberValue + '&瑁呴厤鐘舵��=' + check
+    }
+  })
+}
+
+// 鏈哄簥鍚嶇О_璋冭瘯鐘舵�乢淇敼鏁版嵁
+export function DebugStatusUpdate(machineNumberValue, check) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_鏈哄簥鍚嶇О_璋冭瘯鐘舵�乢淇敼鏁版嵁',
+      param: '鏈哄簥娴佹按鍙�=' + machineNumberValue + '&璋冭瘯鐘舵��=' + check
+    }
+  })
+}
+
+// 缁勪欢鍚嶇О_缁勪欢鐘舵�乢淇敼鏁版嵁
+export function ComponentStateUpdate(machineNumberValue, check) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_缁勪欢鍚嶇О_缁勪欢鐘舵�乢淇敼鏁版嵁',
+      param: '缁勪欢娴佹按鍙�=' + machineNumberValue + '&缁勪欢鏄惁瀹屾垚=' + check
+    }
+  })
+}
+
diff --git a/src/api/Assembly/DeliveryApplication.js b/src/api/Assembly/DeliveryApplication.js
new file mode 100644
index 00000000..5d27c1d4
--- /dev/null
+++ b/src/api/Assembly/DeliveryApplication.js
@@ -0,0 +1,38 @@
+import request from '@/utils/request'
+
+// 鍒濆鍖栨満搴婇」鐩�
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_椤圭洰鍚嶇О_鏌ヨ鏁版嵁'
+    }
+  })
+}
+// PDM_鏈哄簥鍚嶇О_鍙戣揣鐘舵�乢鏌ヨ鏁版嵁
+export function selecttable(check2, machineNumberValue) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_鏈哄簥鍚嶇О_鍙戣揣鐘舵�乢鏌ヨ鏁版嵁',
+      param: '鏈哄簥娴佹按鍙穇check=' + check2 + '&鏈哄簥娴佹按鍙�=' + machineNumberValue
+    }
+  })
+}
+// PDM_鏈哄簥鍚嶇О_鍙戣揣鐘舵�乢缂栬緫鏁版嵁
+export function updatestate(machineNumberValue, state) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_鏈哄簥鍚嶇О_鍙戣揣鐘舵�乢缂栬緫鏁版嵁',
+      param: '鏈哄簥娴佹按鍙�=' + machineNumberValue + '&鍙戣揣鐘舵��=' + state
+    }
+  })
+}
+
diff --git a/src/api/Assembly/QualityInspectionInformationInquiry.js b/src/api/Assembly/QualityInspectionInformationInquiry.js
new file mode 100644
index 00000000..615372cc
--- /dev/null
+++ b/src/api/Assembly/QualityInspectionInformationInquiry.js
@@ -0,0 +1,49 @@
+import request from '@/utils/request'
+
+// 鍒濆鍖栨満搴婇」鐩�
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_椤圭洰鍚嶇О_鏌ヨ鏁版嵁'
+    }
+  })
+}
+// 鍒濆鍖栬川妫�绫诲瀷
+export function QualityType() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '璐ㄩ噺绠＄悊_璐ㄦ绫诲瀷_鏌ヨ鏁版嵁'
+    }
+  })
+}
+// 缁勪欢鏌ヨ
+export function searchgroup(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_缁勪欢鍚嶇О_鏌ヨ鏁版嵁',
+      param: '鏈哄簥娴佹按鍙�=' + num
+    }
+  })
+}
+// 缁勪欢鏌ヨ
+export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '璐ㄩ噺绠＄悊_璐ㄩ噺鎯呭喌_鏌ヨ鏁版嵁',
+      param: '鏈哄簥娴佹按鍙穇check=' + check1 + '&鏈哄簥娴佹按鍙�=' + value1 + '&缁勪欢娴佹按鍙穇check=' + check2 + '&缁勪欢娴佹按鍙�=' + value2 + '&闆朵欢鍚嶇О_check=' + check3 + '&闆朵欢鍚嶇О=' + value3 + '&璐ㄦ绫诲瀷浠ｇ爜_check=' + check4 + '&璐ㄦ绫诲瀷浠ｇ爜=' + value4
+    }
+  })
+}
+
diff --git a/src/api/ManufacturingCenter/CreateIntakeList.js b/src/api/ManufacturingCenter/CreateIntakeList.js
new file mode 100644
index 00000000..3df2e2fb
--- /dev/null
+++ b/src/api/ManufacturingCenter/CreateIntakeList.js
@@ -0,0 +1,148 @@
+import request from '@/utils/request'
+
+// 鍒涘缓棰嗘枡鍗�
+export function addList(peopleNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '杞﹂棿鐢熶骇绠＄悊宸ヨ壓_澶囨枡绠＄悊_棰嗘枡鍗曞鍔�',
+      param: '棰嗘枡浜烘祦姘村彿=' + peopleNumber
+    }
+  })
+}
+// 棰嗘枡鍗曟煡璇�
+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 dropListDetailBasic(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '杞﹂棿鐢熶骇绠＄悊宸ヨ壓_澶囨枡绠＄悊_澶囨枡棰嗘枡鍗曟槑缁嗙Щ闄�',
+      param: `澶囨枡棰嗘枡鍗曟槑缁嗘祦姘村彿=${params[0]}&鏄惁澶栬喘=${params[1]}&宸ヨ壓璁″垝娴佹按鍙�=${params[2]}`
+    }
+  })
+}
+// 鍒濆鍖栭」鐩�
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '杞﹂棿鐢熶骇绠＄悊宸ヨ壓_椤圭洰鏌ヨ'
+    }
+  })
+}
+// 鏈哄簥鏌ヨ
+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 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 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 addBasicList(listNumber, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '杞﹂棿鐢熶骇绠＄悊宸ヨ壓_澶囨枡绠＄悊_鑷澶囨枡閫夊叆',
+      param: '澶囨枡棰嗘枡鍗曟祦姘村彿=' + listNumber + '&宸ヨ壓璁″垝娴佹按鍙�=' + num1
+    }
+  })
+}
+// 澶栬喘澶囨枡閫夊叆
+export function addPurchaseList(listNumber, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '杞﹂棿鐢熶骇绠＄悊宸ヨ壓_澶囨枡绠＄悊_澶栬喘澶囨枡閫夊叆',
+      param: '澶囨枡棰嗘枡鍗曟祦姘村彿=' + listNumber + '&宸ヨ壓璁″垝娴佹按鍙�=' + num1
+    }
+  })
+}
+// 棰嗘枡鍗曟槑缁嗘煡璇�
+export function searchListDetail(listNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '杞﹂棿鐢熶骇绠＄悊宸ヨ壓_澶囨枡绠＄悊_澶囨枡棰嗘枡鍗曟槑缁嗘煡璇�',
+      param: '澶囨枡棰嗘枡鍗曟祦姘村彿=' + listNumber
+    }
+  })
+}
+// 鍒犻櫎棰嗘枡鍗�
+export function dropList(PickingListNumberx) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '杞﹂棿鐢熶骇绠＄悊宸ヨ壓_澶囨枡绠＄悊_澶囨枡棰嗘枡鍗曞垹闄�',
+      param: '澶囨枡棰嗘枡鍗曟祦姘村彿=' + PickingListNumberx
+    }
+  })
+}
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/ProcessAdjustQuery.js b/src/api/ManufacturingCenter/ProcessAdjustQuery.js
index 151b6d6d..ae7575dd 100644
--- a/src/api/ManufacturingCenter/ProcessAdjustQuery.js
+++ b/src/api/ManufacturingCenter/ProcessAdjustQuery.js
@@ -8,7 +8,7 @@ export function initCraftmen() {
     data: {
       type: '1',
       name: '浜轰簨妗ｆ绠＄悊_浜哄憳_閮ㄩ棬涓庝汉鍛榑鏌ヨ鏁版嵁_鏍规嵁閮ㄩ棬缂栧彿',
-      param: '鑰冩牳閮ㄩ棬缂栧彿=17'
+      param: '鑰冩牳閮ㄩ棬缂栧彿=20'
     }
   })
 }
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/RawMaterialsMaintenance.js b/src/api/ManufacturingCenter/RawMaterialsMaintenance.js
new file mode 100644
index 00000000..e9c8bbb3
--- /dev/null
+++ b/src/api/ManufacturingCenter/RawMaterialsMaintenance.js
@@ -0,0 +1,47 @@
+import request from '@/utils/request'
+
+export function searchTableData(num, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '搴撳瓨绠＄悊_鍘熸潗鏂欏簱瀛樼鐞哶鏌ヨ',
+      param: '鍘熸潗鏂欏悕绉�=' + num,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+export function addData(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '搴撳瓨绠＄悊_鍘熸潗鏂欏簱瀛樼鐞哶鏂板',
+      param: '鍘熸潗鏂欏悕绉�=' + num
+    }
+  })
+}
+export function editData(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '搴撳瓨绠＄悊_鍘熸潗鏂欏簱瀛樼鐞哶缂栬緫',
+      param: '鍘熸潗鏂欐祦姘村彿=' + num1 + '&鍘熸潗鏂欏悕绉�=' + num2
+    }
+  })
+}
+export function deleteCategory(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '搴撳瓨绠＄悊_鍘熸潗鏂欏簱瀛樼鐞哶鍒犻櫎',
+      param: '鍘熸潗鏂欐祦姘村彿=' + num
+    }
+  })
+}
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/ManufacturingCenter/SparePartsPurchase.js b/src/api/ManufacturingCenter/SparePartsPurchase.js
new file mode 100644
index 00000000..e9c8bbb3
--- /dev/null
+++ b/src/api/ManufacturingCenter/SparePartsPurchase.js
@@ -0,0 +1,47 @@
+import request from '@/utils/request'
+
+export function searchTableData(num, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '搴撳瓨绠＄悊_鍘熸潗鏂欏簱瀛樼鐞哶鏌ヨ',
+      param: '鍘熸潗鏂欏悕绉�=' + num,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+export function addData(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '搴撳瓨绠＄悊_鍘熸潗鏂欏簱瀛樼鐞哶鏂板',
+      param: '鍘熸潗鏂欏悕绉�=' + num
+    }
+  })
+}
+export function editData(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '搴撳瓨绠＄悊_鍘熸潗鏂欏簱瀛樼鐞哶缂栬緫',
+      param: '鍘熸潗鏂欐祦姘村彿=' + num1 + '&鍘熸潗鏂欏悕绉�=' + num2
+    }
+  })
+}
+export function deleteCategory(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '搴撳瓨绠＄悊_鍘熸潗鏂欏簱瀛樼鐞哶鍒犻櫎',
+      param: '鍘熸潗鏂欐祦姘村彿=' + num
+    }
+  })
+}
diff --git a/src/api/PurchasingCenter/InvoiceSettlementApprove.js b/src/api/PurchasingCenter/InvoiceSettlementApprove.js
index 15f3e5ac..650d34d5 100644
--- a/src/api/PurchasingCenter/InvoiceSettlementApprove.js
+++ b/src/api/PurchasingCenter/InvoiceSettlementApprove.js
@@ -8,7 +8,7 @@ export function searchTable1(...group) {
     data: {
       type: '1',
       name: '閲囪喘绠＄悊_鍙戠エ缁撶畻鐢宠鍗昣鏌ヨ鏁版嵁',
-      param: `鏃堕棿娈礯check=${group[0]}&寮�濮嬫棩鏈�=${group[1]}&缁撴潫鏃ユ湡=${group[2]}&鏄惁鎻愪氦=1`,
+      param: `鏃堕棿娈礯check=${group[0]}&寮�濮嬫棩鏈�=${group[1]}&缁撴潫鏃ユ湡=${group[2]}&鏄惁鎻愪氦=1&瑙掕壊缂栧彿=${group[5]}`,
       Pagination: group[3] + '&' + group[4]
     }
   })
diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/api/PurchasingCenter/OfflineContract.js
index a47cae3e..0cd9792f 100644
--- a/src/api/PurchasingCenter/OfflineContract.js
+++ b/src/api/PurchasingCenter/OfflineContract.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 鏌ヨ搴撳瓨鏁�
+// 璇环鐘舵�佷慨鏀�
 export function changeInquiryStatus(num) {
   return request({
     url: '',
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/icons/svg/FundApproval2workshop.svg b/src/icons/svg/FundApproval2workshop.svg
new file mode 100644
index 00000000..5e6226be
--- /dev/null
+++ b/src/icons/svg/FundApproval2workshop.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1540798965773" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3335" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M 929.1 736.8 c 0 -17.4 -14.1 -31.6 -31.6 -31.6 H 163.1 V 128.4 c 0 -17.4 -14.1 -31.6 -31.6 -31.6 h -1.9 C 112.2 96.9 98 111 98 128.4 v 639.9 h 799.5 c 17.5 0.1 31.6 -14.1 31.6 -31.5 Z M 929.3 825.5 h -64 V 866 l -63.5 -0.1 v -40.4 h -64 v 40.4 l -63.7 -0.1 V 826 h -64 v 39.8 h -64.3 v -39.3 h -64 v 39.2 h -63.7 v -39.2 h -64 v 39.1 h -63.8 v -40.1 h -64 v 40.1 h -64 V 826 H 98 v 100.8 h 831.1 v -37.3 h 0.2 Z" p-id="3336"></path><path d="M 414.4 631.7 c 3.9 3.6 8.9 5.5 14.1 5.5 c 0.8 0 1.6 0 2.4 -0.1 h 0.4 l 145.1 -22.7 l 330.1 -347.5 c 10.6 -10.7 16.5 -25.5 16.1 -40.5 c -0.3 -15.1 -6.8 -29.6 -17.9 -39.9 l -74.6 -71.9 c -10.1 -9.4 -22.1 -14.3 -34.7 -14.3 c -14.8 0 -29.4 7 -41.1 19.7 L 422.4 469 l -14.7 145.3 l -0.1 0.7 v 0.4 c -0.2 6.1 2.2 12 6.8 16.3 Z M 795 158.6 h 0.3 l 71.2 68.8 v 0.3 l -14.1 15.2 l -71.4 -69.1 l 14 -15.2 Z M 476.5 493.2 L 742.7 215 l 71.5 69.2 l -266.1 278.1 l -82.9 13.6 l 11.3 -82.7 Z" p-id="3337"></path></svg>
\ No newline at end of file
diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue
new file mode 100644
index 00000000..a661d266
--- /dev/null
+++ b/src/views/Assembly/AssemblyExecution/index.vue
@@ -0,0 +1,229 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <el-row>
+        <span>鏈哄簥缂栧彿:</span>
+        <el-select v-model="machineNumberValue" filterable placeholder="鏈哄簥缂栧彿" size="small" clearable @change="searchTable1();searchTable2()">
+          <el-option
+            v-for="item in machineNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+          </el-option>
+        </el-select>
+        <!--        <span>缁勫彿:</span>-->
+        <!--        <el-select v-model="groupNumberValue" filterable placeholder="缁勫彿" size="small" clearable @change="searchTable2()">-->
+        <!--          <el-option-->
+        <!--            v-for="item in groupNumber"-->
+        <!--            :key="item.value"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value"/>-->
+        <!--        </el-select>-->
+        <!--        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable1();searchTable2()">鏌ヨ</el-button>-->
+      </el-row>
+    </el-card>
+    <el-card>
+      <h3 style="text-align: center;">鎬昏璋冭瘯</h3>
+      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="100px">
+        <el-table-column label="椤圭洰鍚嶇О" align="center">
+          <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="鏈哄簥鍚嶇О" align="center">
+          <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="鎿嶄綔" align="center" width="250px" fixed="right">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.瑁呴厤鐘舵��===null || scope.row.瑁呴厤鐘舵��===0" type="success" size="small" @click="handlestart_1(scope.row)">寮�濮嬭閰�</el-button>
+            <el-button v-else-if="scope.row.瑁呴厤鐘舵��===1" type="danger" size="small" @click="handleend_1(scope.row)">缁撴潫瑁呴厤</el-button>
+            <el-button v-else type="info" size="small" >瑁呴厤瀹屾垚</el-button>
+            <el-button v-if="scope.row.璋冭瘯鐘舵��===null || scope.row.璋冭瘯鐘舵��===0" type="success" size="small" @click="handlestart_2(scope.row)">寮�濮嬭皟璇�</el-button>
+            <el-button v-else-if="scope.row.璋冭瘯鐘舵��==1" type="danger" size="small" @click="handleend_2(scope.row)">缁撴潫璋冭瘯</el-button>
+            <el-button v-else type="info" size="small" >璋冭瘯瀹屾垚</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-card>
+      <h3 style="text-align: center;">閮ㄨ</h3>
+      <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
+        <el-table-column label="椤圭洰鍚嶇О" align="center">
+          <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="鏈哄簥鍚嶇О" align="center">
+          <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="缁勪欢鍚嶇О" align="center">
+          <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="鎿嶄綔" align="center" width="250px" fixed="right">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.缁勪欢鏄惁瀹屾垚===null || scope.row.缁勪欢鏄惁瀹屾垚===0" type="success" size="small" @click="handlestart_3(scope.row)">寮�濮嬭閰�</el-button>
+            <el-button v-else-if="scope.row.缁勪欢鏄惁瀹屾垚===1" type="danger" size="small" @click="handleend_3(scope.row)">缁撴潫瑁呴厤</el-button>
+            <el-button v-else type="info" size="small" >瑁呴厤瀹屾垚</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { initProject, searchgroup, searchTable1, searchTable2, MachineToolStateUpdate, DebugStatusUpdate, ComponentStateUpdate } from '@/api/Assembly/AssemblyExecution'
+// import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      machineNumberValue: '',
+      machineNumber: [],
+      groupNumberValue: '',
+      groupNumber: [],
+      tableData1: [],
+      tableData2: []
+    }
+  },
+  created() {
+
+  },
+  mounted() {
+    this.initProject()
+  },
+  methods: {
+    initProject() {
+      initProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machineNumber.push({
+            label: response.data[i].鏈哄簥鍥惧彿,
+            name: response.data[i].椤圭洰鍚嶇О,
+            value: response.data[i].鏈哄簥娴佹按鍙�
+          })
+        }
+      })
+    },
+    machineChange() {
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      searchgroup(this.machineNumberValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNumber.push({
+            label: response.data[i].缁勫彿,
+            value: response.data[i].缁勪欢娴佹按鍙�
+          })
+        }
+      })
+    },
+    searchTable1() {
+      this.tableData1 = []
+      if (this.machineNumberValue !== '') { this.check2 = 1 } else { this.check2 = 0 }
+      searchTable1(this.machineNumberValue, this.check2).then(response => {
+        this.tableData1 = response.data
+        console.log(response.data, 1111)
+      })
+    },
+    searchTable2() {
+      this.tableData2 = []
+      if (this.machineNumberValue !== '') { this.check2 = 1 } else { this.check2 = 0 }
+      if (this.groupNumberValue !== '') { this.check3 = 1 } else { this.check3 = 0 }
+      searchTable2(this.machineNumberValue, this.check2).then(response => {
+        console.log(response.data, 222)
+        this.tableData2 = response.data
+      })
+    },
+    // 鎬昏寮�濮嬭閰�
+    handlestart_1(row) { // 寮瑰嚭鍗曟嵁缂栬緫
+      console.log(row)
+      MachineToolStateUpdate(row.鏈哄簥娴佹按鍙�, 1).then(response => {
+        console.log(response.data)
+        this.searchTable1()
+        this.searchTable2()
+      })
+    },
+    // 鎬昏缁撴潫瑁呴厤
+    handleend_1(row) { // 寮瑰嚭鍗曟嵁缂栬緫
+      console.log(row)
+      MachineToolStateUpdate(row.鏈哄簥娴佹按鍙�, 2).then(response => {
+        console.log(response.data)
+        this.searchTable1()
+        this.searchTable2()
+      })
+    },
+    // 鎬昏寮�濮嬭皟璇�
+    handlestart_2(row) { // 寮瑰嚭鍗曟嵁缂栬緫
+      console.log(row)
+      DebugStatusUpdate(row.鏈哄簥娴佹按鍙�, 1).then(response => {
+        console.log(response.data)
+        this.searchTable1()
+        this.searchTable2()
+      })
+    },
+    // 鎬昏缁撴潫璋冭瘯
+    handleend_2(row) { // 寮瑰嚭鍗曟嵁缂栬緫
+      console.log(row)
+      DebugStatusUpdate(row.鏈哄簥娴佹按鍙�, 2).then(response => {
+        console.log(response.data)
+        this.searchTable1()
+        this.searchTable2()
+      })
+    },
+    // 閮ㄨ寮�濮嬭閰�
+    handlestart_3(row) { // 寮瑰嚭鍗曟嵁缂栬緫
+      console.log(row)
+      ComponentStateUpdate(row.缁勪欢娴佹按鍙�, 1).then(response => {
+        console.log(response.data)
+        this.searchTable1()
+        this.searchTable2()
+      })
+    },
+    // 閮ㄨ缁撴潫瑁呴厤
+    handleend_3(row) { // 寮瑰嚭鍗曟嵁缂栬緫
+      console.log(row)
+      ComponentStateUpdate(row.缁勪欢娴佹按鍙�, 2).then(response => {
+        console.log(response.data)
+        this.searchTable1()
+        this.searchTable2()
+      })
+    }
+  }
+}
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/Assembly/DeliveryApplication/index.vue b/src/views/Assembly/DeliveryApplication/index.vue
new file mode 100644
index 00000000..8ed12e58
--- /dev/null
+++ b/src/views/Assembly/DeliveryApplication/index.vue
@@ -0,0 +1,110 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <el-row>
+        <span>鏈哄簥缂栧彿:</span>
+        <el-select v-model="machineNumberValue" filterable placeholder="鏈哄簥缂栧彿" size="small" clearable @change="selecttable()">
+          <el-option
+            v-for="item in machineNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+          </el-option>
+        </el-select>
+<!--        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">鏌ヨ</el-button>-->
+      </el-row>
+    </el-card>
+    <el-card>
+      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="600px">
+        <el-table-column label="椤圭洰鍚嶇О" align="center">
+          <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="鏈哄簥鍚嶇О" align="center">
+          <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="娉ㄦ剰浜嬮」" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.娉ㄦ剰浜嬮」 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="鎿嶄綔" align="center" width="250px" fixed="right">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.鍙戣揣鐘舵��===null || scope.row.鍙戣揣鐘舵��===0" type="success" size="small" @click="handlconfirm(scope.row)">纭鍙戣揣</el-button>
+            <el-button v-else-if="scope.row.鍙戣揣鐘舵��===1" type="danger" size="small">寰�  瀹℃壒</el-button>
+            <el-button v-else type="info" size="small" >宸插鎵�</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { initProject, selecttable, updatestate } from '@/api/Assembly/DeliveryApplication'
+// import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      machineNumberValue: '',
+      machineNumber: [],
+      groupNumberValue: '',
+      groupNumber: [],
+      tableData1: [],
+      tableData2: []
+    }
+  },
+  created() {
+
+  },
+  mounted() {
+    this.initProject()
+  },
+  methods: {
+    initProject() {
+      initProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machineNumber.push({
+            label: response.data[i].鏈哄簥鍥惧彿,
+            name: response.data[i].椤圭洰鍚嶇О,
+            value: response.data[i].鏈哄簥娴佹按鍙�
+          })
+        }
+      })
+    },
+    selecttable() {
+      this.tableData1 = []
+      if (this.machineNumberValue !== '') { this.check2 = 1 } else { this.check2 = 0 }
+      selecttable(this.check2, this.machineNumberValue).then(response => {
+        this.tableData1 = response.data
+        console.log(response.data)
+      })
+    },
+    handlconfirm(row) {
+      updatestate(row.鏈哄簥娴佹按鍙�, 1).then(response => {
+        this.selecttable()
+      })
+    }
+  }
+}
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
new file mode 100644
index 00000000..c91260a6
--- /dev/null
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -0,0 +1,180 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <el-row>
+        <span>鏈哄簥缂栧彿:</span>
+        <el-select v-model="machineNumberValue" filterable placeholder="鏈哄簥缂栧彿" size="small" clearable @change="machineChange()">
+          <el-option
+            v-for="item in machineNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+          </el-option>
+        </el-select>
+        <span>缁勫彿:</span>
+        <el-select v-model="groupNumberValue" filterable placeholder="缁勫彿" size="small" clearable>
+          <el-option
+            v-for="item in groupNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>璐ㄦ绫诲瀷:</span>
+        <el-select v-model="QualityTypeValue" filterable placeholder="璐ㄦ绫诲瀷" size="small" clearable>
+          <el-option
+            v-for="item in QualityTypeNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>闆朵欢:</span>
+        <el-input v-model="SpareParts" filterable placeholder="璇疯緭鍏ラ浂浠跺悕绉�" style="width: 200px" size="small" clearable/>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">鏌ヨ</el-button>
+      </el-row>
+    </el-card>
+    <el-card>
+      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="600px">
+        <el-table-column label="椤圭洰鍚嶇О" align="center">
+          <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="鏈哄簥鍚嶇О" align="center">
+          <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="闆朵欢鍥惧彿" align="center">
+          <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="璐ㄦ绫诲瀷" align="center">
+          <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="涓嶅悎鏍兼暟閲�" align="center">
+          <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="澶勭悊缁撴灉" align="center">
+          <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>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { initProject, searchgroup, selecttable, QualityType } from '@/api/Assembly/QualityInspectionInformationInquiry'
+// import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      machineNumberValue: '',
+      machineNumber: [],
+      groupNumberValue: '',
+      groupNumber: [],
+      QualityTypeNumber: [],
+      QualityTypeValue: '',
+      tableData1: [],
+      SpareParts: ''
+    }
+  },
+  created() {
+
+  },
+  mounted() {
+    this.initProject()
+    this.QualityType()
+  },
+  methods: {
+    initProject() {
+      initProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machineNumber.push({
+            label: response.data[i].鏈哄簥鍥惧彿,
+            name: response.data[i].椤圭洰鍚嶇О,
+            value: response.data[i].鏈哄簥娴佹按鍙�
+          })
+        }
+      })
+    },
+    QualityType() {
+      QualityType().then(response => {
+        console.log(response.data)
+        for (let i = 0; i < response.data.length; i++) {
+          this.QualityTypeNumber.push({
+            label: response.data[i].璐ㄦ绫诲瀷,
+            value: response.data[i].璐ㄦ绫诲瀷浠ｇ爜
+          })
+        }
+      })
+    },
+    machineChange() {
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      searchgroup(this.machineNumberValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNumber.push({
+            label: response.data[i].缁勫彿,
+            value: response.data[i].缁勪欢娴佹按鍙�
+          })
+        }
+      })
+    },
+    selecttable() {
+      this.tableData1 = []
+      if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check1 = 1 } else { this.check1 = 0 }
+      if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
+      if (this.SpareParts !== '' && this.SpareParts !== null) { this.check3 = 1 } else { this.check3 = 0 }
+      if (this.QualityTypeValue !== '' && this.QualityTypeValue !== null) { this.check4 = 1 } else { this.check4 = 0 }
+      selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue).then(response => {
+        this.tableData1 = response.data
+        console.log(response.data, 1111)
+      })
+    }
+  }
+}
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/ManufacturingCenter/CreateIntakeList/index.vue b/src/views/ManufacturingCenter/CreateIntakeList/index.vue
new file mode 100644
index 00000000..d197dce1
--- /dev/null
+++ b/src/views/ManufacturingCenter/CreateIntakeList/index.vue
@@ -0,0 +1,507 @@
+<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-column v-if="true" label="鎿嶄綔" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button size="mini" type="danger" icon="el-icon-delete" @click="dropListinfor(scope.row)">鍒犻櫎</el-button>
+          </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">
+            <el-tag v-if="scope.row.鏄惁澶栬喘===1">澶栬喘</el-tag>
+            <el-tag v-else>鑷</el-tag>
+          </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 v-if="true" label="鎿嶄綔" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button 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-show="false" 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" min-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 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="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" align="center">
+            {{ 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="100">
+          <template slot-scope="scope" align="center">
+            <el-button 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="PageCurrent2"
+          :page-sizes="[10, 20, 30, 40]"
+          :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 { initProject, searchmachine, searchTeam, searchPurchasePart, searchBasicPart,
+  searchList, addList, dropList, searchListDetail, dropListDetailBasic, addBasicList, addPurchaseList } from '@/api/ManufacturingCenter/CreateIntakeList'
+import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      listLoading0: false, // 棰嗘枡鍗�
+      listLoading1: false, // 鑷埗浠�
+      listLoading2: false, // 閲囪喘閮ㄩ噰璐欢
+      PageCurrent0: 1,
+      PageSize0: 10,
+      total0: 0,
+      PageCurrent1: 1,
+      PageSize1: 10,
+      total1: 0,
+      PageCurrent2: 1,
+      PageSize2: 10,
+      total2: 0,
+      ProjectValue: '',
+      Project: [],
+      ProjectValue_check: 0,
+      MachineValue: '',
+      Machine: [],
+      MachineValue_check: 0,
+      GroupNumValue: '',
+      GroupNum: [],
+      GroupNumValue_check: 0,
+      tableData1: [], // 棰嗘枡鍗�
+      tableDataPicking: [], // 棰嗘枡鍗曟槑缁�
+      tableDataBasic: [], // 鑷埗浠�
+      tableDataPurchase: [], // 閲囪喘閮ㄩ噰璐欢
+      tableDataBacklog: [], // 婊炶揣浠�
+      tableDataHouse: [], // 杞﹂棿閲囪喘浠�
+      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()
+    this.searchMachine()
+  },
+  methods: {
+    // 鍒涘缓棰嗘枡鍗�
+    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('宸插彇娑堟搷浣�')
+      })
+    },
+    // 鏌ヨ棰嗘枡鍗�
+    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()
+    },
+    // 閫夋嫨棰嗘枡鍗�
+    chooseListinfor(row) {
+      this.pickingListNumberx = row.澶囨枡棰嗘枡鍗曟祦姘村彿
+      // this.pickingListNumber = row.棰嗘枡鍗曠紪鍙�
+      this.searchListDetailt()
+    },
+    // 鏌ヨ棰嗘枡鍗曟槑缁�
+    searchListDetailt() {
+      searchListDetail(this.pickingListNumberx).then(response => {
+        this.tableDataPicking = response.data
+      })
+    },
+    // 绉婚櫎
+    dropListdetail(row) {
+      this.$confirm('纭绉婚櫎璇ラ浂浠�?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        dropListDetailBasic(row.澶囨枡棰嗘枡鍗曟槑缁嗘祦姘村彿, row.鏄惁澶栬喘, 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: '宸插彇娑堝垹闄�'
+        })
+      })
+    },
+    // 鍒濆鍖栭」鐩�,鑾峰彇浜哄憳缂栧彿
+    fetchData() {
+      this.getSelect(initProject, ['椤圭洰鍚嶇О', '椤圭洰娴佹按鍙�'], 'Project') // 椤圭洰鍚嶇О
+      this.picikingPeople = this.id
+    },
+    // 鏌ヨ鏈哄簥
+    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() {
+      if (this.MachineValue) {
+        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].缁勪欢娴佹按鍙�
+            })
+          }
+        })
+      } else {
+        this.GroupNumValue = ''
+        this.GroupNum = []
+      }
+    },
+    // 鏍规嵁椤圭洰鏈哄簥鍒嗙粍鏌ラ浂浠�/鐗╂枡
+    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() // 閲囪喘閮ㄩ噰璐欢
+    },
+    // 鍒犻櫎棰嗘枡鍗�
+    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: '宸插彇娑堝垹闄�'
+        })
+      })
+    },
+    // 鏌ヨ鑷澶囨枡
+    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 => {
+        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 => {
+        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()
+    },
+    // 鑷澶囨枡棰嗘枡
+    addBasicList(row) {
+      addBasicList(this.pickingListNumberx, row.宸ヨ壓璁″垝娴佹按鍙�).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('鍒犻櫎鎴愬姛')
+          this.searchListDetailt()
+          this.searchPartinfo()
+        } else {
+          this.$message.error('鏁版嵁鍗犵敤')
+        }
+      })
+    },
+    // 澶栬喘澶囨枡棰嗘枡
+    addPurchaseList(row) {
+      addPurchaseList(this.pickingListNumberx, row.宸ヨ壓璁″垝娴佹按鍙�).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('鍒犻櫎鎴愬姛')
+          this.searchListDetailt()
+          this.searchPartinfo()
+        } 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/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index cab4d0d6..d0cb1f1c 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -285,6 +285,13 @@
             {{ scope.row.鏈哄簥涓荤 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="瑁呴厤鐘舵��">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.瑁呴厤鐘舵��===null || scope.row.瑁呴厤鐘舵��===0" type="success" size="small">鏈閰�</el-tag>
+            <el-tag v-else-if="scope.row.瑁呴厤鐘舵��===1" type="danger" size="small" >瑁呴厤涓�</el-tag>
+            <el-tag v-else type="info" size="small" >瑁呴厤瀹屾垚</el-tag>
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination
@@ -329,9 +336,11 @@
             {{ scope.row.缁勪欢鍚嶇О }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="缁勪欢浠嬬粛">
+        <el-table-column align="center" label="瑁呴厤鐘舵��">
           <template slot-scope="scope">
-            {{ scope.row.缁勪欢浠嬬粛 }}
+            <el-tag v-if="scope.row.缁勪欢鏄惁瀹屾垚===null || scope.row.缁勪欢鏄惁瀹屾垚===0" type="success" size="small">鏈閰�</el-tag>
+            <el-tag v-else-if="scope.row.缁勪欢鏄惁瀹屾垚===1" type="danger" size="small" >瑁呴厤涓�</el-tag>
+            <el-tag v-else type="info" size="small" >瑁呴厤瀹屾垚</el-tag>
           </template>
         </el-table-column>
       </el-table>
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/ProcessAdjustQuery/index.vue b/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue
index 372a510d..1a2f5e0f 100644
--- a/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue
@@ -10,14 +10,13 @@
           :value="item.value"/>
       </el-select>
       <span>闆朵欢鍥惧彿:</span>
-      <el-select v-model="partNumValue" filterable placeholder="闆朵欢鍥惧彿" style="margin-right: 10px" size="small" clearable @clear="returnDate = ''">
+      <el-select v-model="partNumValue" filterable placeholder="闆朵欢鍥惧彿" style="margin-right: 10px" size="small" @change="tableData1=[];tableData2=[];returnDate = '';searchData();">
         <el-option
           v-for="item in partNum"
           :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="searchData()">鏌ヨ</el-button>
       <span>鎵撳洖鏃堕棿:</span>
       <el-date-picker v-model="returnDate" :clearable="false" type="datetime" placeholder="鎵撳洖鏃堕棿" size="small" readonly/>
     </el-card>
@@ -219,15 +218,11 @@ export default {
     tableRowClassName2({ row }) {
       for (let i = 0; i < this.tableData1.length; i++) {
         row.宸ヨ壓缂栧彿 === null ? row.宸ヨ壓缂栧彿 = 0 : row.宸ヨ壓缂栧彿
-        if (this.tableData1[i].宸ュ簭娴佹按鍙� === row.宸ュ簭娴佹按鍙� && this.tableData1[i].宸ヨ壓缂栧彿 !== null) {
+        if (this.tableData1[i].宸ュ簭椤哄簭 === row.宸ュ簭椤哄簭) {
           if (this.tableData1[i].宸ヨ壓缂栧彿 !== row.宸ヨ壓缂栧彿 || this.tableData1[i].宸ヨ壓瑕佹眰 !== row.宸ヨ壓瑕佹眰 || this.tableData1[i].宸ヨ壓闅惧害绛夌骇 !== row.宸ヨ壓闅惧害绛夌骇) {
             return 'change'
           } else {
-            if (this.tableData1[i].宸ュ簭椤哄簭 !== row.宸ュ簭椤哄簭 && (row.宸ヨ壓瑕佹眰 || row.宸ヨ壓闅惧害绛夌骇)) {
-              return 'change'
-            } else {
-              return ''
-            }
+            return ''
           }
         }
       }
@@ -235,15 +230,11 @@ export default {
     tableRowClassName1({ row }) {
       for (let i = 0; i < this.tableData2.length; i++) {
         row.宸ヨ壓缂栧彿 === null ? row.宸ヨ壓缂栧彿 = 0 : row.宸ヨ壓缂栧彿
-        if (this.tableData2[i].宸ュ簭娴佹按鍙� === row.宸ュ簭娴佹按鍙� && this.tableData2[i].宸ヨ壓缂栧彿 !== null) {
+        if (this.tableData2[i].宸ュ簭椤哄簭 === row.宸ュ簭椤哄簭) {
           if (this.tableData2[i].宸ヨ壓缂栧彿 !== row.宸ヨ壓缂栧彿 || this.tableData2[i].宸ヨ壓瑕佹眰 !== row.宸ヨ壓瑕佹眰 || this.tableData2[i].宸ヨ壓闅惧害绛夌骇 !== row.宸ヨ壓闅惧害绛夌骇) {
             return 'change'
           } else {
-            if (this.tableData1[i].宸ュ簭椤哄簭 !== row.宸ュ簭椤哄簭 && (row.宸ヨ壓瑕佹眰 || row.宸ヨ壓闅惧害绛夌骇)) {
-              return 'change'
-            } else {
-              return ''
-            }
+            return ''
           }
         }
       }
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/RawMaterialsMaintenance/index.vue b/src/views/ManufacturingCenter/RawMaterialsMaintenance/index.vue
new file mode 100644
index 00000000..198186ba
--- /dev/null
+++ b/src/views/ManufacturingCenter/RawMaterialsMaintenance/index.vue
@@ -0,0 +1,169 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <el-row>
+        <el-col style="width: 330px">
+          <span style="margin-left: 10px">鍘熸潗鏂欏悕绉�:</span>
+          <el-input v-model="RawMaterialName" placeholder="鍘熸潗鏂欏悕绉�" size="small" clearable/>
+        </el-col>
+        <el-col style="width: 200px">
+          <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;searchTableData()">鏌ヨ</el-button>
+          <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">澧炲姞</el-button>
+        </el-col>
+      </el-row>
+    </el-card>
+
+    <el-card style="margin-top: 15px">
+      <el-table :data="tableData" style="width: 100%;min-height: 500px" height="500" size="mini" highlight-current-row border>
+        <el-table-column align="center" label="鍘熸潗鏂欏悕绉�">
+          <template slot-scope="scope">
+            {{ scope.row.鍘熸潗鏂欏悕绉� }}
+          </template>
+        </el-table-column>
+        <el-table-column label="鎿嶄綔" fixed="right" align="center" width="200">
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" icon="el-icon-edit" @click="handleEdit(scope.row)">缂栬緫</el-button>
+            <el-button size="mini" type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="pageCurrent"
+          :page-sizes="[10, 20, 30, 40, 50]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+
+    <el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="400px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
+        <el-row>
+          <el-form-item label="鍘熸潗鏂欏悕绉�" prop="RawMaterialName">
+            <el-input v-model="form.RawMaterialName" placeholder="鍘熸潗鏂欏悕绉�" size="small" clearable/>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel('form')">鍙栨秷</el-button>
+        <el-button v-show="title==='澧炲姞'" type="primary" @click="submitAdd('form')">纭畾</el-button>
+        <el-button v-show="title==='缂栬緫'" type="primary" @click="submitEdit('form')">纭畾</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { searchTableData, addData, editData, deleteCategory } from '@/api/ManufacturingCenter/RawMaterialsMaintenance'
+
+export default {
+  data() {
+    return {
+      RawMaterialNumber: '',
+      RawMaterialName: '',
+      param: 0,
+      tableData: [],
+      pageCurrent: 1,
+      pageSize: 10,
+      total: null,
+      dialogFormVisible: false,
+      title: '',
+      form: {
+        RawMaterialName: ''
+      },
+      rules: {
+        RawMaterialName: [{ required: true, message: '璇疯緭鍏ョ墿鏂欏悕绉�', trigger: 'blur' }]
+      }
+    }
+  },
+  created() {
+    this.searchTableData()
+  },
+  methods: {
+    // 鑾峰彇鍘熸潗鏂�
+    searchTableData() {
+      searchTableData(this.RawMaterialName, this.pageCurrent, this.pageSize).then(response => {
+        this.tableData = response.data.rows
+        this.total = parseInt(response.data.total)
+      })
+    },
+    // 澧炲姞
+    handleAdd() {
+      this.addForm('form', [this.dialogFormVisible = true, this.title = '澧炲姞'])
+    },
+    // 鎻愪氦澧炲姞
+    submitAdd() {
+      this.addTable(addData, [this.form.RawMaterialName], 'form', function() {
+        this.dialogFormVisible = false
+        this.pageCurrent = 1
+        this.searchTableData()
+      })
+    },
+    // 缂栬緫
+    handleEdit(row) {
+      this.editForm(row, 'form', [this.title = '缂栬緫', this.dialogFormVisible = true])
+      this.form.RawMaterialName = row.鍘熸潗鏂欏悕绉�
+      this.RawMaterialNumber = row.鍘熸潗鏂欐祦姘村彿
+    },
+    // 鎻愪氦缂栬緫
+    submitEdit() {
+      this.editTable(editData, [this.RawMaterialNumber, this.form.RawMaterialName], 'form', function() {
+        this.searchTableData()
+        this.dialogFormVisible = false
+      })
+    },
+    // 鍙栨秷
+    cancel() {
+      this.dialogFormVisible = false
+    },
+    handleDelete(row) {
+      this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ヨ, 鏄惁缁х画?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        deleteCategory(row.鍘熸潗鏂欐祦姘村彿).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('鍒犻櫎鎴愬姛')
+            if (this.tableData && this.tableData.length === 1 && this.pageCurrent > 1) { // 鍒ゆ柇鍒犻櫎鐨勬槸鍚︽槸鏈�鍚庝竴椤垫渶鍚庝竴琛岋紝濡傛灉鏄笖涓嶆槸绗竴椤碉紝椤垫暟鍑忎竴
+              this.pageCurrent--
+            }
+            this.searchTableData()
+          } else {
+            this.$message.error('鍒犻櫎澶辫触')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '宸插彇娑堝垹闄�'
+        })
+      })
+    },
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchTableData()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchTableData()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  span {
+    margin: 10px 0px 10px 10px;
+  }
+  .el-select{
+    width:190px
+  }
+  .el-input{
+    width:190px
+  }
+</style>
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/SparePartsPurchase/index.vue b/src/views/ManufacturingCenter/SparePartsPurchase/index.vue
new file mode 100644
index 00000000..aa335836
--- /dev/null
+++ b/src/views/ManufacturingCenter/SparePartsPurchase/index.vue
@@ -0,0 +1,130 @@
+<template>
+  <div class="app-container">
+    <el-card style="margin-top: 5px">
+      <el-row>
+        <el-col :span="7">
+          <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;searchTableData()">鏌ヨ</el-button>
+          <el-table :data="tableData" style="margin-top: 15px;width: 100%" height="500" size="mini" border @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="55"/>
+            <el-table-column align="center" label="鍘熸潗鏂欏悕绉�">
+              <template slot-scope="scope">
+                {{ scope.row.鍘熸潗鏂欏悕绉� }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+        <el-col :span="16" style="margin-left: 20px">
+          <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;searchTableData()">鏌ヨ</el-button>
+          <el-button type="primary" icon="el-icon-circle-plus-outline" size="mini" @click="handleAdd()">澧炲姞</el-button>
+          <el-table :data="tableData" style="margin-top: 15px;width: 100%" height="500" size="mini" highlight-current-row border>
+            <el-table-column align="center" label="鍘熸潗鏂欏悕绉�">
+              <template slot-scope="scope">
+                {{ scope.row.鍘熸潗鏂欏悕绉� }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block" style="margin: 10px;">
+            <el-pagination
+              :current-page="pageCurrent"
+              :page-sizes="[10, 20, 30, 40, 50]"
+              :page-size="pageSize"
+              :total="total"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row style="margin-top: 10px">
+        <el-table :data="tableData" style="width: 100%" height="500" size="mini" highlight-current-row border>
+          <el-table-column align="center" label="鍘熸潗鏂欏悕绉�">
+            <template slot-scope="scope">
+              {{ scope.row.鍘熸潗鏂欏悕绉� }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block" style="margin: 10px;">
+          <el-pagination
+            :current-page="pageCurrent"
+            :page-sizes="[10, 20, 30, 40, 50]"
+            :page-size="pageSize"
+            :total="total"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"/>
+        </div>
+      </el-row>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { searchTableData } from '@/api/ManufacturingCenter/SparePartsPurchase'
+
+export default {
+  data() {
+    return {
+      RawMaterialNumber: '',
+      RawMaterialName: '',
+      param: 0,
+      tableData: [],
+      pageCurrent: 1,
+      pageSize: 10,
+      total: null,
+      dialogFormVisible: false,
+      title: '',
+      form: {
+        RawMaterialName: ''
+      },
+      rules: {
+        RawMaterialName: [{ required: true, message: '璇疯緭鍏ョ墿鏂欏悕绉�', trigger: 'blur' }]
+      }
+    }
+  },
+  created() {
+    this.searchTableData()
+  },
+  methods: {
+    // 鑾峰彇鍘熸潗鏂�
+    searchTableData() {
+      searchTableData(this.RawMaterialName, this.pageCurrent, this.pageSize).then(response => {
+        this.tableData = response.data.rows
+        this.total = parseInt(response.data.total)
+      })
+    },
+    // tabledata鍒嗛〉
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchTableData()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchTableData()
+    },
+    // 澶氶��
+    handleSelectionChange(val) {
+      this.materielGroup = []
+      for (let i = 0; i < val.length; i++) {
+        this.materielGroup.push(val[i].鐗╂枡娴佹按鍙�)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+  span {
+    margin: 10px 0px 10px 10px;
+  }
+  .el-select{
+    width:190px
+  }
+  .el-input{
+    width:190px
+  }
+</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/PurchasingCenter/FundApproval2/index.vue b/src/views/PurchasingCenter/FundApproval2/index.vue
index 060db5c8..e7454513 100644
--- a/src/views/PurchasingCenter/FundApproval2/index.vue
+++ b/src/views/PurchasingCenter/FundApproval2/index.vue
@@ -117,9 +117,48 @@
           @current-change="handleCurrentChange2"/>
       </div>
     </el-card>
-    <h3 style="margin-top: 0">閲囪喘鍚堝悓</h3>
-    <div id="print" class="print" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="contractDetail1"/>
-    <h3 style="">绂荤嚎鍚堝悓</h3>
+    <h3 id="firstAnchor" style="margin-top: 0">閲囪喘鍚堝悓</h3>
+    <div id="print" class="print" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="contractDetail1"/><hr>
+    <h3 id="secondAnchor" style="">绂荤嚎鍚堝悓</h3>
+    <div id="offlineContract" style="min-height:500px;margin: 0 auto;width: 800px;border:1px solid black">
+      <table v-show="contractDetail2.length > 0" class="offlineContract" cellspacing="0px" align="center" border="1 solid black" width="100%">
+        <tr>
+          <th colspan="14"><h1>绂荤嚎鍚堝悓</h1></th>
+        </tr>
+        <tr>
+          <td colspan="3" rowspan="2" style="text-align:center;font-size: 30px;font-weight: bold">GAOJING</td>
+          <td width="80px">鍚堝悓鍚嶇О</td>
+          <td id="contractName" colspan="2" style="text-align: left;"/>
+          <td width="80px">渚涘簲鍟�</td>
+          <td id="supplier" colspan="5" style="text-align: left;"/>
+          <td id="qrCode" colspan="2" rowspan="2"/>
+        </tr>
+        <tr>
+          <td width="80px">鍚堝悓缂栧彿</td>
+          <td id="contractNum" colspan="2" style="text-align: left;"/>
+          <td width="80px">閲囪喘鍛�</td>
+          <td id="buyer" colspan="5" style="text-align: left;"/>
+        </tr>
+        <tr id="tablehead">
+          <td width="50px">搴忓彿</td>
+          <td colspan="2">鍚嶇О</td>
+          <td>瑙勬牸</td>
+          <td colspan="2">鍨嬪彿</td>
+          <td>鏁伴噺</td>
+          <td colspan="2">鍗曚环</td>
+          <td colspan="2">鍚堣</td>
+          <td>浜よ揣鏈�</td>
+          <td colspan="2">澶囨敞</td>
+        </tr>
+        <tr>
+          <td>鎬昏</td>
+          <td id="remark" colspan="10"/>
+          <td id="total" colspan="2" style="text-align: left;"/>
+          <td/>
+        </tr>
+      </table>
+    </div>
+    <!--
     <el-table v-loading="" :data="contractDetail2" :summary-method="getSummaries" border style="margin-top:10px;max-height: 500px;" height="500px" size="mini" show-summary>
       <el-table-column label="绂荤嚎鍚堝悓缂栧彿" align="center" min-width="150">
         <template slot-scope="scope">
@@ -167,12 +206,14 @@
         </template>
       </el-table-column>
     </el-table>
+    -->
   </div>
 </template>
 
 <script>
 import { initApproval, execApproval, initApprovalOffline, searchRequsetFundDetail1, searchRequsetFundDetail2, execApprovalOffline, searchContactDetail, searchMateriel } from '@/api/PurchasingCenter/FundApproval'
 import { mapGetters } from 'vuex'
+import $ from 'jquery'
 
 export default {
   name: '', // 绠＄悊瀹℃壒
@@ -204,14 +245,56 @@ export default {
     this.fetchData()
   },
   methods: {
+    showOffline(row) {
+      console.log(row, 222)
+      const children = document.getElementsByClassName('tableData')
+      const parent = document.getElementsByClassName('offlineContract')[0]
+      if (children.length !== 0) {
+        for (let i = children.length - 1; i >= 0; i--) {
+          parent.removeChild(children[i])
+        }
+      }
+      const tr = []
+      let length = 0
+      this.contractDetail2.length < 15 ? length = 15 : length = this.contractDetail2.length
+      for (let i = 0; i < length; i++) {
+        tr[i] = document.createElement('tr')
+        tr[i].setAttribute('class', 'tableData')
+        tr[i].innerHTML = `<td style="height: 40px"/><td colspan="2" style="height: 40px"/><td style="height: 40px"/><td colspan="2" style="height: 40px"/><td style="height: 40px"/><td colspan="2" style="height: 40px"/><td colspan="2" style="height: 40px"/><td style="height: 40px"/><td colspan="2" style="height: 40px"/>`
+        $('#tablehead').after(tr[i])
+      }
+      let total = 0
+      for (let j = 0; j < this.contractDetail2.length; j++) {
+        document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
+        document.getElementsByClassName('tableData')[j].children[1].innerHTML = this.contractDetail2[j].鐗╂枡鍚嶇О
+        document.getElementsByClassName('tableData')[j].children[2].innerHTML = this.contractDetail2[j].鐗╂枡瑙勬牸
+        document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.contractDetail2[j].鐗╂枡鍨嬪彿
+        document.getElementsByClassName('tableData')[j].children[4].innerHTML = this.contractDetail2[j].鏁伴噺
+        document.getElementsByClassName('tableData')[j].children[5].innerHTML = this.contractDetail2[j].鍗曚环
+        document.getElementsByClassName('tableData')[j].children[6].innerHTML = (this.contractDetail2[j].鏁伴噺 * this.contractDetail2[j].鍗曚环).toFixed(2)
+        document.getElementsByClassName('tableData')[j].children[7].innerHTML = this.contractDetail2[j].浜よ揣鏈熻姹�
+        document.getElementsByClassName('tableData')[j].children[8].innerHTML = this.contractDetail2[j].澶囨敞
+        total += Number(this.contractDetail2[j].鏁伴噺 * this.contractDetail2[j].鍗曚环)
+      }
+      total = total.toFixed(2)
+      document.getElementById('contractNum').innerHTML = row.绂荤嚎鍚堝悓缂栧彿
+      document.getElementById('contractName').innerHTML = row.绂荤嚎鍚堝悓鍚嶇О
+      document.getElementById('supplier').innerHTML = row.渚涘簲鍟嗗悕绉�
+      document.getElementById('buyer').innerHTML = row.閲囪喘鍛�
+      document.getElementById('total').innerHTML = total
+      document.getElementById('remark').innerHTML = row.绂荤嚎鍚堝悓澶囨敞
+    },
     searchContactDetail(row) {
+      document.documentElement.scrollTop = this.$el.querySelector('#firstAnchor').offsetTop
       searchContactDetail(row.閲囪喘鍚堝悓娴佹按鍙�).then(response => {
         this.contractDetail1 = response.data[0].鍚堝悓鍐呭
       })
     },
     searchOfflineContactDetail(row) { // 鏌ヨ绂荤嚎鍚堝悓鏄庣粏
+      document.documentElement.scrollTop = this.$el.querySelector('#secondAnchor').offsetTop
       searchMateriel(row.绂荤嚎鍚堝悓娴佹按鍙�).then(response => {
         this.contractDetail2 = response.data
+        this.showOffline(row)
       })
     },
     getSummaries(param) { // 鍚堣
@@ -245,7 +328,6 @@ export default {
     },
     searchTable1() {
       initApproval(this.pageCurrent1, this.pageSize1, 1).then(response => {
-        console.log(response.data)
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
       })
@@ -261,7 +343,6 @@ export default {
     },
     searchTable2() {
       initApprovalOffline(this.pageCurrent2, this.pageSize2, 1).then(response => {
-        console.log(response.data.rows)
         this.tableData2 = response.data.rows
         this.total2 = response.data.total
       })
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
index 0a46f95d..a357d4f7 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
@@ -76,17 +76,17 @@
             {{ scope.row.瀹℃壒1鏃堕棿 ? scope.row.瀹℃壒1鏃堕棿 : '鈥�' }}
           </template>
         </el-table-column>
-        <el-table-column label="璐㈠姟瀹℃壒" align="center" min-width="60">
+        <el-table-column label="鎬荤粡鐞嗗鎵�" align="center" min-width="70">
           <template slot-scope="scope">
-            {{ scope.row.瀹℃壒浜�2濮撳悕 ? scope.row.瀹℃壒浜�2濮撳悕 : '鏈鎵�' }}
+            {{ scope.row.瀹℃壒浜�4濮撳悕 ? scope.row.瀹℃壒浜�4濮撳悕 : '鏈鎵�' }}
           </template>
         </el-table-column>
         <el-table-column label="瀹℃壒鏃堕棿" align="center" min-width="115">
           <template slot-scope="scope">
-            {{ scope.row.瀹℃壒2鏃堕棿 ? scope.row.瀹℃壒2鏃堕棿 : '鈥�' }}
+            {{ scope.row.瀹℃壒4鏃堕棿 ? scope.row.瀹℃壒4鏃堕棿 : '鈥�' }}
           </template>
         </el-table-column>
-        <el-table-column label="鎬荤粡鐞嗗鎵�" align="center" min-width="70">
+        <el-table-column label="璐㈠姟瀹℃壒" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.瀹℃壒浜�3濮撳悕 ? scope.row.瀹℃壒浜�3濮撳悕 : '鏈鎵�' }}
           </template>
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
index 887a1179..bb24fb59 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
@@ -66,7 +66,7 @@
             {{ scope.row.鐢宠鏃堕棿 ? scope.row.鐢宠鏃堕棿 : '鈥�' }}
           </template>
         </el-table-column>
-        <el-table-column label="閲囪喘瀹℃壒" align="center" min-width="60">
+        <el-table-column label="閲囪喘瀹℃壒" align="center" min-width="70">
           <template slot-scope="scope">
             {{ scope.row.瀹℃壒浜�1濮撳悕 ? scope.row.瀹℃壒浜�1濮撳悕 : '鏈鎵�' }}
           </template>
@@ -76,17 +76,7 @@
             {{ scope.row.瀹℃壒1鏃堕棿 ? scope.row.瀹℃壒1鏃堕棿 : '鈥�' }}
           </template>
         </el-table-column>
-        <el-table-column label="璐㈠姟瀹℃壒" align="center" min-width="60">
-          <template slot-scope="scope">
-            {{ scope.row.瀹℃壒浜�3濮撳悕 ? scope.row.瀹℃壒浜�3濮撳悕 : '鏈鎵�' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="瀹℃壒鏃堕棿" align="center" min-width="115">
-          <template slot-scope="scope">
-            {{ scope.row.瀹℃壒3鏃堕棿 ? scope.row.瀹℃壒3鏃堕棿 : '鈥�' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="鎬荤粡鐞嗗鎵�" align="center" min-width="70">
+        <el-table-column label="鎬荤粡鐞嗗鎵�" align="center" min-width="90">
           <template slot-scope="scope">
             {{ scope.row.瀹℃壒浜�4濮撳悕 ? scope.row.瀹℃壒浜�4濮撳悕 : '鏈鎵�' }}
           </template>
@@ -96,6 +86,16 @@
             {{ scope.row.瀹℃壒4鏃堕棿 ? scope.row.瀹℃壒4鏃堕棿 : '鈥�' }}
           </template>
         </el-table-column>
+        <el-table-column label="璐㈠姟瀹℃壒" align="center" min-width="70">
+          <template slot-scope="scope">
+            {{ scope.row.瀹℃壒浜�3濮撳悕 ? scope.row.瀹℃壒浜�3濮撳悕 : '鏈鎵�' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="瀹℃壒鏃堕棿" align="center" min-width="115">
+          <template slot-scope="scope">
+            {{ scope.row.瀹℃壒3鏃堕棿 ? scope.row.瀹℃壒3鏃堕棿 : '鈥�' }}
+          </template>
+        </el-table-column>
         <el-table-column label="鎿嶄綔" align="center" width="100">
           <template slot-scope="scope">
             <el-button :disabled="false" type="primary" size="mini" @click="excuteApprove(scope.row)">瀹℃壒</el-button>
@@ -194,11 +194,11 @@ export default {
   },
   methods: {
     fetchData() {
-      console.log(this.token)
+      // console.log(this.token)
     },
     searchTable1() {
       this.date1 && this.date2 ? this.check1 = 1 : (this.check1 = 0, this.date1 = '', this.date2 = '')
-      searchTable1(this.check1, this.date1, this.date2, this.pageCurrent1, this.pageSize1).then(response => {
+      searchTable1(this.check1, this.date1, this.date2, this.pageCurrent1, this.pageSize1, this.token).then(response => {
         this.tableData1 = response.data.rows
         this.tableData1.map(v => {
           this.$set(v, 'scanSrc', '')
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index ce2a1930..f69e947d 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -93,12 +93,12 @@
             {{ scope.row.鐗╂枡瑙勬牸 }}
           </template>
         </el-table-column>
-        <el-table-column label="鍒嗛厤鏁伴噺" align="center" min-width="80">
+        <el-table-column label="鍒嗛厤鏁伴噺" align="center" min-width="80" prop="闆朵欢鏁伴噺">
           <template slot-scope="scope">
             {{ scope.row.闆朵欢鏁伴噺 }}
           </template>
         </el-table-column>
-        <el-table-column label="浣跨敤婊炶揣鏁伴噺" align="center" min-width="100">
+        <el-table-column label="浣跨敤婊炶揣鏁伴噺" align="center" min-width="100" prop="浣跨敤婊炶揣鏁伴噺">
           <template slot-scope="scope">
             {{ Number(scope.row.浣跨敤婊炶揣鏁伴噺) }}
           </template>
@@ -108,11 +108,21 @@
             {{ scope.row.寰呴噰璐暟閲� = Number(scope.row.闆朵欢鏁伴噺) - Number(scope.row.浣跨敤婊炶揣鏁伴噺) }}
           </template>
         </el-table-column>
-        <el-table-column label="澶囨敞" align="center" min-width="100">
+        <el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="澶囨敞" align="center" min-width="100" prop="澶囨敞绛涢��">
           <template slot-scope="scope">
             {{ scope.row.澶囨敞 }}
           </template>
         </el-table-column>
+        <el-table-column :filters="supplierFilters" :filter-method="filterHandler" label="渚涜揣鍟�" align="center" min-width="100" prop="渚涜揣鍟嗙瓫閫�">
+          <template slot-scope="scope">
+            {{ scope.row.渚涜揣鍟� }}
+          </template>
+        </el-table-column>
+        <el-table-column :filters="source" :filter-method="filterSource" align="center" label="鏁版嵁鏉ユ簮" min-width="90px" prop="闆朵欢绫诲瀷绛涢��">
+          <template slot-scope="scope">
+            {{ Number(scope.row.闆朵欢绫诲瀷) === 1 ? 'BZ' : 'WG' }}
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block" style="margin: 10px 0 0 0;">
         <el-pagination
@@ -653,6 +663,18 @@ export default {
   name: '', // 绂荤嚎鍚堝悓
   data() {
     return {
+      source: [
+        {
+          text: 'BZ',
+          value: 1
+        },
+        {
+          text: 'WG',
+          value: 2
+        }
+      ],
+      remarkFilters: [],
+      supplierFilters: [],
       groupPartNumGroup: [], // 缁勪欢闆朵欢娴佹按鍙风粍
       offlineContractsValue: '',
       offlineContracts: [],
@@ -806,6 +828,15 @@ export default {
     this.searchTable00()
   },
   methods: {
+    filterHandler0(value, row) { // 绛涢�夊娉�
+      return row['澶囨敞'] === value
+    },
+    filterHandler(value, row) { // 绛涢�変緵璐у晢
+      return row['渚涜揣鍟�'] === value
+    },
+    filterSource(value, row) {
+      return Number(row['闆朵欢绫诲瀷']) === Number(value)
+    },
     // 鍙樻洿璇环鐘舵��
     changeInquiryStatus() {
       this.$confirm('纭畾鍙樻洿璇环鐘舵��?', '鎻愮ず', {
@@ -1332,6 +1363,18 @@ export default {
       searchMaterial(this.pageCurrent00, this.pageSize00, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id).then(response => {
         this.tableData00 = response.data.rows
         this.total00 = response.data.total
+        const remark = []
+        const supplier = []
+        this.remarkFilters = []
+        this.supplierFilters = []
+        response.data.rows.map(v => {
+          if (!remark.includes(v.澶囨敞)) {
+            remark.push(v.澶囨敞)
+            supplier.push(v.渚涜揣鍟�)
+            this.remarkFilters.push({ text: v.澶囨敞, value: v.澶囨敞 })
+            this.supplierFilters.push({ text: v.渚涜揣鍟�, value: v.渚涜揣鍟� })
+          }
+        })
       })
     },
     handleSizeChange00(val) { // 鏍囧噯浠跺拰澶栬喘浠跺垪琛ㄥ垎椤�
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>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index 2a7eeab4..e9fcb8c8 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -25,19 +25,94 @@
 import { mapGetters } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
-
+import { searchTable1 } from '@/api/PurchasingCenter/PurchaseContractApproval'
+import { initApproval, initApprovalOffline } from '@/api/PurchasingCenter/FundApproval'
+import { searchTable1 as searchTableInvoice } from '@/api/PurchasingCenter/InvoiceSettlementApprove'
 export default {
   components: {
     Breadcrumb,
     Hamburger
   },
+  data() {
+    return {
+      timer: '',
+      noticeContract: null,
+      noticeFund: null,
+      noticeInvoice: null
+    }
+  },
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'name',
+      'id',
+      'token'
     ])
   },
+  mounted() {
+    if (this.id.toString() === '3') {
+      this.checkApproval()
+      this.timer = setInterval(this.checkApproval, 1000 * 60 * 5)
+    }
+  },
+  beforeDestroy() {
+    clearInterval(this.timer)
+  },
   methods: {
+    checkApproval() {
+      searchTable1(1, 999, 0, null, null, 0, 0, 0, 0, 0, 0).then(res => {
+        if (res.data.total) {
+          this.noticeContract = null
+          this.noticeContract = this.$notify.info({
+            title: '鎻愮ず',
+            message: '鎮ㄦ湁閲囪喘鍚堝悓寰呭鎵癸紝璇峰強鏃跺鐞嗭紝鐐瑰嚮鏌ョ湅',
+            onClick: () => {
+              this.$router.push({ path: '/PurchaseContractApproval/index' })
+              setTimeout(this.noticeContract.close(), 1000)
+            },
+            duration: 1000 * 60
+          })
+        }
+      })
+      const p1 = new Promise((resolve, reject) => {
+        initApproval(1, 999, 1).then(res => {
+          resolve(res)
+        })
+      })
+      const p2 = new Promise((resolve, reject) => {
+        initApprovalOffline(1, 999, 1).then(res => {
+          resolve(res)
+        })
+      })
+      Promise.race([p1, p2]).then(res => {
+        if (res.data.total) {
+          this.noticeFund = this.$notify.info({
+            title: '鎻愮ず',
+            message: '鎮ㄦ湁鍚堝悓璇锋鐢宠寰呭鎵癸紝璇峰強鏃跺鐞嗭紝鐐瑰嚮鏌ョ湅',
+            onClick: () => {
+              this.$router.push({ path: '/FundApproval2/index' })
+              setTimeout(this.noticeFund.close(), 1000)
+            },
+            duration: 1000 * 60 * 5
+          })
+        }
+      })
+      searchTableInvoice(0, null, null, 1, 999, this.token).then(res => {
+        if (res.data.total) {
+          this.noticeInvoice = null
+          this.noticeInvoice = this.$notify.info({
+            title: '鎻愮ず',
+            message: '鎮ㄦ湁鍙戠エ缁撶畻鐢宠寰呭鎵癸紝璇峰強鏃跺鐞嗭紝鐐瑰嚮鏌ョ湅',
+            onClick: () => {
+              this.$router.push({ path: '/InvoiceSettlementApprove/index' })
+              setTimeout(this.noticeInvoice.close(), 1000)
+            },
+            duration: 1000 * 60 * 5
+          })
+        }
+      })
+    },
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
     },