From a15fb376f2a52a36be5ce2f1eeaf252a509dfcb7 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 九月 2023 14:45:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/assets/api/controller.js |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index ac08613..5f600fd 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -17,6 +17,13 @@
 	chooseTechByStandard:"/product/chooseTech",//鍙充笂瑙掓柊澧�-->鎶�鏈寚鏍�-->閫夋嫨宸ュ簭,宸ヨ壓
 	chooseFatherByStandard:"/product/chooseFather",//鍙充笂瑙掓柊澧�-->鎶�鏈寚鏍�-->閫夋嫨椤圭洰鐖剁被
 	addProductByStandard:"/product/add",//鍙充笂瑙掓柊澧�-->鎶�鏈寚鏍�
+	addMBomByStandard:"/mbom/add",//鍙充笂瑙掓柊澧�-->鐗╂枡娓呭崟
+	chooseTechByMBom:"/mbom/chooseTech",//鍙充笂瑙掓柊澧�-->鐗╂枡娓呭崟-->閫夋嫨宸ュ簭,宸ヨ壓
+	mBomWrite:"/mbom/write",//鐗╂枡娓呭崟-->鏁伴噺,绉诲紑淇濆瓨
+	chooseTechByProduct:"/technique/chooseTech",//鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓-->閫夋嫨宸ュ簭,宸ヨ壓
+	addTechniqueByStandard:"/technique/add",//鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓
+	chooseProByProduct:"/technique/choosePro",//鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓-->閫夋嫨椤圭洰(鐖跺瓙),鍗曚綅
+	chooseDevByProduct:"/technique/chooseDev",//鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓-->閫夋嫨璁惧
 
 	// 鎶�鏈鐞�-鎶�鏈枃浠�
 	selectAllOrder: "/orders/selectAllOrder", //鏌ヨ鎵�鏈夎鍗曞垪琛�
@@ -60,11 +67,14 @@
 	// listMaterial:"/finished-inspect/list_material",//娣诲姞妫�楠屽崟鏃剁殑椤圭洰鍒楄〃
 	finishedInspectUser: "/finished-inspect/page_user", //鑾峰彇鎵�鏈変富鏈哄伐
 	projectListByfinishId: "/inspection-item/list_user", //鏍规嵁id鏌ヨ鎵�鏈夐」鐩�
-
+	processInspectAddProcess: "/processInspect/addProcess",//鏂板妫�楠�
+	inspectionItemListUser: "/inspection-item/list_user",//鏌ヨ鎵�鏈夋楠岄」鐩�
 }
 // 杩囩▼妫�楠�
 const processInspection = {
 	selectProcessInspectsList: "/processInspect/selectProcessInspectsList", // 鍒嗛〉鏌ヨ杩囩▼妫�楠屽崟鍒楄〃
+	chooseMaterProcessInspect: "/processInspect/chooseMater",//鏍规嵁璁㈠崟鍙烽�夋嫨浜у搧鍜屽伐鑹�
+
 }
 // QMS瀹為獙瀹ょ鐞�
 const laboratory = {
@@ -83,6 +93,7 @@
   deleteIdorFather: "/device/deleteIdorFather" // 鍒犻櫎鏍戞ā鍧楁暟鎹�
 }
 
+//search_class:codeNameModel
 // QMS璁¢噺绠$悊
 const measure = {
 	measureLedgerPageTable: "/measureLedger/metering_table", // 璁¢噺棰勬祴-->鍒嗛〉琛ㄦ牸
@@ -118,6 +129,7 @@
 	selectAllMbom:"/mbomModel/selectAllMbom",//鐗╂枡缁存姢--銆嬪彸杈�
 	addMbom:"/mbomModel/addMbom",//鐗╂枡--->鏂板
 	material:"/mbomModel/delMbomById",//鐗╂枡娓呭崟鍒犻櫎
+	delAllMbom:"/mbom/delAllMbom",//鎵归噺鍒犻櫎
 
 	selectAllTeque:"/techniqueModel/selectAllTeque",//鐢熶骇宸ヨ壓缁存姢---銆傚彸杈�
 
@@ -139,6 +151,9 @@
 	addQeMode:"/techniqueModel/addQeMode",//鏂板----銆嬩紶鍙�
 	delQueById:"/techniqueModel/delQueById",//鍒犻櫎
 	delAllQue:"/techniqueModel/delAllQue",//鎵归噺鍒犻櫎
+	selecQueById:"/techniqueModel/selecQueById",//缂栬緫
+	writeQueById:"/techniqueModel/writeQueById",//缂栬緫浼犲弬
+
 }
 const url = {
 	enter: "user/enter", //鐧诲綍

--
Gitblit v1.9.3