From 620880da2e11fe0a56d24662f4736332bf08e9e5 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 31 五月 2024 15:48:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/assets/api/controller.js | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index b8984c4..5b3cbdc 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -25,7 +25,11 @@
performanceShift,
auxiliaryWorkingHours,
unPass,
- companies
+ companies,
+ auxiliaryOutputWorkingHours,
+ auxiliaryWorkingHoursDay,
+ auxiliaryCorrectionHours,
+ insBushing
}
}
@@ -155,8 +159,8 @@
selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�
costStatistics: "/insOrder/costStatistics", //璐圭敤缁熻
selectSampleDefects: "/insOrder/selectSampleDefects", //鏍峰搧缂洪櫡鎸囨爣
- updateStatus:"/insOrder/updateStatus",//灏嗗緟瀹℃牳鏇存柊鎴愭挙閿�鐘舵��
- updateInspected:"/insOrder/updateInspected",//灏嗗緟妫�楠岀殑鐨勬挙閿�杩涜鏇存敼
+ updateStatus: "/insOrder/updateStatus", //灏嗗緟瀹℃牳鏇存柊鎴愭挙閿�鐘舵��
+ updateInspected: "/insOrder/updateInspected", //灏嗗緟妫�楠岀殑鐨勬挙閿�杩涜鏇存敼
}
const sampleOrder = {
@@ -304,3 +308,28 @@
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", //鏌ヨ淇宸ユ椂
+}
+
+const insBushing = {
+ selectBushingBySampleId: "/insBushing/selectBushingBySampleId", //閫氳繃鏍峰搧id鑾峰彇鏍峰搧涓嬪厜绾ら厤缃唴瀹�
+}
--
Gitblit v1.9.3