diff --git a/package.json b/package.json index fb95d65..e0d7a28 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "bootstrap": "^5.3.0-alpha1", "clipboard": "2.0.8", "core-js": "3.6.5", + "dhtmlx-gantt": "^8.0.6", "echarts": "^5.4.3", "echarts-gl": "^2.0.8", "echarts-wordcloud": "^2.0.0", diff --git a/src/api/productManagement/workorder.js b/src/api/productManagement/workorder.js index c293c84..a7df256 100644 --- a/src/api/productManagement/workorder.js +++ b/src/api/productManagement/workorder.js @@ -47,3 +47,13 @@ export function saveSrotResults(data) { contextType: 'application/json', }) } + + + +export function GetGanttListAPI(query) { + return request({ + url: '/mes/pro/workorder/GetGanttList', + method: 'get', + params: query, + }) +} diff --git a/src/api/qualityManagement/IQC.js b/src/api/qualityManagement/IQC.js new file mode 100644 index 0000000..8a96857 --- /dev/null +++ b/src/api/qualityManagement/IQC.js @@ -0,0 +1,11 @@ +import request from '@/utils/request' +import { downFile } from '@/utils/request' + +export function getStatisticslist(query) { + return request({ + url: '/mes/qc/IQC/getStatisticslist', + method: 'get', + params: query, + }) + +} \ No newline at end of file diff --git a/src/views/productManagement/workorder.vue b/src/views/productManagement/workorder.vue index e5d2905..ca29582 100644 --- a/src/views/productManagement/workorder.vue +++ b/src/views/productManagement/workorder.vue @@ -55,7 +55,7 @@ +
+
+ + + + + + + + + + 周一 + 周二 + 周三 + 周四 + 周五 + 周六 + 周日 + + + +
+
+
+ + + + + diff --git a/src/views/qualityManagement/IQC.vue b/src/views/qualityManagement/IQC.vue index 5098ceb..363fcf6 100644 --- a/src/views/qualityManagement/IQC.vue +++ b/src/views/qualityManagement/IQC.vue @@ -26,19 +26,27 @@ :total="pagination.total" :page.sync="pagination.pageNum" :limit.sync="pagination.pageSize" - @pagination="getMaterialRequisitionList" + @pagination="GetInspectionStatisticsList" /> - + - + + - + + + + + + + @@ -46,7 +54,7 @@