From d245609c9e928670961ae011dd934c0f34cbbfd9 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 18 八月 2023 17:46:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/assets/api/controller.js | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 60376ec..eeeb6ea 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -8,6 +8,11 @@
selectAllOrder: "/orders/selectAllOrder", //鏌ヨ鎵�鏈夎鍗曞垪琛�
selectOrderById: "/orders/selectOrderById", //鏍规嵁璁㈠崟id鏌ヨ璁㈠崟璇︽儏
}
+//鎶�鏈鐞�-璁㈠崟Bom
+const purchaseorder= {
+ selectAllOrder:"/orders/selectAllOrder",
+ compile:"/orders/compile" //缂栧埗
+}
// 鍘熸潗鏂欐楠�
const raw = {
selectRawInspectsList: "rawInspect/selectRawInspectsList", //鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃
@@ -18,6 +23,10 @@
selectSpBySt: "/rawInspect/selectSpBySt", //鏍规嵁鏉愭枡id鏌ヨ鎵�鏈夊瀷鍙�,
addRawInspects: "/rawInspect/addRawInspects"
}
+//涓嶅悎鏍煎師鏉愭枡
+const unqualifiedaa ={
+ selectUnRawInspectsList: "/inspectUnaccepted/selectUnRawInspectsList"
+}
// 鎴愬搧妫�楠�
const finishedIns = {
@@ -25,6 +34,7 @@
// listMaterial:"/finished-inspect/list_material",//娣诲姞妫�楠屽崟鏃剁殑椤圭洰鍒楄〃
finishedInspectUser: "/finished-inspect/page_user", //鑾峰彇鎵�鏈変富鏈哄伐
projectListByfinishId: "/inspection-item/list_user", //鏍规嵁id鏌ヨ鎵�鏈夐」鐩�
+
}
// QMS瀹為獙瀹ょ鐞�
@@ -39,17 +49,37 @@
deleteDevice: "/device/delete", // 鍒犻櫎瀹為獙瀹よ澶�
deleteIdorFather: "/device/deleteIdorFather" // 鍒犻櫎鏍戞ā鍧楁暟鎹�
}
+//涓嶅悎鏍煎搧澶勭疆
+const dispose = {
+ gettable:"/opinion/list_page"
+}
+
+// QMS璁￠噺绠＄悊
+const measure = {
+ measureLedgerPageTable: "/measureLedger/metering_table", // 璁￠噺棰勬祴-->鍒嗛〉琛ㄦ牸
+ meteringPlanPageTable: "/meteringPlan/metering_table", // 璁￠噺璁″垝-->鍒嗛〉琛ㄦ牸
+ meteringPlanListRecord: "/meteringPlan/list_record", // 璁￠噺璁″垝<-->璁￠噺鍙拌处锛氭煡鐪嬭閲忓饱鍘�
+ meterPlanListDevice: "/meteringPlan/list_device", //鏂板璁″垝璁惧涓嬫媺妗�
+ createPerson: "/meteringPlan/list_user", //鍒涘缓浜轰笅鎷夋
+}
const url = {
enter: "user/enter", //鐧诲綍
...standard,
...raw,
- ...laboratory,
+ ...laboratory,
+ ...measure,
...finishedIns,
+ ...unqualifiedaa,
+ ...dispose,
+ ...purchaseorder,
selectSaleList: "sale/selectSaleList", //鏌ヨ閿�鍞崟鍒楄〃
selectSaleDatilById: "sale/selectSaleDatilById", //鏍规嵁閿�鍞崟id鏌ョ湅璇︽儏,
- addSale: "sale/addSale", //鏂板閿�鍞崟,
- seleRepe: "sale/seleRepe", //鏌ヨ鎴愬搧搴撳瓨
+ addSale: "sale/addSale", //鏂板閿�鍞崟
+ saleCheck: "sale/check", //瀹℃牳閿�鍞崟
+ updateSaleById: "sale/updateSaleById", //鏍规嵁閿�鍞崟id淇敼璇︽儏淇℃伅
+ delSale: "sale/delSale", //鏍规嵁閿�鍞崟id鍒犻櫎
+ delAllSale: "sale/delAllSale", //鎵归噺鍒犻櫎閿�鍞崟
}
--
Gitblit v1.9.3