diff --git a/src/api/mes/report.js b/src/api/mes/report.js new file mode 100644 index 0000000..8d97f5b --- /dev/null +++ b/src/api/mes/report.js @@ -0,0 +1,63 @@ +import request from '@/utils/request' + + + +// 查询辅助工时摊分列表 +export function listQty(query) { + return request({ + url: '/mes/reportWorks/assistqty/list', + method: 'get', + params: query + }); +} + +// 查询辅助工时摊分详细 +export function getQty(id) { + return request({ + url: '/mes/reportWorks/assistqty/' + id, + method: 'get' + }); +} + +// 新增辅助工时摊分 +export function addQty(data) { + return request({ + url: '/mes/reportWorks/assistqty', + method: 'post', + data: data + }); +} + +// 修改辅助工时摊分 +export function updateQty(data) { + return request({ + url: '/mes/reportWorks/assistqty', + method: 'put', + data: data + }); +} + +// 删除辅助工时摊分 +export function delQty(id) { + return request({ + url: '/mes/reportWorks/assistqty/' + id, + method: 'delete' + }); +} + +// 辅助工时摊分方式报表列表 +export function listAssistHour(query) { + return request({ + url: '/mes/reportWorks/assistqty/listAssistHour', + method: 'get', + params: query + }); +} +//生产效率报表 +export function listEfficiencyDayList(query) { + return request({ + url: '/mes/reportWorks/assistqty/listEfficiencyDayList', + method: 'get', + params: query + }); +} diff --git a/src/api/quality/checkTypeProject.js b/src/api/quality/checkTypeProject.js index e4b0ea2..cfa6d06 100644 --- a/src/api/quality/checkTypeProject.js +++ b/src/api/quality/checkTypeProject.js @@ -74,6 +74,14 @@ export function getProjectInfoList(query) { }); } //方案下拉 +export function getProjectOptions(query) { + return request({ + url: '/quality/checkTypeProject/getProjectOptions', + method: 'get', + params: query + }); +} + export function getAutoDataOption(query) { return request({ url: '/quality/checkTypeProject/getAutoDataOption', diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue index 1d64a23..ebf2b2d 100644 --- a/src/views/kanban/quality/kanban1.vue +++ b/src/views/kanban/quality/kanban1.vue @@ -1,2309 +1,2394 @@ diff --git a/src/views/mes/report/proAssistTable/assistqty.vue b/src/views/mes/report/proAssistTable/assistqty.vue new file mode 100644 index 0000000..ce6cdba --- /dev/null +++ b/src/views/mes/report/proAssistTable/assistqty.vue @@ -0,0 +1,288 @@ + + + diff --git a/src/views/mes/report/proAssistTable/index.vue b/src/views/mes/report/proAssistTable/index.vue new file mode 100644 index 0000000..3bb073a --- /dev/null +++ b/src/views/mes/report/proAssistTable/index.vue @@ -0,0 +1,251 @@ + + + diff --git a/src/views/mes/report/proEfficiencyTable/index.vue b/src/views/mes/report/proEfficiencyTable/index.vue new file mode 100644 index 0000000..e943832 --- /dev/null +++ b/src/views/mes/report/proEfficiencyTable/index.vue @@ -0,0 +1,259 @@ + + + diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index 9942ff3..ccb0532 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -392,6 +392,11 @@ + + + @@ -710,7 +715,7 @@ import moment from "moment"; import { getlistCK } from "@/api/wms/outorder"; export default { name: "ReportWork", - dicts: ["report_type", "report_sap_status", 'workorder_type'], + dicts: ["report_type", "report_sap_status", 'workorder_type',"check_result"], components: { ReportWorkConsume, ItemSelectUser, diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index 19d4af5..2441561 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -486,6 +486,7 @@ @@ -1326,6 +1327,7 @@ export default { single: true, // 非多个禁用 multiple: true, + canEdit: true, // 显示搜索条件 showSearch: true, // 总条数 @@ -1754,6 +1756,7 @@ export default { this.queryAuxiliaryEquipmentParams.equipmentCode = null; this.open = true; this.title = "修改设备管理"; + this.canEdit = false; }); },