diff --git a/sgzb-screen/src/api/dialog.js b/sgzb-screen/src/api/dialog.js index 05de6c69..8dde3f83 100644 --- a/sgzb-screen/src/api/dialog.js +++ b/sgzb-screen/src/api/dialog.js @@ -8,6 +8,8 @@ const URL_PROJECT_LIST = '/screen/material/agreementInfo/getProjectList' const URL_SCRAP_ANALYSIS = '/screen/base/largeScreen/home/getScrapAnalysisByMonth/details' const URL_TOTAL_OWNERSHIP = '/screen/base/largeScreen/home/getTotalOwnership/details' const URL_ACCEPTANCE_STORAGE = '/screen/base/largeScreen/home/getAcceptanceStorage/details' +const URL_PICKING_ANALYSIS = '/screen/base/largeScreen/home/getPickingAnalysisByMonth/details' +const URL_MATERIAL_RETURN_BY_MONTH = '/screen/base/largeScreen/home/getMaterialReturnByMonth/details' // 设备类型 export const getTypeList = params => GET(URL_TYPE_LIST, params) @@ -32,3 +34,9 @@ export const getTotalOwnership = data => POST(URL_TOTAL_OWNERSHIP, data) // 入库分析 export const getAcceptanceStorage = data => POST(URL_ACCEPTANCE_STORAGE, data) + +// 领料分析 +export const getPickingAnalysis = data => POST(URL_PICKING_ANALYSIS, data) + +// 退料分析 +export const getMaterialReturnByMonth = data => POST(URL_MATERIAL_RETURN_BY_MONTH, data) \ No newline at end of file diff --git a/sgzb-screen/src/components/home/getMaterialsDialog.vue b/sgzb-screen/src/components/home/getMaterialsDialog.vue index 44e21ce7..c2607d2e 100644 --- a/sgzb-screen/src/components/home/getMaterialsDialog.vue +++ b/sgzb-screen/src/components/home/getMaterialsDialog.vue @@ -90,7 +90,6 @@ export default { data() { return { open: false, - material: false, // 领料 formData: { materialReqNo: '', materialReqUnitValue: '', diff --git a/sgzb-screen/src/components/home/materialAnalysisDialog.vue b/sgzb-screen/src/components/home/materialAnalysisDialog.vue index 37c5cdd2..31701621 100644 --- a/sgzb-screen/src/components/home/materialAnalysisDialog.vue +++ b/sgzb-screen/src/components/home/materialAnalysisDialog.vue @@ -71,7 +71,7 @@ + + \ No newline at end of file diff --git a/sgzb-screen/src/components/home/returnMaterialsDialog.vue b/sgzb-screen/src/components/home/returnMaterialsDialog.vue index bdb2fb2d..ec08ba0f 100644 --- a/sgzb-screen/src/components/home/returnMaterialsDialog.vue +++ b/sgzb-screen/src/components/home/returnMaterialsDialog.vue @@ -90,7 +90,6 @@ export default { data() { return { open: false, - material: false, // 领料 formData: { materialReqNo: '', materialReqUnitValue: '', diff --git a/sgzb-screen/src/components/home/rightOne.vue b/sgzb-screen/src/components/home/rightOne.vue index 5c000fc8..7d02b1b8 100644 --- a/sgzb-screen/src/components/home/rightOne.vue +++ b/sgzb-screen/src/components/home/rightOne.vue @@ -5,7 +5,7 @@