From dd929871969c4275eeb3246d7c5c0d6f35060b10 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 31 十二月 2024 14:52:47 +0800
Subject: [PATCH] 接口文件冲突
---
src/assets/api/controller.js | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 64cbb6b..6372293 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -73,6 +73,8 @@
personPostAuthorizationRecord,
deviceCheck,
personCommunicationAbility,
+ procurementSuppliesContents,
+ procurementSuppliesStore,
}
}
@@ -266,6 +268,8 @@
getInsOrderUserList: "/insOrderPlan/getInsOrderUserList", // 鏌ョ湅妫�楠屽巻鍙插垪琛�
preview: "/insOrderPlan/preview", // csv鏂囦欢棰勮
outInsOrderState: "/insOrderPlan/outInsOrderState", // 妫�楠屼换鍔℃壂鐮佸嚭搴�
+ // insOrderPlan.cancelSubmitPlan
+ cancelSubmitPlan: "/insOrderPlan/cancelSubmitPlan", // 妫�楠屼换鍔℃挙閿�
}
const systemLog = {
@@ -363,6 +367,7 @@
testProductByDay: "/report/testProductByDay", //棣栨娴嬮」鐩粺璁�
manHourByStation: "/report/manHourByStation", //棣栭〉宸ユ椂缁熻
manHourByPerson: "/report/manHourByPerson", //棣栭〉宸ユ椂缁熻
+ timeByStation: "/report/timeByStation", //绔欑偣宸ユ椂缁熻
}
const certification = {
getCertificationDetail: "/certification/getCertificationDetail", //鏌ヨ璧勮川鏄庣粏鍒楄〃
@@ -523,13 +528,13 @@
}
// 8.4璁板綍鐨勬帶鍒�--鏂囦欢瀹℃壒璁板綍
const manageRecordCheck = {
- pageManageRecordCheck:'/manageRecordCheck/pageManageRecordCheck ',//鍒楄〃
- addManageRecordCheck:'/manageRecordCheck/addManageRecordCheck ',//鏂板
- doManageRecordCheck:'/manageRecordCheck/doManageRecordCheck ',//缂栬緫
- delManageRecordCheck:'/manageRecordCheck/delManageRecordCheck ',//鍒犻櫎
- checkManageRecordCheck:'/manageRecordCheck/checkManageRecordCheck ',//瀹℃牳
- ratifyManageRecordCheck:'/manageRecordCheck/ratifyManageRecordCheck ',//鎵瑰噯
- exportOutManageRecordCheck:'/manageRecordCheck/exportOutManageRecordCheck ',//瀵煎嚭
+ pageManageRecordCheck:'/manageRecordCheck/pageManageRecordCheck',//鍒楄〃
+ addManageRecordCheck:'/manageRecordCheck/addManageRecordCheck',//鏂板
+ doManageRecordCheck:'/manageRecordCheck/doManageRecordCheck',//缂栬緫
+ delManageRecordCheck:'/manageRecordCheck/delManageRecordCheck',//鍒犻櫎
+ checkManageRecordCheck:'/manageRecordCheck/checkManageRecordCheck',//瀹℃牳
+ ratifyManageRecordCheck:'/manageRecordCheck/ratifyManageRecordCheck',//鎵瑰噯
+ exportOutManageRecordCheck:'/manageRecordCheck/exportOutManageRecordCheck',//瀵煎嚭
exportInManageRecordCheck:'/manageRecordCheck/exportInManageRecordCheck',//瀵煎叆
}
@@ -811,7 +816,7 @@
getPageResults: "/manageRiskAssessmentResults/getPageResults", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 鍒嗛〉
hazardIdentificationAndRiskApproval: "/manageRiskAssessmentResults/hazardIdentificationAndRiskApproval", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 鎵瑰噯
dangerousRiskApproval: "/manageRiskAssessmentResults/dangerousRiskApproval", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 瀹℃壒
- riskAssessmentImport: "manageRiskAssessmentResults/riskAssessmentImport", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 瀵煎叆
+ riskAssessmentImport: "/manageRiskAssessmentResults/riskAssessmentImport", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 瀵煎叆
addNewRiskFactors: "/manageRiskAssessmentResults/addNewRiskFactors", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 鏂板
removeRiskFactors: "/manageRiskAssessmentResults/removeRiskFactors", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 鍒犻櫎
exportHazardFactorIdentification: "/manageRiskAssessmentResults/exportHazardFactorIdentification", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 瀵煎嚭
@@ -977,3 +982,24 @@
const personCommunicationAbility = {
exportPersonCommunicationAbility:'/personCommunicationAbility/exportPersonCommunicationAbility',//瀵煎嚭
}
+
+const procurementSuppliesContents = {
+ directoryListing: "/procurementSuppliesContents/directoryListing", // 閲囪喘鐗╄祫鐩綍鍒楄〃
+ selectById: "/procurementSuppliesContents/selectProcurementSuppliesContentById", // 閲囪喘鐗╄祫鐩綍璇︽儏
+ add: "/procurementSuppliesContents/addProcurementSuppliesContents", // 閲囪喘鐗╄祫鐩綍鏂板
+ update: "/procurementSuppliesContents/updateProcurementSuppliesContents", // 閲囪喘鐗╄祫鐩綍淇敼
+ deleteById: "/procurementSuppliesContents/deleteProcurementSuppliesContentById", // 閲囪喘鐗╄祫鐩綍鍒犻櫎
+ getUserList: "/procurementSuppliesContents/getUserList", // 閲囪喘鐗╄祫鐩綍鑾峰彇鐢ㄦ埛鍒楄〃
+ getNodeNames: "/procurementSuppliesContents/getNodeNames", // 閲囪喘鐗╄祫鐩綍鑾峰彇鑺傜偣鍚嶇О
+ selectSuppliersDirectoryContentsById:'/suppliersDirectoryContents/selectSuppliersDirectoryContentsById',//渚涘簲鍟嗙洰褰曡鎯�
+}
+
+const procurementSuppliesStore = {
+ storeList: '/procurementSuppliesStore/storeList', // 鑰楁潗鍏ュ簱鍒楄〃
+ addStore: '/procurementSuppliesStore/addStore', // 鑰楁潗鍏ュ簱鏂板
+ deleteStore: '/procurementSuppliesStore/deleteStore', // 鑰楁潗鍏ュ簱鍒犻櫎
+ updateStore: '/procurementSuppliesStore/updateStore', // 鑰楁潗鍏ュ簱淇敼
+ selectStoreById: '/procurementSuppliesStore/selectStoreById', // 鏍规嵁id鏌ヨ鑰楁潗鍏ュ簱
+ exportExcel: '/procurementSuppliesStore/exportExcel', // 鑰楁潗鍏ュ簱瀵煎嚭
+ updateStore: '/procurementSuppliesStore/updateStore', // 鑰楁潗鍏ュ簱淇敼
+}
--
Gitblit v1.9.3