diff --git a/src/api/Assembly/AssemblyMes.js b/src/api/Assembly/AssemblyMes.js index 3cf463e0..e4abeee6 100644 --- a/src/api/Assembly/AssemblyMes.js +++ b/src/api/Assembly/AssemblyMes.js @@ -81,3 +81,25 @@ export function searchPeople() { } }) } +export function submitRework() { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_装配任务_返工', + param: '计划流水号=' + arguments[0] + '&返工原因流水号=' + arguments[1] + '&返工工时=' + arguments[2] + } + }) +} +export function searchReworkMX(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_装配任务_返工记录_查询', + param: '计划流水号=' + num + } + }) +} diff --git a/src/api/Assembly/AssemblyTaskAssignment.js b/src/api/Assembly/AssemblyTaskAssignment.js index a83599c4..ab61001b 100644 --- a/src/api/Assembly/AssemblyTaskAssignment.js +++ b/src/api/Assembly/AssemblyTaskAssignment.js @@ -15,6 +15,19 @@ export function initProject() { }) } // 组件查询 +export function searchGroup(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_组件名称_查询数据_装配', + param: '机床流水号=' + num + '=int' + } + }) +} export function searchTable(machineNumberValue) { return request({ url: '', @@ -108,7 +121,7 @@ export function selectParts(check1, stepNumber, check2, num) { } }) } -export function addData(num, name, type) { +export function addData(num, name, type, num1, num2) { return request({ url: '', method: 'post', @@ -117,7 +130,7 @@ export function addData(num, name, type) { ModularID: router.currentRoute.path, type: '2', name: '车间管理_工作计划_增加数据', - param: '机床流水号=' + num + '&任务名称=' + name + '&计划类型=' + type + param: '机床流水号=' + num + '&任务名称=' + name + '&计划类型=' + type + '&组件流水号=' + num1 + '&组号=' + num2 } }) } diff --git a/src/api/Assembly/QualityBasicData.js b/src/api/Assembly/QualityBasicData.js index 1b58ab2d..482d5c93 100644 --- a/src/api/Assembly/QualityBasicData.js +++ b/src/api/Assembly/QualityBasicData.js @@ -108,7 +108,7 @@ export function addTest(num) { } }) } -// 查询 检测项明细 +// 增加 检测项明细 export function addTesting(num, num1, num2, num3) { return request({ url: '', @@ -122,6 +122,20 @@ export function addTesting(num, num1, num2, num3) { } }) } +// 编辑 检测项明细 +export function editTesting(num, num1, num2, num3) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '质检管理_装配质检_检测项明细_编辑数据', + param: '检测项明细流水号=' + num + '&检测项明细=' + num1 + '&基准值=' + num2 + '&公差=' + num3 + } + }) +} // 增加 不合格原因 export function addReasons(num) { return request({ diff --git a/src/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js b/src/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js index 5bff03b7..4fbb66b4 100644 --- a/src/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js +++ b/src/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js @@ -43,3 +43,17 @@ export function cancel(...group) { } }) } +// 发票结算申请单明细列表 +export function searchTable2(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间采购管理_发票结算申请单明细_查询数据', + param: `发票结算申请单流水号=${num}` + } + }) +} diff --git a/src/views/Assembly/AssemblyMes/index.vue b/src/views/Assembly/AssemblyMes/index.vue index bd3f7b55..07b24cb6 100644 --- a/src/views/Assembly/AssemblyMes/index.vue +++ b/src/views/Assembly/AssemblyMes/index.vue @@ -54,7 +54,7 @@ :label="item.label" :value="item.value"/> - 查询 + 查询 {{ nowTime }} @@ -64,63 +64,69 @@ {{ scope.row.状态 }} - + - + - + - + - - - - + + + + + + - + - + - + + + + @@ -166,7 +172,8 @@ :label="item.label" :value="item.value"/> - 查询 + 查询 + 导出 @@ -225,6 +232,16 @@ {{ scope.row.结束时间 ? scope.row.结束时间.split(' ')[0] : '' }} + + + + + + + + + + @@ -267,11 +284,65 @@ @click="submitRecovery">确定 + + + + + + + + + +
+ 确定 +
+ + + + + + + + + + + + + + + + + + + + diff --git a/src/views/Assembly/QualityBasicData/index.vue b/src/views/Assembly/QualityBasicData/index.vue index b57ef520..8efc089a 100644 --- a/src/views/Assembly/QualityBasicData/index.vue +++ b/src/views/Assembly/QualityBasicData/index.vue @@ -205,6 +205,11 @@