From 6bb8da1d317da366769d64120ee645c03f305023 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 16 五月 2024 14:55:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/assets/api/controller.js | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 068184a..3b3d22a 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -23,7 +23,9 @@
sealScope,
informationNotification,
performanceShift,
- unPass,
+ auxiliaryWorkingHours,
+ unPass,
+ companies
}
}
@@ -181,6 +183,7 @@
selectStandardProductListByMethodId: "/standardTree/selectStandardProductListByMethodId", //閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�
selectStandardMethodEnum: "/standardTree/selectStandardMethodEnum", //鑾峰彇鏍囧噯鏍戜笅鏍囧噯鏂规硶鏋氫妇
getStandardTree2: "/standardTree/getStandardTree2", //鑾峰彇浜у搧鏋舵瀯
+ upStandardProducts: "/standardTree/upStandardProducts", //鑾峰彇浜у搧鏋舵瀯
}
const standardMethod = {
@@ -261,9 +264,23 @@
const performanceShift = {
add:"/performanceShift/add",//缁╂晥绠＄悊-鐝-鎺掔彮
page:"/performanceShift/page",//缁╂晥绠＄悊-鐝-鍒嗛〉鏌ヨ
- update:"/performanceShift/update/",//缁╂晥绠＄悊-鐝-鐝鐘舵�佷慨鏀�
+ update:"/performanceShift/update",//缁╂晥绠＄悊-鐝-鐝鐘舵�佷慨鏀�
+ pageYear:"/performanceShift/pageYear",//缁╂晥绠＄悊-鐝-骞翠唤鍒嗛〉鏌ヨ
+ export:"/performanceShift/export",//缁╂晥绠＄悊-鐝-瀵煎嚭
+}
+
+const auxiliaryWorkingHours = {
+ selectAuxiliaryWorkingHours:"/auxiliaryWorkingHours/selectAuxiliaryWorkingHours",//鏌ヨ杈呭姪宸ユ椂
+ deleteAuxiliaryWorkingHours:"/auxiliaryWorkingHours/deleteAuxiliaryWorkingHours",//鍒犻櫎杈呭姪宸ユ椂
+ upAuxiliaryWorkingHours:"/auxiliaryWorkingHours/upAuxiliaryWorkingHours",//淇敼杈呭姪宸ユ椂
+ insertAuxiliaryWorkingHours:"/auxiliaryWorkingHours/insertAuxiliaryWorkingHours",//鏂板杈呭姪宸ユ椂
}
const unPass = {
pageInsUnPass:"/unPass/pageInsUnPass", // 鏌ヨ涓嶅悎鏍兼牱鍝佹暟鎹�
}
+
+const companies = {
+ selectCompaniesList: "/companies/selectCompaniesList", //鑾峰彇浜轰簨绯荤粺缁勭粐
+ selectSimpleList: "/companies/selectSimpleList", //鑾峰彇浜轰簨绯荤粺缁勭粐涓嬬殑浜哄憳
+}
--
Gitblit v1.9.3