From e59a71579f6afd21c76f9d45c3b3f09c28d03c41 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 27 五月 2024 14:37:22 +0800
Subject: [PATCH] 合并冲突
---
src/assets/api/controller.js | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index e378506..39f4fb4 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -115,6 +115,7 @@
delProduct: "/capacityScope/delProduct", //鍒犻櫎浜у搧
upProduct: "/capacityScope/upProduct", //淇敼浜у搧
getItemTree: "/capacityScope/getItemTree", //鑾峰彇妫�楠屽璞℃爲
+ importData: "/capacityScope/importData", //瀵煎叆妫�楠岄」鐩�
}
const laboratoryScope = {
@@ -152,6 +153,8 @@
selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�
costStatistics: "/insOrder/costStatistics", //璐圭敤缁熻
selectSampleDefects: "/insOrder/selectSampleDefects", //鏍峰搧缂洪櫡鎸囨爣
+ updateStatus:"/insOrder/updateStatus",//灏嗗緟瀹℃牳鏇存柊鎴愭挙閿�鐘舵��
+ updateInspected:"/insOrder/updateInspected",//灏嗗緟妫�楠岀殑鐨勬挙閿�杩涜鏇存敼
}
const sampleOrder = {
@@ -166,6 +169,7 @@
upPlanUser: "/insOrderPlan/upPlanUser", //浠诲姟浜ゆ帴
verifyPlan: "/insOrderPlan/verifyPlan", //澶嶆牳妫�楠屼换鍔�
submitPlan: "/insOrderPlan/submitPlan", //妫�楠屼换鍔℃彁浜�
+ inspectionOrderDetailsTaskSwitching: "/insOrderPlan/inspectionOrderDetailsTaskSwitching", // 妫�楠屽崟璇︽儏-浠诲姟鍒囨崲
}
const systemLog = {
@@ -206,6 +210,7 @@
upStandardTemplate: "/StandardTemplate/upStandardTemplate", //淇敼妫�楠屾ā鏉�
delStandardTemplate: "/StandardTemplate/delStandardTemplate", //鍒犻櫎妫�楠屾ā鏉�
getStandardTemplate: "/StandardTemplate/getStandardTemplate", //鏌ヨ鍘熷璁板綍妯℃澘鏋氫妇
+ getEditTemplatePreparation: "/StandardTemplate/getEditTemplatePreparation"
}
const insReport = {
@@ -267,6 +272,7 @@
page: "/informationNotification/page", //婊氬姩鍒嗛〉鏌ヨ
updateMessageStatus: "/informationNotification/updateMessageStatus", //鏇存柊娑堟伅鐘舵�侊紙鎷掔粷銆佹帴鏀讹級
triggerModificationStatusToRead: "/informationNotification/triggerModificationStatusToRead", //鐐瑰嚮璇︽儏瑙﹀彂淇敼鐘舵�佷负宸茶
+ getNumberFourTypesMessagesHomePage: "/informationNotification/getNumberFourTypesMessagesHomePage", // 娑堟伅閫氱煡-鑾峰彇棣栭〉鍥涚娑堟伅鏁伴噺
}
const performanceShift = {
--
Gitblit v1.9.3