From a24f5347bfd2331f8a4819b215f79555776534cd Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 25 四月 2024 09:16:57 +0800
Subject: [PATCH] 合并冲突
---
src/assets/api/controller.js | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index e94eab0..97ed06b 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -123,6 +123,7 @@
selectEquipmentOverview: "/deviceScope/selectEquipmentOverview", //鑾峰彇璁惧鎬昏
uploadFile: "/deviceScope/uploadFile", //涓婁紶鍥剧墖
selectDevicePrincipal: "/user/getDeviceManager", //鑾峰彇璁惧璐熻矗浜�
+ selectDeviceByCode: "/deviceScope/selectDeviceByCode", //閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃
}
const insOrder = {
@@ -138,6 +139,7 @@
delInsOrderTemplate: "/insOrder/delInsOrderTemplate", //鍒犻櫎妫�楠屽崟妯℃澘
selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�
costStatistics: "/insOrder/costStatistics", //璐圭敤缁熻
+ selectSampleDefects: "/insOrder/selectSampleDefects", //鏍峰搧缂洪櫡鎸囨爣
}
const sampleOrder = {
@@ -196,6 +198,7 @@
upReportUrl: "/insReport/upReportUrl", //鎶ュ憡杩樺師
writeReport: "/insReport/writeReport", //鎶ュ憡鎻愪氦
examineReport: "/insReport/examineReport", //鎶ュ憡瀹℃牳
+ ratifyReport: "/insReport/ratifyReport", //鎶ュ憡鎵瑰噯
}
const warehouse = {
--
Gitblit v1.9.3