From 875053d100e70e6a45328fe00aad1cb2402fc9a8 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 16 四月 2024 16:38:19 +0800
Subject: [PATCH] 修复了该功能的代码合并问题

---
 src/assets/api/controller.js |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 3616019..4e431c5 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -16,7 +16,8 @@
 		sampleOrder,
     insOrderPlan,
     insReport,
-    warehouse
+    warehouse,
+    department,
 	}
 }
 
@@ -130,6 +131,7 @@
   selectInsOrderTemplateById: "/insOrder/selectInsOrderTemplateById", //閫氳繃妫�楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭
   delInsOrderTemplate: "/insOrder/delInsOrderTemplate", //鍒犻櫎妫�楠屽崟妯℃澘
 	selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�
+	costStatistics: "/insOrder/costStatistics", //璐圭敤缁熻
 }
 
 const sampleOrder = {
@@ -184,6 +186,8 @@
 const insReport = {
   pageInsReport: "/insReport/pageInsReport", //鏌ヨ妫�楠屾姤鍛婃暟鎹�
   wordToHtml: "/insReport/wordToHtml", //Word杞琀TML
+  inReport: "/insReport/inReport", //鎶ュ憡涓婁紶
+  upReportUrl: "/insReport/upReportUrl", //鎶ュ憡杩樺師
 }
 
 const warehouse = {
@@ -200,3 +204,10 @@
   getSampleRecord: "/warehouse/getSampleRecord", //鏌ヨ鏍峰搧璇︾粏璁板綍
   searchSampleId: "/warehouse/searchSampleId", //閫氳繃鏍峰搧缂栧彿杩涜妫�绱�
 }
+
+const department = {
+  selectDepartment: "/department/selectDepartment", //浜哄憳鏋舵瀯鏍�
+  addDepartment: "/department/addDepartment", //娣诲姞閮ㄩ棬
+  delDepartment: "/department/delDepartment", //鍒犻櫎閮ㄩ棬
+  showUserById: "/department/showUserById", //鏍规嵁閫夋嫨鐨勬爲灞曠ず鐩稿叧鐨勪汉鍛�
+}

--
Gitblit v1.9.3