From 02ff4d3b3c4829e6f97a704c60fe76433e65c4e6 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 07 九月 2023 18:03:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/assets/api/controller.js | 62 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index eeeb6ea..a4df82f 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -2,16 +2,17 @@
const standard = {
// 鎶�鏈鐞�-鏍囧噯Bom
selectTreeByMaterial: "material/selectTreeByMaterial", //鏌ヨ鐗╂枡鐨勬爲
+ selectVersion:"/material/selectVersion",//鍙充晶鐗堟湰
selectProductByMaterial: "product/selectTreeByMaterial", //鏍规嵁鐗╂枡鏌ヨ椤圭洰琛ㄦ牸
selectTechnologyByMaterial: "technology/select",
+ selectAll:"/material/selectAll",//鍙充晶鏁版嵁
// 鎶�鏈鐞�-鎶�鏈枃浠�
selectAllOrder: "/orders/selectAllOrder", //鏌ヨ鎵�鏈夎鍗曞垪琛�
selectOrderById: "/orders/selectOrderById", //鏍规嵁璁㈠崟id鏌ヨ璁㈠崟璇︽儏
-}
-//鎶�鏈鐞�-璁㈠崟Bom
-const purchaseorder= {
- selectAllOrder:"/orders/selectAllOrder",
- compile:"/orders/compile" //缂栧埗
+
+
+ //璁㈠崟BOM
+ delDevice:"/device/delDeviceById",//璁㈠崟Bom
}
// 鍘熸潗鏂欐楠�
const raw = {
@@ -39,6 +40,10 @@
// QMS瀹為獙瀹ょ鐞�
const laboratory = {
+ delDeviceById:"/device/delDeviceById",//鍒犻櫎
+ addApi:"/device/add",//鏂板
+ listgroup:"/device/list_group",
+ selectDevice:"/device/selectDevice",//鍙宠竟灞曠ず
addDeviceInspectDownBox: "/device/listInspect", // 鏂板浠櫒璁惧锛氭楠岄」鐩笅鎷夋
selectDeviceInspectMessage: "/device/inspectId", // 鏂板浠櫒璁惧锛氭牴鎹楠岄」鐩甀D鏌ヨ鏁版嵁
addDeviceKeeper: "/device/list_user",// 鏂板浠櫒璁惧锛氫繚绠′汉涓嬫媺妗�
@@ -61,8 +66,52 @@
meteringPlanListRecord: "/meteringPlan/list_record", // 璁￠噺璁″垝<-->璁￠噺鍙拌处锛氭煡鐪嬭閲忓饱鍘�
meterPlanListDevice: "/meteringPlan/list_device", //鏂板璁″垝璁惧涓嬫媺妗�
createPerson: "/meteringPlan/list_user", //鍒涘缓浜轰笅鎷夋
+ meteringPlanDevicePlan: "/meteringPlan/add_plan", // 璁￠噺璁″垝-->鏂板鎸夐挳
}
+//鍩虹鏁版嵁
+const Basicdata ={
+ selectAllTechNam:"/technologyTemplate/selectAllTechNam",//宸ヨ壓璺嚎-->鍙宠竟
+ selectAllTechTem:"/technologyTemplate/selectAllTechTem",//宸ヨ壓璺嚎-->宸﹁竟
+ chooseDevGroup:"/technologyTemplate/chooseDevGroup",//鏂板宸ヨ壓璺嚎--銆嬮�夋嫨璁惧缁�
+ chooseElement:"/technologyTemplate/chooseElement",//鏂板宸ヨ壓璺嚎-->閫夋嫨鍏冧欢
+ addTechTemp:"/technologyTemplate/addTechTemp",//鏂板宸ヨ壓璺嚎==>鏂板
+ chooseTech:"/technologyTemplate/chooseTech",//鏂板宸ヨ壓璺嚎--銆嬮�夊垯宸ュ簭
+ writeTechById:"/technologyTemplate/writeTechById",//鏂板宸ヨ壓璺嚎-->缂栬緫浼犲弬
+ delTechById:"/technologyTemplate/delTechById",//鏂板宸ヨ壓璺嚎==>鍒犻櫎
+ selecTechById:"/technologyTemplate/selecTechById",//鏂板宸ヨ壓璺嚎--銆嬬紪杈�
+ delAllTech:"/technologyTemplate/delAllTech",//鎵归噺鍒犻櫎
+ addTechMode:"/technicalModel/addTechMode",//鎶�鏈寚鏍�---銆嬫柊澧�
+ delTechBy:"/technicalModel/delTechById",//鎶�鏈�--.鍒犻櫎
+ selectAllleft:"/technicalModel/selectAllTechTem",//鎶�鏈寚鏍�-->宸﹁竟
+ selectAllright:"/technicalModel/selectAllTechNam",//鎶�鏈寚鏍�--銆嬪彸杈�
+ chooseProFath:"/technicalModel/chooseProFath",//鎶�鏈寚鏍�---銆嬬埗绫婚�夋嫨
+ chooseTechFath: "/technicalModel/chooseTechFath",// 鎶�鏈�--->宸ュ簭宸ヨ壓
+ selecTech:"/technicalModel/selecTechById",//鎶�鏈�--->缂栬緫
+
+ selectAllMbom:"/mbomModel/selectAllMbom",//鐗╂枡缁存姢--銆嬪彸杈�
+ addMbom:"/mbomModel/addMbom",//鐗╂枡--->鏂板
+ material:"/mbomModel/delMbomById",//鐗╂枡娓呭崟鍒犻櫎
+
+ selectAllTeque:"/techniqueModel/selectAllTeque",//鐢熶骇宸ヨ壓缁存姢---銆傚彸杈�
+
+ selectAllSelf:"/selfcheckModel/selectAllSelf",//鑷缓缁存姢-----銆嬪彸杈�
+ addSelfcheck:"/selfcheckModel/addSelfcheck",//鑷 ------銆嬫柊澧�
+ delSelfcheck:"/selfcheckModel/delSelfcheckById",//鑷----.鍒犻櫎
+ delAll:"selfcheckModel/delAllTech",//鎵归噺鍒犻櫎---.鑷
+
+ selectjilu:"/recordModel/selectAllRecord",//鐢熶骇璁板綍缁存姢---銆嬪彸杈�
+ selecRecord:"/recordModel/selecRecordById",//鐢熶骇璁板綍----.缂栬緫
+ delQueById:"/recordModel/delQueById",//鍒犻櫎---.璁板綍鍐呭
+ delAllRecord:"/recordModel/delAllRecord",//鍒犻櫎鎵归噺--->璁板綍
+ addRecord:"/recordModel/addRecord",//鐢熶骇璁板綍-------.鏂板
+
+ choosePro:"/techniqueModel/choosePro",//鏂板鐢熶骇宸ヨ壓缁存姢---銆嬮�夋嫨鐖剁被
+ chooseDeiv:"/techniqueModel/chooseDeiv",//鏂板----->璁惧
+ addQeMode:"/techniqueModel/addQeMode",//鏂板----銆嬩紶鍙�
+ delQueById:"/techniqueModel/delQueById",//鍒犻櫎
+ delAllQue:"/techniqueModel/delAllQue",//鎵归噺鍒犻櫎
+}
const url = {
enter: "user/enter", //鐧诲綍
...standard,
@@ -72,7 +121,8 @@
...finishedIns,
...unqualifiedaa,
...dispose,
- ...purchaseorder,
+ ...Basicdata,
+ // ...gettable,
selectSaleList: "sale/selectSaleList", //鏌ヨ閿�鍞崟鍒楄〃
selectSaleDatilById: "sale/selectSaleDatilById", //鏍规嵁閿�鍞崟id鏌ョ湅璇︽儏,
addSale: "sale/addSale", //鏂板閿�鍞崟
--
Gitblit v1.9.3