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 | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 2024af8..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鏌ヨ璁㈠崟璇︽儏
@@ -21,13 +24,14 @@
selectRawInspectsListById: "/rawInspect/selectRawInspectsListById/", //鏍规嵁妫�楠屽崟id鑾峰彇妫�楠屽崟璇︽儏
updaterawInsProduct: '/rawInsProduct/updaterawInsProduct', //淇敼椤圭洰鐨勬楠屽��
updateRawInspectsById: "/rawInspect/updateRawInspectsById/", //涓婃姤,
- selectDevice: "/rawInsProduct/selectDevice", //鏌ヨ璁惧淇℃伅
- selectSpBySt: "/rawInspect/selectSpBySt", //鏍规嵁鏉愭枡id鏌ヨ鎵�鏈夊瀷鍙�,
- addRawInspects: "/rawInspect/addRawInspects"
+ rawSelectDevice: "/rawInsProduct/selectDevice", //鏌ヨ璁惧淇℃伅
+ addRawInspects: "/rawInspect/addRawInspects", // 娣诲姞
+ updateDevByRpId: "/rawInsProduct/updateDevByRpId", // 鏇存敼璁惧
}
//涓嶅悎鏍煎師鏉愭枡
const unqualifiedaa ={
- selectUnRawInspectsList: "/inspectUnaccepted/selectURawMaterials"
+ selectUnRawInspectsList: "/inspectUnaccepted/selectURawMaterials", // 鏌ヨ鍘熸潗鏂欎笉鍚堟牸鍝佹楠屽崟鍒楄〃
+ evaluatePassOrNo: "/inspectUnaccepted/evaluatePassOrNo" // 璇勫
}
// 鏌ヨ鎴愬搧涓嶅悎鏍煎搧绠＄悊
const unRawInspects ={
@@ -49,7 +53,10 @@
projectListByfinishId: "/inspection-item/list_user", //鏍规嵁id鏌ヨ鎵�鏈夐」鐩�
}
-
+// 杩囩▼妫�楠�
+const processInspection = {
+ selectProcessInspectsList: "/processInspect/selectProcessInspectsList", // 鍒嗛〉鏌ヨ杩囩▼妫�楠屽崟鍒楄〃
+}
// QMS瀹為獙瀹ょ鐞�
const laboratory = {
delDeviceById:"/device/delDeviceById",//鍒犻櫎
@@ -133,6 +140,7 @@
...dispose,
...Basicdata,
...unRawInspects,
+ ...processInspection,
// ...gettable,
selectSaleList: "sale/selectSaleList", //鏌ヨ閿�鍞崟鍒楄〃
selectSaleDatilById: "sale/selectSaleDatilById", //鏍规嵁閿�鍞崟id鏌ョ湅璇︽儏,
--
Gitblit v1.9.3