diff --git a/src/api/Assembly/AssemblyTaskAssignment.js b/src/api/Assembly/AssemblyTaskAssignment.js new file mode 100644 index 00000000..a76c9fd6 --- /dev/null +++ b/src/api/Assembly/AssemblyTaskAssignment.js @@ -0,0 +1,97 @@ +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: 'PDM_项目名称_查询数据' + } + }) +} +// 组件查询 +export function searchTable(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: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间管理_工作计划_删除数据', + param: '计划流水号=' + num + } + }) +} +export function getMachineNames(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_机床名称_查询数据_获取数量和名称_根据机床流水号', + param: `机床流水号=${num}` + } + }) +} +// 获取组号 +export function getGroups(stepNumber) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_组件状态查询_查询所有组', + param: '机床流水号=' + stepNumber + } + }) +} +// 查询零件 +export function selectParts(check1, stepNumber, check2, num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_车间组件完成情况_查询数据', + param: '组件流水号_check=' + check1 + '&组件流水号=' + stepNumber + '&工艺计划流水号_check=' + check2 + '&工艺计划流水号=' + num + } + }) +} +export function addData(num, name, type) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间管理_工作计划_增加数据', + param: '机床流水号=' + num + '&任务名称=' + name + '&计划类型=' + type + } + }) +} diff --git a/src/api/ManufacturingCenter/MaterialAllocation.js b/src/api/ManufacturingCenter/MaterialAllocation.js index 8b424a2b..d9a56425 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) { +export function basicPartsData(machine_check, machine, group_check, group, Model_check, ModelValue, orderName, order, orderassignmentTypeValue_check, assignmentTypeValue, check_time, outTime1, outTime2) { return request({ url: '', method: 'post', @@ -49,7 +49,7 @@ 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}` + 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/ManufacturingCenter/PartAssignment.js b/src/api/ManufacturingCenter/PartAssignment.js index 1e6adbae..4c6d1c4c 100644 --- a/src/api/ManufacturingCenter/PartAssignment.js +++ b/src/api/ManufacturingCenter/PartAssignment.js @@ -421,3 +421,15 @@ export function inPart(num) { } }) } +export function getunallocated() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '零件分配查询_查询数量' + } + }) +} diff --git a/src/api/ManufacturingCenter/RequestApprovalQuery.js b/src/api/ManufacturingCenter/RequestApprovalQuery.js index e36c94cd..8802efa3 100644 --- a/src/api/ManufacturingCenter/RequestApprovalQuery.js +++ b/src/api/ManufacturingCenter/RequestApprovalQuery.js @@ -57,3 +57,16 @@ export function searchSupplier() { } }) } +export function repeal(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '采购管理_采购合同_审批付款_撤回_修改数据', + param: '采购合同请款流水号=' + num1 + '&审批_付款状态=' + num2 + } + }) +} diff --git a/src/api/ManufacturingCenter/RequestApprovalQuery1.js b/src/api/ManufacturingCenter/RequestApprovalQuery1.js index a83d6dae..d99d4a7b 100644 --- a/src/api/ManufacturingCenter/RequestApprovalQuery1.js +++ b/src/api/ManufacturingCenter/RequestApprovalQuery1.js @@ -57,3 +57,16 @@ export function searchSupplier() { } }) } +export function repeal(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '采购管理_采购合同_审批付款_撤回_修改数据', + param: '采购合同请款流水号=' + num1 + '&审批_付款状态=' + num2 + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index ac0a42f1..3260b229 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -38,10 +38,11 @@ const service = axios.create({ service.interceptors.request.use(config => { if (config.data.name !== '菜单系统模块_用户名密码_查询数据_new2' && config.data.name !== '菜单系统模块_获取角色模块_查询数据') { const id = Cookies.get('id') - if (id !== 'undefined') { + if (typeof (id) !== 'undefined') { console.log(id, 123) + console.log(typeof (id)) } else { - console.log(123) + console.log(456) store.dispatch('FedLogOut').then(() => { location.reload() // 为了重新实例化vue-router对象 避免bug alert('此账号登录失效，请重新登录') diff --git a/src/views/Assembly/AssemblyTaskAssignment/index.vue b/src/views/Assembly/AssemblyTaskAssignment/index.vue new file mode 100644 index 00000000..5eeb1e3f --- /dev/null +++ b/src/views/Assembly/AssemblyTaskAssignment/index.vue @@ -0,0 +1,347 @@ + + + + + + + diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue index 818af7ff..8a11b55e 100644 --- a/src/views/Inventory/MaterialOut/index.vue +++ b/src/views/Inventory/MaterialOut/index.vue @@ -22,9 +22,9 @@ 查询 领料确认 -
+
- +