From 810b198282ca18a859ecb16af067df836218faee Mon Sep 17 00:00:00 2001 From: liushuai Date: Sat, 13 Jun 2020 17:15:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/api/Assembly/AssemblyExecution.js | 4 +- src/api/Assembly/AssemblyMes.js | 83 +++ src/api/Assembly/AssemblyTaskAssignment.js | 82 ++- src/api/Assembly/QualityBasicData.js | 4 +- .../ManufacturingCenter/MaterialAllocation.js | 6 +- .../InvoiceSettlementApproveSearch.js | 14 + src/api/PurchasingCenter/MaterialMProcure.js | 2 +- ...oiceSettlementApproveSearchMetalworking.js | 13 + .../ProcurementContractEnquiry.js | 14 + .../RequestApprovalQuery2.js | 14 + src/assets/gaojing.png | Bin 0 -> 6380 bytes src/views/Assembly/AssemblyMes/index.vue | 664 ++++++++++++++++++ .../Assembly/AssemblyTaskAssignment/index.vue | 329 +++++++-- src/views/Assembly/QualityBasicData/index.vue | 20 +- .../InitialProduction/index.vue | 137 ++-- .../MaterialAllocation/index.vue | 74 +- .../CreateInquirySheet/index.vue | 24 + .../InvoiceSettlementApproveSearch/index.vue | 93 +-- .../MaterialMProcure/index.vue | 7 +- .../MaterialManagement/index.vue | 10 +- .../OfflineContract/index.vue | 4 +- .../PurchaseSituationSearch/index.vue | 4 +- .../index.vue | 46 +- .../ProcurementContractEnquiry/index.vue | 35 +- .../RequestApprovalQuery2/index.vue | 29 +- 26 files changed, 1476 insertions(+), 238 deletions(-) create mode 100644 src/api/Assembly/AssemblyMes.js create mode 100644 src/assets/gaojing.png create mode 100644 src/views/Assembly/AssemblyMes/index.vue 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 0000000000000000000000000000000000000000..7de071437f84be7343114fcf112554cfd544445c GIT binary patch literal 6380 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 +
+ +
+ + + + + +
+ 装 配 任 务 管 理 +
+ + +
+ + + + 装配任务 + + + +
{{ item.label }}
+
{{ item.name }}
+ + + + ~ + + + + + 查询 + {{ nowTime }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 装配查询 + + + +
{{ item.label }}
+
{{ item.name }}
+ + + + ~ + + + + + 查询 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 确定 + 确定 + 确定 + 确定 +
+ +
+ + + + + + 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"> +
确定
+ + + + + + + +
+ 确定 +
+ + + + + + + + +
+ 确定 +
+ -