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 | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 5b42371..5f600fd 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -6,6 +6,25 @@
selectProductByMaterial: "product/selectTreeByMaterial", //鏍规嵁鐗╂枡鏌ヨ椤圭洰琛ㄦ牸
selectTechnologyByMaterial: "technology/select",
selectAll:"/material/selectAll",//鍙充晶鏁版嵁
+ technologyWrite:"/technology/write",//宸ヨ壓璺嚎锛岀Щ寮�淇濆瓨鐢熶骇瀹氶
+ productWrite:"/product/write",//鎶�鏈寚鏍囷紝绉诲紑淇濆瓨鍐呮帶鍊煎拰鏍囧噯鍊�
+ chooseFather: "/technology/chooseFather",//鑾峰彇宸ュ簭鍒楄〃
+ chooseDevice: "/technology/chooseDevice",//鑾峰彇璁惧缁勫垪琛�
+ addTechnology: "/technology/add",//娣诲姞宸ヨ壓璺嚎
+ leftAddOneTwo: "/material/add",//宸︿晶鏂板1锛�2绾�
+ leftAddThree: "/standard/add",//宸︿晶涓夌骇鏂板
+ leftAddFour: "/specifications/add",//宸︿晶鍥涚骇鏂板
+ 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", //鏌ヨ鎵�鏈夎鍗曞垪琛�
selectOrderById: "/orders/selectOrderById", //鏍规嵁璁㈠崟id鏌ヨ璁㈠崟璇︽儏
@@ -27,7 +46,8 @@
}
//涓嶅悎鏍煎師鏉愭枡
const unqualifiedaa ={
- selectUnRawInspectsList: "/inspectUnaccepted/selectURawMaterials"
+ selectUnRawInspectsList: "/inspectUnaccepted/selectURawMaterials", // 鏌ヨ鍘熸潗鏂欎笉鍚堟牸鍝佹楠屽崟鍒楄〃
+ evaluatePassOrNo: "/inspectUnaccepted/evaluatePassOrNo" // 璇勫
}
// 鏌ヨ鎴愬搧涓嶅悎鏍煎搧绠＄悊
const unRawInspects ={
@@ -47,9 +67,15 @@
// 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 = {
delDeviceById:"/device/delDeviceById",//鍒犻櫎
@@ -67,6 +93,7 @@
deleteIdorFather: "/device/deleteIdorFather" // 鍒犻櫎鏍戞ā鍧楁暟鎹�
}
+//search_class:codeNameModel
// QMS璁￠噺绠＄悊
const measure = {
measureLedgerPageTable: "/measureLedger/metering_table", // 璁￠噺棰勬祴-->鍒嗛〉琛ㄦ牸
@@ -102,6 +129,7 @@
selectAllMbom:"/mbomModel/selectAllMbom",//鐗╂枡缁存姢--銆嬪彸杈�
addMbom:"/mbomModel/addMbom",//鐗╂枡--->鏂板
material:"/mbomModel/delMbomById",//鐗╂枡娓呭崟鍒犻櫎
+ delAllMbom:"/mbom/delAllMbom",//鎵归噺鍒犻櫎
selectAllTeque:"/techniqueModel/selectAllTeque",//鐢熶骇宸ヨ壓缁存姢---銆傚彸杈�
@@ -123,6 +151,9 @@
addQeMode:"/techniqueModel/addQeMode",//鏂板----銆嬩紶鍙�
delQueById:"/techniqueModel/delQueById",//鍒犻櫎
delAllQue:"/techniqueModel/delAllQue",//鎵归噺鍒犻櫎
+ selecQueById:"/techniqueModel/selecQueById",//缂栬緫
+ writeQueById:"/techniqueModel/writeQueById",//缂栬緫浼犲弬
+
}
const url = {
enter: "user/enter", //鐧诲綍
@@ -135,6 +166,7 @@
...dispose,
...Basicdata,
...unRawInspects,
+ ...processInspection,
// ...gettable,
selectSaleList: "sale/selectSaleList", //鏌ヨ閿�鍞崟鍒楄〃
selectSaleDatilById: "sale/selectSaleDatilById", //鏍规嵁閿�鍞崟id鏌ョ湅璇︽儏,
--
Gitblit v1.9.3