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 | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 84b36a2..5b3cbdc 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -29,6 +29,7 @@
auxiliaryOutputWorkingHours,
auxiliaryWorkingHoursDay,
auxiliaryCorrectionHours,
+ insBushing
}
}
@@ -57,6 +58,8 @@
upUserPassword: "/user/upUserPassword", //淇敼鐢ㄦ埛瀵嗙爜
upUserDepardLimsId: "/user/upUserDepardLimsId", //淇敼浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�
delUserDepardLimsId: "/user/delUserDepardLimsId", //鍒犻櫎浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�
+ upCustom: "/user/upCustom", //淇敼瀹㈡埛淇℃伅
+ selectCustomEnum: "/user/selectCustomEnum", //鑾峰彇瀹㈡埛鏋氫妇
}
const dataReporting = {
@@ -156,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 = {
@@ -249,6 +252,7 @@
selectDepartmentLim: "/department/selectDepartmentLim", //鑾峰彇閮ㄩ棬鏍�
addDepartmentLims: "/department/addDepartmentLims", //娣诲姞閮ㄩ棬
delDepartmentLims: "/department/delDepartmentLims", //鍒犻櫎閮ㄩ棬
+ selectDepartmentEnum: "/department/selectDepartmentEnum", //鑾峰彇缁勭粐鏋舵瀯鏋氫妇
}
const report = {
@@ -302,6 +306,7 @@
selectCompaniesList: "/companies/selectCompaniesList", //鑾峰彇浜轰簨绯荤粺缁勭粐
selectSimpleList: "/companies/selectSimpleList", //鑾峰彇浜轰簨绯荤粺缁勭粐涓嬬殑浜哄憳
addPersonUser: "/companies/addPersonUser", //鑾峰彇浜轰簨绯荤粺缁勭粐涓嬬殑浜哄憳
+ selectPersonUser: "/companies/selectPersonUser", //閫氳繃鍛樺伐鍙疯幏鍙栧憳宸�
}
const auxiliaryOutputWorkingHours = {
@@ -324,3 +329,7 @@
const auxiliaryCorrectionHours = {
selectAuxiliaryCorrectionHours: "/auxiliaryCorrectionHours/selectAuxiliaryCorrectionHours", //鏌ヨ淇宸ユ椂
}
+
+const insBushing = {
+ selectBushingBySampleId: "/insBushing/selectBushingBySampleId", //閫氳繃鏍峰搧id鑾峰彇鏍峰搧涓嬪厜绾ら厤缃唴瀹�
+}
--
Gitblit v1.9.3