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 |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 1d224cf..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瀹為獙瀹ょ鐞�
@@ -38,6 +48,10 @@
   tableDeviceList: "/device/table_list", // 瀹為獙瀹ゆā鍧楄〃鏍兼暟鎹�
   deleteDevice: "/device/delete", // 鍒犻櫎瀹為獙瀹よ澶�
   deleteIdorFather: "/device/deleteIdorFather" // 鍒犻櫎鏍戞ā鍧楁暟鎹�
+}
+//涓嶅悎鏍煎搧澶勭疆
+const dispose = {
+    gettable:"/opinion/list_page"
 }
 
 // QMS璁¢噺绠$悊
@@ -56,9 +70,16 @@
   	...laboratory,
 	...measure,
 	...finishedIns,
+	...unqualifiedaa,
+	...dispose,
+	...purchaseorder,
 	selectSaleList: "sale/selectSaleList", //鏌ヨ閿�鍞崟鍒楄〃
 	selectSaleDatilById: "sale/selectSaleDatilById", //鏍规嵁閿�鍞崟id鏌ョ湅璇︽儏,
 	addSale: "sale/addSale", //鏂板閿�鍞崟
+	saleCheck: "sale/check", //瀹℃牳閿�鍞崟
+	updateSaleById: "sale/updateSaleById", //鏍规嵁閿�鍞崟id淇敼璇︽儏淇℃伅
+	delSale: "sale/delSale", //鏍规嵁閿�鍞崟id鍒犻櫎
+	delAllSale: "sale/delAllSale", //鎵归噺鍒犻櫎閿�鍞崟
 }
 
 

--
Gitblit v1.9.3