diff --git a/package.json b/package.json index a9b81f49..f82fa40f 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "vue": "2.5.17", "vue-count-to": "^1.0.13", "vue-direction-key": "^1.0.5", - "vue-router": "3.0.1", + "vue-router": "^3.0.7", "vuex": "3.0.1", "xlsx": "^0.14.0", "xlsx-style": "^0.8.13" diff --git a/src/api/Assembly/AssemblyExecution.js b/src/api/Assembly/AssemblyExecution.js index 919d23cc..d9bb91ef 100644 --- a/src/api/Assembly/AssemblyExecution.js +++ b/src/api/Assembly/AssemblyExecution.js @@ -75,7 +75,7 @@ export function MachineToolStateUpdate(machineNumberValue, check) { data: { UserID: state.state.user.id, ModularID: router.currentRoute.path, - type: '1', + type: '2', name: 'PDM_机床名称_机床状态_修改数据', param: '机床流水号=' + machineNumberValue + '&装配状态=' + check } @@ -90,7 +90,7 @@ export function DebugStatusUpdate(machineNumberValue, check) { data: { UserID: state.state.user.id, ModularID: router.currentRoute.path, - type: '1', + type: '2', name: 'PDM_机床名称_调试状态_修改数据', param: '机床流水号=' + machineNumberValue + '&调试状态=' + check } diff --git a/src/api/Assembly/AssemblyMes.js b/src/api/Assembly/AssemblyMes.js new file mode 100644 index 00000000..3cf463e0 --- /dev/null +++ b/src/api/Assembly/AssemblyMes.js @@ -0,0 +1,83 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' +// 初始化机床项目 +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间装配管理_装配MES_机床编号_查询数据' + } + }) +} +export function searchTable(check, machineNumberValue, check1, startTime, endTime, check2, stateValue, check3, workerValue) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间管理_装配任务_MES_查询数据', + param: '机床流水号_check=' + check + '&机床流水号=' + machineNumberValue + '&时间段_check=' + check1 + '&开始时间=' + startTime + '&结束时间=' + endTime + '&状态_check=' + check2 + '&状态=' + stateValue + '&人员_check=' + check3 + '&人员=' + workerValue + } + }) +} +// 获取分配后装配人员 +export function searchName(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间管理_装配计划_装配工_查询数据', + param: '计划流水号=' + num + } + }) +} +export function ComponentStateUpdate() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间管理_工作计划_执行计划', + param: '计划流水号=' + arguments[0] + '&是否工作=' + arguments[1] + '&考勤编号=' + arguments[2] + } + }) +} +export function submitSuspend() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间管理_工作计划_暂停计划', + param: '计划流水号=' + arguments[0] + '&是否暂停=' + arguments[1] + } + }) +} +// 获取装配人员 +export function searchPeople() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=11' + } + }) +} diff --git a/src/api/Assembly/AssemblyTaskAssignment.js b/src/api/Assembly/AssemblyTaskAssignment.js index a76c9fd6..a83599c4 100644 --- a/src/api/Assembly/AssemblyTaskAssignment.js +++ b/src/api/Assembly/AssemblyTaskAssignment.js @@ -28,6 +28,19 @@ export function searchTable(machineNumberValue) { } }) } +export function searchTable2(machineNumberValue) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间管理_装配计划_分配后_查询数据', + param: '机床流水号=' + machineNumberValue + } + }) +} export function deletedata(num) { return request({ url: '', @@ -41,6 +54,19 @@ export function deletedata(num) { } }) } +export function deleteTask(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间装配管理_分配后任务_删除数据', + param: '计划流水号=' + num + } + }) +} export function getMachineNames(num) { return request({ url: '', @@ -77,7 +103,7 @@ export function selectParts(check1, stepNumber, check2, num) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间生产管理工艺_车间组件完成情况_查询数据', + name: '车间生产管理工艺_车间组件完成情况_查询数据_装配', param: '组件流水号_check=' + check1 + '&组件流水号=' + stepNumber + '&工艺计划流水号_check=' + check2 + '&工艺计划流水号=' + num } }) @@ -95,3 +121,57 @@ export function addData(num, name, type) { } }) } +// 获取装配人员 +export function searchPeople() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=11' + } + }) +} +// 获取分配后装配人员 +export function searchName(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间管理_装配计划_装配工_查询数据', + param: '计划流水号=' + num + } + }) +} +export function submitPeople(num, people) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间装配管理_分配任务_循环执行', + param: '计划流水号=' + num + '&人员编号组=' + people + } + }) +} +export function submitOutPeople(num, people) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间装配管理_移出装配工_循环执行', + param: '计划流水号=' + num + '&任务分配流水号组=' + people + } + }) +} diff --git a/src/api/Assembly/QualityBasicData.js b/src/api/Assembly/QualityBasicData.js index 0d8ff51d..1b58ab2d 100644 --- a/src/api/Assembly/QualityBasicData.js +++ b/src/api/Assembly/QualityBasicData.js @@ -109,7 +109,7 @@ export function addTest(num) { }) } // 查询 检测项明细 -export function addTesting(num, num1) { +export function addTesting(num, num1, num2, num3) { return request({ url: '', method: 'post', @@ -118,7 +118,7 @@ export function addTesting(num, num1) { ModularID: router.currentRoute.path, type: '2', name: '质检管理_装配质检_检测项明细_增加数据', - param: '检测项流水号=' + num + '&检测项明细=' + num1 + param: '检测项流水号=' + num + '&检测项明细=' + num1 + '&基准值=' + num2 + '&公差=' + num3 } }) } diff --git a/src/api/ManufacturingCenter/MaterialAllocation.js b/src/api/ManufacturingCenter/MaterialAllocation.js index d9a56425..bc45c822 100644 --- a/src/api/ManufacturingCenter/MaterialAllocation.js +++ b/src/api/ManufacturingCenter/MaterialAllocation.js @@ -40,7 +40,7 @@ export function groupSelect(machineValue) { }) } -export function basicPartsData(machine_check, machine, group_check, group, Model_check, ModelValue, orderName, order, orderassignmentTypeValue_check, assignmentTypeValue, check_time, outTime1, outTime2) { +export function basicPartsData(machine_check, machine, group_check, group, Model_check, ModelValue, orderName, order, orderassignmentTypeValue_check, assignmentTypeValue, check_time, outTime1, outTime2, pageSize, pageCurrent) { return request({ url: '', method: 'post', @@ -49,8 +49,8 @@ export function basicPartsData(machine_check, machine, group_check, group, Model ModularID: router.currentRoute.path, type: '1', name: '零件分配查询_查询', - param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}&规格_check=${Model_check}&规格=${ModelValue}&排序名称=${orderName}&排序顺序=${order}&分配类型_check=${orderassignmentTypeValue_check}&分配类型=${assignmentTypeValue}&分配时间_check=${check_time}&分配开始时间=${outTime1}&分配结束时间=${outTime2}` - // Pagination: pageCurrent + '&' + pageSize + param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}&规格_check=${Model_check}&规格=${ModelValue}&排序名称=${orderName}&排序顺序=${order}&分配类型_check=${orderassignmentTypeValue_check}&分配类型=${assignmentTypeValue}&分配时间_check=${check_time}&分配开始时间=${outTime1}&分配结束时间=${outTime2}`, + Pagination: pageCurrent + '&' + pageSize } }) } diff --git a/src/api/PurchasingCenter/InvoiceSettlementApproveSearch.js b/src/api/PurchasingCenter/InvoiceSettlementApproveSearch.js index 4ebde574..1c7285c6 100644 --- a/src/api/PurchasingCenter/InvoiceSettlementApproveSearch.js +++ b/src/api/PurchasingCenter/InvoiceSettlementApproveSearch.js @@ -59,3 +59,17 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c } }) } +// 执行审批 +export function cancel(...data) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '采购管理_发票结算申请单_撤回审批', + param: `发票结算申请单流水号=${data[0]}&审批代号=${data[1]}` + } + }) +} diff --git a/src/api/PurchasingCenter/MaterialMProcure.js b/src/api/PurchasingCenter/MaterialMProcure.js index 63eeb5d0..9d77b58c 100644 --- a/src/api/PurchasingCenter/MaterialMProcure.js +++ b/src/api/PurchasingCenter/MaterialMProcure.js @@ -150,7 +150,7 @@ export function deleteData(num) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '2', - name: '库存管理_物料主文件_基本_删除数据', + name: '库存管理_物料主文件_基本_采购部_删除数据', param: '物料流水号=' + num } }) diff --git a/src/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js b/src/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js index 0a65dbcd..5bff03b7 100644 --- a/src/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js +++ b/src/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js @@ -30,3 +30,16 @@ export function searchTable1(...group) { } }) } +export function cancel(...group) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间采购管理_发票结算申请单_撤回审批', + param: `发票结算申请单流水号=${group[0]}&审批代号=${group[1]}` + } + }) +} diff --git a/src/api/WorkshopProcurement/ProcurementContractEnquiry.js b/src/api/WorkshopProcurement/ProcurementContractEnquiry.js index 522e8bda..036b76ed 100644 --- a/src/api/WorkshopProcurement/ProcurementContractEnquiry.js +++ b/src/api/WorkshopProcurement/ProcurementContractEnquiry.js @@ -85,3 +85,17 @@ export function Disable(num) { } }) } +// 合同审批撤回 +export function cancle(num, num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '采购管理_合同审批撤回_修改数据', + param: '采购合同流水号=' + num + '&请购单流水号=' + num1 + } + }) +} diff --git a/src/api/WorkshopProcurement/RequestApprovalQuery2.js b/src/api/WorkshopProcurement/RequestApprovalQuery2.js index a0069796..dfce4f92 100644 --- a/src/api/WorkshopProcurement/RequestApprovalQuery2.js +++ b/src/api/WorkshopProcurement/RequestApprovalQuery2.js @@ -57,3 +57,17 @@ export function searchSupplier() { } }) } +// 查询供应商 +export function cancel(num, num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间采购管理_采购合同_审批撤回_修改数据', + param: '采购合同请款流水号=' + num + '&审批_付款状态=' + num1 + } + }) +} diff --git a/src/assets/gaojing.png b/src/assets/gaojing.png new file mode 100644 index 00000000..7de07143 Binary files /dev/null and b/src/assets/gaojing.png differ diff --git a/src/views/Assembly/AssemblyMes/index.vue b/src/views/Assembly/AssemblyMes/index.vue new file mode 100644 index 00000000..bd3f7b55 --- /dev/null +++ b/src/views/Assembly/AssemblyMes/index.vue @@ -0,0 +1,664 @@ + + + + + + diff --git a/src/views/Assembly/AssemblyTaskAssignment/index.vue b/src/views/Assembly/AssemblyTaskAssignment/index.vue index 5eeb1e3f..07cfb185 100644 --- a/src/views/Assembly/AssemblyTaskAssignment/index.vue +++ b/src/views/Assembly/AssemblyTaskAssignment/index.vue @@ -15,17 +15,16 @@ 机床数量：{{ machineNum }} 增加装配任务 - 删除 - - + + - + @@ -35,90 +34,80 @@ {{ scope.row.部件数 }} - - - - - - + + + + - + - + - + + + + - + - - - + + + - + - + - + - + - + + + + @@ -143,25 +132,97 @@ :visible.sync="dialogFormVisible1" title="装配任务" center - width="400px"> - + width="300px"> +
确定
+ + + + + + + +
+ 确定 +
+ + + + + + + + +
+ 确定 +
+ -