From 67d2338b3dd43c5972159822aa3dd8f53cd3c78b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 四月 2024 11:14:00 +0800
Subject: [PATCH] 合并冲突
---
src/assets/api/controller.js | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index e605ddb..4c25d3e 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -14,7 +14,8 @@
StandardTemplate,
insOrder,
sampleOrder,
- insOrderPlan
+ insOrderPlan,
+ insReport
}
}
@@ -139,6 +140,7 @@
saveInsContext: "/insOrderPlan/saveInsContext",//淇濆瓨妫�楠屽唴瀹�
upPlanUser: "/insOrderPlan/upPlanUser",//浠诲姟浜ゆ帴
verifyPlan: "/insOrderPlan/verifyPlan",//澶嶆牳妫�楠屼换鍔�
+ submitPlan: "/insOrderPlan/submitPlan",//妫�楠屼换鍔℃彁浜�
}
const systemLog = {
@@ -175,3 +177,7 @@
delStandardTemplate: "/StandardTemplate/delStandardTemplate", //鍒犻櫎妫�楠屾ā鏉�
getStandardTemplate: "/StandardTemplate/getStandardTemplate", //鏌ヨ鍘熷璁板綍妯℃澘鏋氫妇
}
+
+const insReport = {
+ pageInsReport: "/insReport/pageInsReport", //鏌ヨ妫�楠屾姤鍛婃暟鎹�
+}
--
Gitblit v1.9.3