From e0ff382cd71d451190021e3ed12af99b9a965ee9 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 11 九月 2023 11:25:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/assets/api/controller.js |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 583298d..34890eb 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -13,6 +13,7 @@
 
 	//璁㈠崟BOM
 	delDevice:"/device/delDeviceById",//璁㈠崟Bom
+	compile:"/orders/compile",//缂栧埗
 }
 // 鍘熸潗鏂欐楠�
 const raw = {
@@ -20,13 +21,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 ={
@@ -108,8 +110,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",//鐢熶骇璁板綍-------.鏂板
 

--
Gitblit v1.9.3