From b12ac953f7edf7e8d42e0da958a0779d64cd40bc Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 19 三月 2025 10:46:16 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before
---
src/assets/api/controller.js | 124 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 119 insertions(+), 5 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 92016a1..57ea39a 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -90,7 +90,10 @@
responsi,
deviceReservate,
deviceInstruction,
- borrow
+ borrow,
+ getDocuments,
+ product,
+ deviceBorrow
};
}
@@ -203,6 +206,7 @@
};
const deviceScope = {
+ selectUserList: "/deviceScope/selectUserList", //鑾峰彇鐢ㄦ埛鍒楄〃
selectDeviceParameter: "/deviceScope/selectDeviceParameter", //鏌ヨ璁惧璇︽儏鍒楄〃
addDeviceParameter: "/deviceScope/addDeviceParameter", //娣诲姞璁惧璇︽儏鍙傛暟
delDeviceParameter: "/deviceScope/delDeviceParameter", //鍒犻櫎璁惧璇︽儏鍙傛暟
@@ -292,7 +296,8 @@
preview: "/insOrderPlan/preview", // csv鏂囦欢棰勮
outInsOrderState: "/insOrderPlan/outInsOrderState", // 妫�楠屼换鍔℃壂鐮佸嚭搴�
// insOrderPlan.cancelSubmitPlan
- cancelSubmitPlan: "/insOrderPlan/cancelSubmitPlan" // 妫�楠屼换鍔℃挙閿�
+ cancelSubmitPlan: "/insOrderPlan/cancelSubmitPlan", // 妫�楠屼换鍔℃挙閿�
+ verifyPlan2: "/insOrderPlan/verifyPlan2" // 绾犳澶嶆牳
};
const systemLog = {
@@ -653,7 +658,92 @@
// 6.2 浜哄憳
const personnel = {
selectCNSAPersonTree: "/personBasicInfo/selectCNSAPersonTree", // 鏌ヨCNAS浜哄憳渚ц竟鏍�
- saveCNASFile: "/personBasicInfo/saveCNASFile" // 鍏叡鏂囦欢淇濆瓨鎺ュ彛
+ getAnnex: "/personBasicInfo/getAnnex", // 鑾峰彇闄勪欢
+ basicInformationOfPersonnelSelectPage:
+ "personBasicInfo/basicInformationOfPersonnelSelectPage", // 鑾峰彇浜哄憳鍒楄〃
+ getAnnexByUserId: "/personBasicInfo/getAnnexByUserId",
+ addAnnex: "/personBasicInfo/addAnnex", // 娣诲姞闄勪欢
+ deleteAnnex: "/personBasicInfo/deleteAnnex", // 鍒犻櫎闄勪欢
+ updateAnnex: "/personBasicInfo/updateAnnex", // 鏇存柊闄勪欢
+ getCNASFile: "/personBasicInfo/getCNASFile", // 鑾峰彇鍥剧墖
+ getCNASInformation: "/personBasicInfo/getCNASInformation", // 鏌ヨCNAS浜哄憳淇℃伅
+ updateCNASInformation: "/personBasicInfo/updateCNASInformation", // 鏇存柊CNAS浜哄憳淇℃伅
+ getCNASPersonnelInfo: "/personBasicInfo/getCNASPersonnelInfo", // 浜哄憳鍩烘湰淇℃伅鏌ヨ
+ saveCNASPersonnelInfo: "/personBasicInfo/saveCNASPersonnelInfo", // 浜哄憳鍩烘湰淇℃伅淇濆瓨
+ saveCNASFile: "/personBasicInfo/saveCNASFile", // 鍏叡鏂囦欢淇濆瓨鎺ュ彛
+ deleteCNASFile: "/personBasicInfo/deleteCNASFile", // 鍒犻櫎鏂囦欢
+ getBasicInfoFileList: "/personBasicInfo/getBasicInfoFileList", // 浜哄憳鍩硅鍩烘湰淇℃伅闄勪欢鍒楄〃
+ uploadBasicInfoFile: "/personBasicInfo/uploadBasicInfoFile", // 浜哄憳鍩硅鍩烘湰淇℃伅闄勪欢鍒楄〃
+ delBasicInfoFileList: "/personBasicInfo/delBasicInfoFileList", // 浜哄憳鍩硅鍩烘湰淇℃伅闄勪欢鍒楄〃
+ addBasicInfoWork: "/personBasicInfo/addBasicInfoWork", // 浜哄憳鍩硅鍩烘湰淇℃伅宸ヤ綔缁忓巻鏂板
+ updateBasicInfoWorkList: "/personBasicInfo/updateBasicInfoWorkList", // 浜哄憳鍩硅鍩烘湰淇℃伅宸ヤ綔缁忓巻淇敼
+ getBasicInfoWorkList: "/personBasicInfo/getBasicInfoWorkList", // 浜哄憳鍩硅鍩烘湰淇℃伅宸ヤ綔缁忓巻鍒楄〃
+ delBasicInfoWorkList: "/personBasicInfo/delBasicInfoWorkList", // 浜哄憳鍩硅鍩烘湰淇℃伅宸ヤ綔缁忓巻鍒犻櫎
+ getThisYearTrainingDetailed: "/personTraining/getThisYearTrainingDetailed", // 鏌ヨ浠婂勾浜哄憳鍩硅淇℃伅
+ personTrainingSelect: "/personTraining/personTrainingSelect", // 鏌ヨ浜哄憳鍩硅
+ personTrainingDelete: "/personTraining/personTrainingDelete", // 鍒犻櫎浜哄憳鍩硅淇℃伅
+ approveAnnualPersonnelTraining:
+ "/personTraining/approveAnnualPersonnelTraining", // 鎵瑰噯 骞村害浜哄憳鍩硅
+ reviewAnnualPersonnelTraining:
+ "/personTraining/reviewAnnualPersonnelTraining", // 瀹℃牳 骞村害浜哄憳鍩硅
+ personTrainingImport: "/personTraining/personTrainingImport", // 瀵煎叆 浜哄憳鍩硅
+ exportPersonTraining: "/personTraining/exportPersonTraining", // 瀵煎嚭/浜哄憳鍩硅
+ queryTheAnnualPlanDetailsTable:
+ "/personTraining/queryTheAnnualPlanDetailsTable", // 鏌ヨ鍩硅璁″垝骞村害璁″垝鏄庣粏琛�
+ addOrUpdatePersonTrainingDetailed:
+ "/personTraining/addOrUpdatePersonTrainingDetailed", // 鏂板鍩硅璁″垝骞村害璁″垝鏄庣粏琛�
+ deleteAnnualPlanDetailTable: "/personTraining/deleteAnnualPlanDetailTable", // 鎵归噺鍒犻櫎 骞村害璁″垝鏄庣粏琛�
+ trainingAndAssessmentRecordsPage:
+ "/personTraining/trainingAndAssessmentRecordsPage", // 鍩硅涓庤�冩牳璁板綍 鏌ヨ
+ deleteTrainingAndAssessmentRecords:
+ "/personTraining/deleteTrainingAndAssessmentRecords", // 鍩硅涓庤�冩牳璁板綍 鎵归噺鍒犻櫎
+ trainingAndAssessmentRecordsAdded:
+ "/personTraining/trainingAndAssessmentRecordsAdded", // 鍩硅涓庤�冩牳璁板綍 鎻愪氦
+ trainingAndAssessmentRecordsEvaluate:
+ "/personTraining/trainingAndAssessmentRecordsEvaluate", // 鍩硅涓庤�冩牳璁板綍 鎻愪氦璇勪环
+ getTrainingDetailedFileList: "/personTraining/getTrainingDetailedFileList", // 浜哄憳鍩硅璇︽儏闄勪欢鍒楄〃
+ delTrainingDetailedFileList: "/personTraining/delTrainingDetailedFileList", // 浜哄憳鍩硅璇︽儏闄勪欢鍒犻櫎
+ uploadTrainingDetailedFile: "/personTraining/uploadTrainingDetailedFile", // 浜哄憳鍩硅璇︽儏闄勪欢鏂板
+ personJobResponsibilitiesSave:
+ "/personJobResponsibilities/personJobResponsibilitiesSave", // 鏂板宀椾綅鑱岃矗
+ personJobResponsibilitiesDelete:
+ "/personJobResponsibilities/personJobResponsibilitiesDelete", // 鍒犻櫎宀椾綅鑱岃矗
+ personJobResponsibilitiesUpdate:
+ "/personJobResponsibilities/personJobResponsibilitiesUpdate", // 鏇存柊宀椾綅鑱岃矗
+ personJobResponsibilitiesSelect:
+ "/personJobResponsibilities/personJobResponsibilitiesSelect", // 鍒嗛〉鏌ヨ宀椾綅鑱岃矗
+ personJobResponsibilitiesExport:
+ "/personJobResponsibilities/personJobResponsibilitiesExport", // 瀵煎嚭宀椾綅鑱岃矗
+ personTrackRecordSave: "/personTrackRecord/personTrackRecordSave", // 鏂板宸ヤ綔灞ュ巻
+ personTrackRecordDelete: "/personTrackRecord/personTrackRecordDelete", // 鍒犻櫎宸ヤ綔灞ュ巻
+ personTrackRecordUpdate: "/personTrackRecord/personTrackRecordUpdate", // 鏇存柊宸ヤ綔灞ュ巻
+ personTrackRecordSelect: "/personTrackRecord/personTrackRecordSelect", // 鏌ヨ宸ヤ綔灞ュ巻
+ personTrackRecordExport: "/personTrackRecord/personTrackRecordExport", // 瀵煎嚭宸ヤ綔灞ュ巻
+ personTrainingRecordSelect:
+ "/personTrainingRecord/personTrainingRecordSelect", // 鏌ヨ鍩硅璁板綍
+ personTrainingRecordExport:
+ "/personTrainingRecord/personTrainingRecordExport", // 宸ヤ綔鍩硅璁板綍
+ personPersonnelCapacityPage:
+ "/personPersonnelCapacity/personPersonnelCapacityPage", // 鏌ヨ浜哄憳鑳藉姏
+ deletePersonPersonnelCapacity:
+ "/personPersonnelCapacity/deletePersonPersonnelCapacity", // 鍒犻櫎浜哄憳鑳藉姏
+ addOrUpdatePersonPersonnelCapacity:
+ "/personPersonnelCapacity/addOrUpdatePersonPersonnelCapacity", // 鏂板缂栬緫浜哄憳鑳藉姏
+ submitConfirmPersonnelCapability:
+ "/personPersonnelCapacity/submitConfirmPersonnelCapability", // 鏂板缂栬緫浜哄憳鑳藉姏
+ exportPersonnelCapacity: "/personPersonnelCapacity/exportPersonnelCapacity", // 瀵煎嚭浜哄憳鑳藉姏
+ newPersonnelAddedToTrainingRecords:
+ "/personTraining/newPersonnelAddedToTrainingRecords", // 鍩硅涓庤�冩牳 鏂板浜哄憳
+ outOfFocusPreservation: "/personTraining/outOfFocusPreservation", // 鍩硅涓庤�冩牳 澶辩劍鏇存柊
+ trainingSelectTrainingRecord:
+ "/personTrainingRecord/trainingSelectTrainingRecord", // 鏌ヨ浜哄憳 鍩硅璁板綍
+ queryPersonnelDetails: "/personTrainingRecord/queryPersonnelDetails", // 鏌ヨ浜哄憳鏄庣粏 鍩硅璁板綍
+ claimOfTrainingAndAssessmentRecords:
+ "/personTraining/claimOfTrainingAndAssessmentRecords", // 璁ら/鍙栨秷璁ら
+ exportPersonTrainingRecord: "/personTraining/exportPersonTrainingRecord", // 瀵煎嚭浜哄憳鍩硅涓庤�冩牳璁板綍
+ exportTrainingRecord: "/personTrainingRecord/exportTrainingRecord", // 瀵煎嚭鍩硅璁板綍
+ confirmPersonnelCapability:
+ "/personPersonnelCapacity/confirmPersonnelCapability" // 纭浜哄憳鑳藉姏
};
// 8.3 瀹㈡埛婊℃剰搴﹁皟鏌�
@@ -820,7 +910,8 @@
uploadVerifyMethodFile: "/processMethodVerify/uploadVerifyMethodFile", // 鏂板鍘熷璁板綍
getVerifyMethodFileList: "/processMethodVerify/getVerifyMethodFileList", // 鍘熷璁板綍鍒楄〃
delVerifyMethodFileList: "/processMethodVerify/delVerifyMethodFileList", // 鍒犻櫎楠岃瘉鍘熷璁板綍鍒楄〃
- delMethodVerify: "/processMethodVerify/delMethodVerify" // 鍒犻櫎鏍囧噯鏂规硶鏇存柊楠岃瘉
+ delMethodVerify: "/processMethodVerify/delMethodVerify", // 鍒犻櫎鏍囧噯鏂规硶鏇存柊楠岃瘉
+ exportMethodVerify: "/processMethodVerify/exportMethodVerify" // 瀵煎嚭鏍囧噯鏂规硶鏇存柊楠岃瘉
};
// 7.4妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�-鏍峰搧鎺ユ敹
@@ -879,7 +970,9 @@
ratifyQualityMonitor: "/qualityMonitor/ratifyQualityMonitor", // 鐩戞帶璁″垝鎵瑰噯
delQualitySupervise: "/qualityMonitor/delQualitySupervise", // 鐩戞帶璁″垝鎵瑰噯
importQualityMonitor: "/qualityMonitor/importQualityMonitor", // 瀵煎叆鐩戞帶璁″垝
- exportQualityMonitorDetail: "/qualityMonitor/exportQualityMonitorDetail" // 瀵煎嚭鐩戞帶璁″垝
+ exportQualityMonitorDetail: "/qualityMonitor/exportQualityMonitorDetail", // 瀵煎嚭鐩戞帶璁″垝
+ exportQualityMonitorRatify: "/qualityMonitor/exportQualityMonitorRatify", // 璐ㄩ噺鐩戞帶瀹炴柦璁″垝瀵煎嚭
+ exportQualityMonitorEvaluate: "/qualityMonitor/exportQualityMonitorEvaluate" // 璐ㄩ噺鐩戞帶璇勪环瀵煎嚭
};
// 8.5 搴斿椋庨櫓鍜屾満閬囩殑鎺柦
@@ -1039,6 +1132,17 @@
exportPersonBasicInfoById: "/personBasicInfo/exportPersonBasicInfoById", //鏈俊鎭鍑�,浼犲弬绫讳技鍒嗛〉
exportPersonJobResponsibilities:
"/personJobResponsibilities/exportPersonJobResponsibilities" //瀵煎嚭浜哄憳鑱岃矗,浼犲弬id
+};
+
+// 鑾峰彇鐩稿叧鏂囨。鏁版嵁鐨刟pi
+const getDocuments = {
+ list: "/documents",
+ get: "/documents/getListByDId",
+ updateDocument: "/documents/updateDocument"
+};
+// 浜у搧鐩稿簲鐨勬帴鍙�
+const product = {
+ list: "/api/products"
};
//璁惧鏁呴殰鐩稿簲鐨勬帴鍙�
@@ -1308,3 +1412,13 @@
updateTraceabilityManagement:
"/deviceTraceabilityManagement/updateTraceabilityManagement" // 淇敼閲忓�兼函婧愯鍒�
};
+
+// 6.4 璁惧
+const deviceBorrow = {
+ deviceBorrowPage: "/deviceBorrow/deviceBorrowPage", // 璁惧鍊熷嚭list
+ deleteDeviceBorrow: "/deviceBorrow/deleteDeviceBorrow", //鍒犻櫎
+ saveDeviceBorrow: "/deviceBorrow/saveDeviceBorrow", //淇濆瓨
+ getDeviceBorrow: "/deviceBorrow/getDeviceBorrow", //鏌ョ湅
+ deviceBorrowExport: "/deviceBorrow/deviceBorrowExport", //瀵煎嚭
+ directoryListing: "/procurementSuppliesContents/directoryListing" // 閲囪喘鐗╄祫鐩綍鍒楄〃
+};
--
Gitblit v1.9.3