From 6a3ac9820a45b566c68b21b11c73badd59c8e6e1 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 28 八月 2023 14:11:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/assets/api/controller.js | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index b08d4eb..bb906e5 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -8,11 +8,6 @@
selectAllOrder: "/orders/selectAllOrder", //鏌ヨ鎵�鏈夎鍗曞垪琛�
selectOrderById: "/orders/selectOrderById", //鏍规嵁璁㈠崟id鏌ヨ璁㈠崟璇︽儏
}
-//鎶�鏈鐞�-璁㈠崟Bom
-const purchaseorder= {
- selectAllOrder:"/orders/selectAllOrder",
- compile:"/orders/compile" //缂栧埗
-}
// 鍘熸潗鏂欐楠�
const raw = {
selectRawInspectsList: "rawInspect/selectRawInspectsList", //鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃
@@ -54,15 +49,26 @@
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", //鍒涘缓浜轰笅鎷夋
+ meteringPlanDevicePlan: "/meteringPlan/add_plan", // 璁￠噺璁″垝-->鏂板鎸夐挳
+}
+
const url = {
enter: "user/enter", //鐧诲綍
...standard,
...raw,
- ...laboratory,
+ ...laboratory,
+ ...measure,
...finishedIns,
...unqualifiedaa,
...dispose,
- ...purchaseorder,
+ // ...gettable,
selectSaleList: "sale/selectSaleList", //鏌ヨ閿�鍞崟鍒楄〃
selectSaleDatilById: "sale/selectSaleDatilById", //鏍规嵁閿�鍞崟id鏌ョ湅璇︽儏,
addSale: "sale/addSale", //鏂板閿�鍞崟
--
Gitblit v1.9.3