From fd9deb7e45ff86f3570a3048a459b29f0ebbd628 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 13 六月 2024 18:04:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/assets/api/controller.js | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index b8984c4..2f5338c 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -25,7 +25,12 @@
performanceShift,
auxiliaryWorkingHours,
unPass,
- companies
+ companies,
+ auxiliaryOutputWorkingHours,
+ auxiliaryWorkingHoursDay,
+ auxiliaryCorrectionHours,
+ insBushing,
+ auxiliaryOriginalHours,
}
}
@@ -139,6 +144,8 @@
uploadFile: "/deviceScope/uploadFile", //涓婁紶鍥剧墖
selectDevicePrincipal: "/user/getDeviceManager", //鑾峰彇璁惧璐熻矗浜�
selectDeviceByCode: "/deviceScope/selectDeviceByCode", //閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃
+ getNumberCollect: "/deviceScope/getNumberCollect", //鏌ヨ鏁伴噰閰嶇疆
+ numberCollect: "/deviceScope/numberCollect", //缁存姢鏁伴噰閰嶇疆
}
const insOrder = {
@@ -155,8 +162,8 @@
selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�
costStatistics: "/insOrder/costStatistics", //璐圭敤缁熻
selectSampleDefects: "/insOrder/selectSampleDefects", //鏍峰搧缂洪櫡鎸囨爣
- updateStatus:"/insOrder/updateStatus",//灏嗗緟瀹℃牳鏇存柊鎴愭挙閿�鐘舵��
- updateInspected:"/insOrder/updateInspected",//灏嗗緟妫�楠岀殑鐨勬挙閿�杩涜鏇存敼
+ updateStatus: "/insOrder/updateStatus", //灏嗗緟瀹℃牳鏇存柊鎴愭挙閿�鐘舵��
+ updateInspected: "/insOrder/updateInspected", //灏嗗緟妫�楠岀殑鐨勬挙閿�杩涜鏇存敼
}
const sampleOrder = {
@@ -172,6 +179,12 @@
verifyPlan: "/insOrderPlan/verifyPlan", //澶嶆牳妫�楠屼换鍔�
submitPlan: "/insOrderPlan/submitPlan", //妫�楠屼换鍔℃彁浜�
inspectionOrderDetailsTaskSwitching: "/insOrderPlan/inspectionOrderDetailsTaskSwitching", // 妫�楠屽崟璇︽儏-浠诲姟鍒囨崲
+ getInsProduct: "/insOrderPlan/getInsProduct", // 鑾峰彇妫�楠岄」鐩拰妯℃澘鍐呭
+ getFileList: "/insOrderPlan/getFileList", // 鏌ョ湅妫�楠屽崟涓嬬殑闄勪欢鍒楄〃
+ delfile: "/insOrderPlan/delfile", // 闄勪欢鍒犻櫎
+ uploadFile: "/insOrderPlan/uploadFile", // 闄勪欢涓婁紶
+ downFile: "/insOrderPlan/downFile", // 闄勪欢涓嬭浇
+ checkSubmitPlan: "/insOrderPlan/checkSubmitPlan", // 鏍￠獙妫�楠屼换鍔℃彁浜�
}
const systemLog = {
@@ -304,3 +317,34 @@
addPersonUser: "/companies/addPersonUser", //鑾峰彇浜轰簨绯荤粺缁勭粐涓嬬殑浜哄憳
selectPersonUser: "/companies/selectPersonUser", //閫氳繃鍛樺伐鍙疯幏鍙栧憳宸�
}
+
+const auxiliaryOutputWorkingHours = {
+ selectAuxiliaryOutputWorkingHours: "/auxiliaryOutputWorkingHours/selectAuxiliaryOutputWorkingHours", //鏌ヨ浜ч噺宸ユ椂
+ collectWorkingHours: "/auxiliaryOutputWorkingHours/collectWorkingHours", //缁熻浜ч噺宸ユ椂姹囨�诲拰杈呭姪宸ユ椂姹囨��
+ exportWorkingHours: "/auxiliaryOutputWorkingHours/exportWorkingHours", //瀵煎嚭
+}
+
+const auxiliaryWorkingHoursDay = {
+ selectAuxiliaryWorkingHoursDay: "/auxiliaryWorkingHoursDay/selectAuxiliaryWorkingHoursDay", //鏌ヨ杈呭姪宸ユ椂
+ deleteAuxiliaryWorkingHoursDay: "/auxiliaryWorkingHoursDay/deleteAuxiliaryWorkingHoursDay", //鍒犻櫎
+ insertAuxiliaryWorkingHoursDay: "/auxiliaryWorkingHoursDay/insertAuxiliaryWorkingHoursDay", //鏂板
+ selectAuxiliaryWorkingHoursByNumber: "/auxiliaryWorkingHoursDay/selectAuxiliaryWorkingHoursByNumber", //鏍规嵁缂栧彿鏌ヨ杈呭姪宸ユ椂閰嶇疆淇℃伅
+ selectshiftByUser: "/auxiliaryWorkingHoursDay/selectshiftByUser", //鏍规嵁缂栧彿褰撳墠鐢ㄦ埛淇℃伅鏌ヨ鎵�鍦ㄧ彮娆�
+ updateAuxiliaryWorkingHoursDay: "/auxiliaryWorkingHoursDay/updateAuxiliaryWorkingHoursDay", //缂栬緫
+ check: "/auxiliaryWorkingHoursDay/check", //瀹℃牳
+ approve: "/auxiliaryWorkingHoursDay/approve", //鎵瑰噯
+}
+
+const auxiliaryCorrectionHours = {
+ selectAuxiliaryCorrectionHours: "/auxiliaryCorrectionHours/selectAuxiliaryCorrectionHours", //鏌ヨ淇宸ユ椂
+ upload: "/auxiliaryCorrectionHours/upload", //瀵煎叆
+}
+
+const insBushing = {
+ selectBushingBySampleId: "/insBushing/selectBushingBySampleId", //閫氳繃鏍峰搧id鑾峰彇鏍峰搧涓嬪厜绾ら厤缃唴瀹�
+}
+
+const auxiliaryOriginalHours = {
+ selectAuxiliaryOriginalHours: "/auxiliaryOriginalHours/selectAuxiliaryOriginalHours", //鏌ヨ鍘熷宸ユ椂
+ exportOriginalHours: "/auxiliaryOriginalHours/exportOriginalHours", //瀵煎嚭鍘熷宸ユ椂
+}
--
Gitblit v1.9.3