From e55486041c7d948f0c9ca6d77d568a5c26f13267 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 11 九月 2023 18:02:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/assets/api/controller.js | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index f57edf9..7e8b69f 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -6,6 +6,9 @@
selectProductByMaterial: "product/selectTreeByMaterial", //鏍规嵁鐗╂枡鏌ヨ椤圭洰琛ㄦ牸
selectTechnologyByMaterial: "technology/select",
selectAll:"/material/selectAll",//鍙充晶鏁版嵁
+ leftAddOneTwo: "/material/add",//宸︿晶鏂板1锛�2绾�
+ leftAddThree: "/standard/add",//宸︿晶涓夌骇鏂板
+ leftAddFour: "/specifications/add",//宸︿晶鍥涚骇鏂板
// 鎶�鏈鐞�-鎶�鏈枃浠�
selectAllOrder: "/orders/selectAllOrder", //鏌ヨ鎵�鏈夎鍗曞垪琛�
selectOrderById: "/orders/selectOrderById", //鏍规嵁璁㈠崟id鏌ヨ璁㈠崟璇︽儏
@@ -17,19 +20,31 @@
}
// 鍘熸潗鏂欐楠�
const raw = {
- selectRawInspectsList: "rawInspect/selectRawInspectsList", //鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃
- selectRawInspectsListById: "rawInspect/selectRawInspectsListById/", //鏍规嵁妫�楠屽崟id鑾峰彇妫�楠屽崟璇︽儏
- updaterawInsProduct: 'rawInsProduct/updaterawInsProduct', //淇敼椤圭洰鐨勬楠屽��
+ selectRawInspectsList: "/rawInspect/selectRawInspectsList", //鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃
+ selectRawInspectsListById: "/rawInspect/selectRawInspectsListById/", //鏍规嵁妫�楠屽崟id鑾峰彇妫�楠屽崟璇︽儏
+ updaterawInsProduct: '/rawInsProduct/updaterawInsProduct', //淇敼椤圭洰鐨勬楠屽��
updateRawInspectsById: "/rawInspect/updateRawInspectsById/", //涓婃姤,
- selectRawMaterial: "/rawInspect/selectMaterial", //鏌ヨ鍘熸潗鏂欎俊鎭�
- selectSpBySt: "/rawInspect/selectSpBySt", //鏍规嵁鏉愭枡id鏌ヨ鎵�鏈夊瀷鍙�,
- addRawInspects: "/rawInspect/addRawInspects"
+ rawSelectDevice: "/rawInsProduct/selectDevice", //鏌ヨ璁惧淇℃伅
+ addRawInspects: "/rawInspect/addRawInspects", // 娣诲姞
+ updateDevByRpId: "/rawInsProduct/updateDevByRpId", // 鏇存敼璁惧
}
//涓嶅悎鏍煎師鏉愭枡
const unqualifiedaa ={
- selectUnRawInspectsList: "/inspectUnaccepted/selectUnRawInspectsList"
+ selectUnRawInspectsList: "/inspectUnaccepted/selectURawMaterials", // 鏌ヨ鍘熸潗鏂欎笉鍚堟牸鍝佹楠屽崟鍒楄〃
+ evaluatePassOrNo: "/inspectUnaccepted/evaluatePassOrNo" // 璇勫
}
-
+// 鏌ヨ鎴愬搧涓嶅悎鏍煎搧绠＄悊
+const unRawInspects ={
+ inspectUnaccepted: "/inspectUnaccepted/selectUnRawInspectsList"
+}
+//涓嶅悎鏍煎搧澶勭疆
+const dispose = {
+ getTable: "/inspectUnaccepted/selectDisposal", // 涓嶅悎鏍煎搧鍒嗛〉鍒楄〃
+ descriptionUpdate: "/inspectUnaccepted/descriptionUpdate", // 澶辩劍鏇存柊鐜板儚鎻忚堪
+ viewEditorial: "/inspectUnaccepted/viewEditorial", // 鏌ョ湅缂栬緫鎰忚
+ clickEditing: "/inspectUnaccepted/clickEditing", // 鐐瑰嚮缂栬緫鎰忚瑙﹀彂鏌ヨ
+ addOpinion: "/inspectUnaccepted/addOpinion" // 缂栬緫鎰忚-->纭畾鎸夐挳
+}
// 鎴愬搧妫�楠�
const finishedIns = {
finishedInsListPage: "/finished-inspect/list_page", //鑾峰彇鎴愬搧妫�楠屽垪琛�
@@ -38,7 +53,10 @@
projectListByfinishId: "/inspection-item/list_user", //鏍规嵁id鏌ヨ鎵�鏈夐」鐩�
}
-
+// 杩囩▼妫�楠�
+const processInspection = {
+ selectProcessInspectsList: "/processInspect/selectProcessInspectsList", // 鍒嗛〉鏌ヨ杩囩▼妫�楠屽崟鍒楄〃
+}
// QMS瀹為獙瀹ょ鐞�
const laboratory = {
delDeviceById:"/device/delDeviceById",//鍒犻櫎
@@ -54,10 +72,6 @@
tableDeviceList: "/device/table_list", // 瀹為獙瀹ゆā鍧楄〃鏍兼暟鎹�
deleteDevice: "/device/delete", // 鍒犻櫎瀹為獙瀹よ澶�
deleteIdorFather: "/device/deleteIdorFather" // 鍒犻櫎鏍戞ā鍧楁暟鎹�
-}
-//涓嶅悎鏍煎搧澶勭疆
-const dispose = {
- gettable:"/opinion/list_page"
}
// QMS璁￠噺绠＄悊
@@ -102,8 +116,10 @@
delAll:"selfcheckModel/delAllTech",//鎵归噺鍒犻櫎---.鑷
selectjilu:"/recordModel/selectAllRecord",//鐢熶骇璁板綍缁存姢---銆嬪彸杈�
- selecRecord:"/recordModel/selecRecordById",//鐢熶骇璁板綍----.缂栬緫
- delQueById:"/recordModel/delQueById",//鍒犻櫎---.璁板綍鍐呭
+ selecRecord:"/recordModel/selecRecordById",//鐢熶骇璁板綍----.鏂板
+ writeRecordById:"/recordModel/writeRecordById",//缂栬緫
+ delQueByIdapi:"/recordModel/delQueById",//鍒犻櫎---.璁板綍鍐呭
+
delAllRecord:"/recordModel/delAllRecord",//鍒犻櫎鎵归噺--->璁板綍
addRecord:"/recordModel/addRecord",//鐢熶骇璁板綍-------.鏂板
@@ -123,6 +139,8 @@
...unqualifiedaa,
...dispose,
...Basicdata,
+ ...unRawInspects,
+ ...processInspection,
// ...gettable,
selectSaleList: "sale/selectSaleList", //鏌ヨ閿�鍞崟鍒楄〃
selectSaleDatilById: "sale/selectSaleDatilById", //鏍规嵁閿�鍞崟id鏌ョ湅璇︽儏,
--
Gitblit v1.9.3