From 9e2144ae9eaed728cc12e75f7ae1b53e5874d5bf Mon Sep 17 00:00:00 2001 From: 王震 <10952869+daywangzhen@user.noreply.gitee.com> Date: 星期五, 08 九月 2023 11:13:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/assets/api/controller.js | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js index f57edf9..ee6631d 100644 --- a/src/assets/api/controller.js +++ b/src/assets/api/controller.js @@ -17,19 +17,30 @@ } // 鍘熸潗鏂欐楠� const raw = { - selectRawInspectsList: "rawInspect/selectRawInspectsList", //鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃 - selectRawInspectsListById: "rawInspect/selectRawInspectsListById/", //鏍规嵁妫�楠屽崟id鑾峰彇妫�楠屽崟璇︽儏 - updaterawInsProduct: 'rawInsProduct/updaterawInsProduct', //淇敼椤圭洰鐨勬楠屽�� + selectRawInspectsList: "/rawInspect/selectRawInspectsList", //鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃 + selectRawInspectsListById: "/rawInspect/selectRawInspectsListById/", //鏍规嵁妫�楠屽崟id鑾峰彇妫�楠屽崟璇︽儏 + updaterawInsProduct: '/rawInsProduct/updaterawInsProduct', //淇敼椤圭洰鐨勬楠屽�� updateRawInspectsById: "/rawInspect/updateRawInspectsById/", //涓婃姤, - selectRawMaterial: "/rawInspect/selectMaterial", //鏌ヨ鍘熸潗鏂欎俊鎭� + selectDevice: "/rawInsProduct/selectDevice", //鏌ヨ璁惧淇℃伅 selectSpBySt: "/rawInspect/selectSpBySt", //鏍规嵁鏉愭枡id鏌ヨ鎵�鏈夊瀷鍙�, addRawInspects: "/rawInspect/addRawInspects" } //涓嶅悎鏍煎師鏉愭枡 const unqualifiedaa ={ - selectUnRawInspectsList: "/inspectUnaccepted/selectUnRawInspectsList" + selectUnRawInspectsList: "/inspectUnaccepted/selectURawMaterials" } - +// 鏌ヨ鎴愬搧涓嶅悎鏍煎搧绠$悊 +const unRawInspects ={ + inspectUnaccepted: "/inspectUnaccepted/selectUnRawInspectsList" +} +//涓嶅悎鏍煎搧澶勭疆 +const dispose = { + getTable: "/inspectUnaccepted/selectDisposal", // 涓嶅悎鏍煎搧鍒嗛〉鍒楄〃 + descriptionUpdate: "/inspectUnaccepted/descriptionUpdate", // 澶辩劍鏇存柊鐜板儚鎻忚堪 + viewEditorial: "/inspectUnaccepted/viewEditorial", // 鏌ョ湅缂栬緫鎰忚 + clickEditing: "/inspectUnaccepted/clickEditing", // 鐐瑰嚮缂栬緫鎰忚瑙﹀彂鏌ヨ + addOpinion: "/inspectUnaccepted/addOpinion" // 缂栬緫鎰忚-->纭畾鎸夐挳 +} // 鎴愬搧妫�楠� const finishedIns = { finishedInsListPage: "/finished-inspect/list_page", //鑾峰彇鎴愬搧妫�楠屽垪琛� @@ -54,10 +65,6 @@ tableDeviceList: "/device/table_list", // 瀹為獙瀹ゆā鍧楄〃鏍兼暟鎹� deleteDevice: "/device/delete", // 鍒犻櫎瀹為獙瀹よ澶� deleteIdorFather: "/device/deleteIdorFather" // 鍒犻櫎鏍戞ā鍧楁暟鎹� -} -//涓嶅悎鏍煎搧澶勭疆 -const dispose = { - gettable:"/opinion/list_page" } // QMS璁¢噺绠$悊 @@ -123,6 +130,7 @@ ...unqualifiedaa, ...dispose, ...Basicdata, + ...unRawInspects, // ...gettable, selectSaleList: "sale/selectSaleList", //鏌ヨ閿�鍞崟鍒楄〃 selectSaleDatilById: "sale/selectSaleDatilById", //鏍规嵁閿�鍞崟id鏌ョ湅璇︽儏, -- Gitblit v1.9.3