diff --git a/src/api/Inventory/CreatePickingList.js b/src/api/Inventory/CreatePickingList.js index e4176c32..a42e8610 100644 --- a/src/api/Inventory/CreatePickingList.js +++ b/src/api/Inventory/CreatePickingList.js @@ -42,8 +42,8 @@ export function searchTable(...params) { data: { type: '1', name: '车间装配管理_领料单_三表_查询数据', - param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&名称_check=${params[4]}&名称=${params[5]}&型号_check=${params[6]}&型号=${params[7]}&规格_check=${params[8]}&规格=${params[9]}&领料情况_check=${params[10]}&领料情况=${params[11]}&零件类型=${params[14]}`, - Pagination: params[12] + '&' + params[13] + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&名称_check=${params[4]}&名称=${params[5]}&领料情况_check=${params[6]}&领料情况=${params[7]}&零件类型=${params[10]}`, + Pagination: params[8] + '&' + params[9] } }) } @@ -54,20 +54,20 @@ export function searchPart(...params) { data: { type: '1', name: '库存管理_离线外购件_出库查询', - param: `物料名称_check=${params[0]}&物料名称=${params[1]}&物料规格_check=${params[2]}&物料规格=${params[3]}&物料型号_check=${params[4]}&物料型号=${params[5]}`, - Pagination: params[6] + '&' + params[7] + param: `物料名称_check=${params[0]}&物料名称=${params[1]}`, + Pagination: params[2] + '&' + params[3] } }) } // 领料单查询 -export function searchList(pageCurrent, pageSize, listNumber_check, listNumber, isElectrical) { +export function searchList(pageCurrent, pageSize, listPeople_check, listPeople, isElectrical, check1, time1, time2) { return request({ url: '', method: 'post', data: { type: '1', name: '车间装配管理_领料单_查询数据', - param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber + '&是否电气=' + isElectrical, + param: '制单人_check=' + listPeople_check + '&制单人=' + listPeople + '&是否电气=' + isElectrical + '&时间段_check=' + check1 + '&开始时间=' + time1 + '&结束时间=' + time2, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/ManufacturingCenter/ContractDetailsInquiry.js b/src/api/ManufacturingCenter/ContractDetailsInquiry.js index e69de29b..a4aa8bb5 100644 --- a/src/api/ManufacturingCenter/ContractDetailsInquiry.js +++ b/src/api/ManufacturingCenter/ContractDetailsInquiry.js @@ -0,0 +1,40 @@ +import request from '@/utils/request' + +// 初始化 项目名称 +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_项目名称_查询数据_总计划' + } + }) +} + +// 查询机床 +export function initMachine(projectNum) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_查询数据2', + param: `项目流水号=${projectNum}` + } + }) +} + +// 查询项目详情 +export function searchatabledata(projectNum, machineValue, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '项目工时统计_合同详情查询_工时综合查询', + param: `项目流水号=${projectNum}&机床流水号=${machineValue}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/api/ManufacturingCenter/PartAssignment.js b/src/api/ManufacturingCenter/PartAssignment.js index a0b27598..f5a9001c 100644 --- a/src/api/ManufacturingCenter/PartAssignment.js +++ b/src/api/ManufacturingCenter/PartAssignment.js @@ -11,6 +11,18 @@ export function initProject() { } }) } +// 三表下达时间查询 +export function DeliveryTimeSelect(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_三表下达时间_查询数据', + param: '组件流水号=' + num + } + }) +} // 组件查询 export function searchgroup(num) { return request({ diff --git a/src/utils/curd.js b/src/utils/curd.js index 664ddb7e..5bbc55eb 100644 --- a/src/utils/curd.js +++ b/src/utils/curd.js @@ -5,6 +5,30 @@ Created by hedekun import { type } from './tool' // type判断传入值的类型，比typeof更详细 export default { install(Vue) { + Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) { + var paramStr = '' + var paramarray = [] + if (data !== undefined) { + for (let i = 0; i < data.length; i++) { + paramarray.push({ + name: data[i][0], + value: data[i][1], + type: data[i][2], + output: data[i][3] + }) + } + paramStr = JSON.stringify(paramarray) + } + var obj = [] + obj[0] = {} + obj[0].type = type + obj[0].name = name + obj[0].param = paramStr + obj[0].pageSize = pageSize + obj[0].pageList = pageList + var numn = JSON.stringify(obj[0]) + return numn + } // 用于打开增加框，方法能重置表单，并使表单内容回到初始化状态。 // 传入参数 // 1）表单名称，字符串形式如'form'，必须 diff --git a/src/utils/request.js b/src/utils/request.js index 7d0dbbf6..1840b290 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -6,8 +6,6 @@ export const name1 = `OP1000` export const name3 = `OP2000` export const name4 = `OP9999` -// 创建axios实例 - export const readFile = `http://123.56.95.229:8010/webpage/file/` // invoice export const readImg = `http://123.56.95.229:8010/webpage/img/` // delivery/MS/performancebond export const upload = `http://123.56.95.229:8010/submit/uploadFile.ashx` // ContractInformationManagement diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue index cf44b474..382e5867 100644 --- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -2,7 +2,7 @@
- + {{ item.name }}
- + - + - + - + - - - - - - - 查询 + + + 已领用 + 查询 @@ -254,13 +251,24 @@
- - 查询 - 创建领料单 + + + 查询 + 创建领料单 - 选入物料 + 选入物料 - 删除领料单 + 删除领料单 移除领料明细 @@ -273,7 +281,7 @@ {{ scope.row.领料单编号 }} - + @@ -340,16 +348,16 @@ {{ scope.row.出库数量1 }} - - - + + + + + + @@ -358,7 +366,7 @@ - + @@ -384,7 +392,7 @@ - + { if (res.data[0].result === '1') { this.$message.success('操作成功') - this.pickingListNumber = '' this.searchList() } else { this.$message.error('操作失败') @@ -580,67 +588,68 @@ export default { }, // 标准件 searchTable0() { - let check1, check2, check3, check4, check5, check6 + let check1, check2, check3 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 this.Name ? check3 = 1 : check3 = 0 - this.materialModel ? check4 = 1 : check4 = 0 - this.materialSpec ? check5 = 1 : check5 = 0 - if (this.PickingValue !== 0 && this.PickingValue !== 1) { - check6 = 0 + console.log(this.PickingValue, 111) + if (this.PickingValue === false) { + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent0, this.pageSize0, 1).then(response => { + this.tableData0 = response.data.rows + this.total0 = response.data.total + }) } else { - check6 = 1 + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 1, this.pageCurrent0, this.pageSize0, 1).then(response => { + this.tableData0 = response.data.rows + this.total0 = response.data.total + }) } - searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent0, this.pageSize0, 1).then(response => { - this.tableData0 = response.data.rows - this.total0 = response.data.total - }) }, // 外购件 searchTable1() { - let check1, check2, check3, check4, check5, check6 + let check1, check2, check3 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 this.Name ? check3 = 1 : check3 = 0 - this.materialModel ? check4 = 1 : check4 = 0 - this.materialSpec ? check5 = 1 : check5 = 0 - if (this.PickingValue !== 0 && this.PickingValue !== 1) { - check6 = 0 + console.log(this.PickingValue, 111) + if (this.PickingValue === false) { + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent1, this.pageSize1, 2).then(response => { + this.tableData0 = response.data.rows + this.total0 = response.data.total + }) } else { - check6 = 1 + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 1, this.pageCurrent1, this.pageSize1, 2).then(response => { + this.tableData0 = response.data.rows + this.total0 = response.data.total + }) } - searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent1, this.pageSize1, 2).then(response => { - this.tableData1 = response.data.rows - this.total1 = response.data.total - }) }, // 基本件 searchTable2() { - let check1, check2, check3, check4, check5, check6 + let check1, check2, check3 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 this.Name ? check3 = 1 : check3 = 0 - this.materialModel ? check4 = 1 : check4 = 0 - this.materialSpec ? check5 = 1 : check5 = 0 - if (this.PickingValue !== 0 && this.PickingValue !== 1) { - check6 = 0 + console.log(this.PickingValue, 111) + if (this.PickingValue === false) { + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent2, this.pageSize2, 3).then(response => { + this.tableData0 = response.data.rows + this.total0 = response.data.total + }) } else { - check6 = 1 + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 1, this.pageCurrent2, this.pageSize2, 3).then(response => { + this.tableData0 = response.data.rows + this.total0 = response.data.total + }) } - searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent2, this.pageSize2, 3).then(response => { - this.tableData2 = response.data.rows - this.total2 = response.data.total - }) }, // 离线采购件 searchTable4() { this.listLoading = true this.tableDataBasic = [] - let check1, check2, check3 + let check1 this.Name ? check1 = 1 : check1 = 0 - this.materialSpec ? check2 = 1 : check2 = 0 - this.materialModel ? check3 = 1 : check3 = 0 - searchPart(check1, this.Name, check2, this.materialSpec, check3, this.materialModel, this.pageCurrent4, this.pageSize4).then(response => { + searchPart(check1, this.Name, this.pageCurrent4, this.pageSize4).then(response => { this.tableDataBasic = response.data.rows this.total4 = response.data.total this.listLoading = false @@ -689,10 +698,11 @@ export default { }, // 查询领料单列表 searchList() { - let check, isElectrical - this.pickingListNumber ? check = 1 : check = 0 + let check, isElectrical, check1 + this.pickingListPeople ? check = 1 : check = 0 + this.startTime ? check1 = 1 : (check1 = 0, this.startTime = '') Number(this.token) === 37 || Number(this.token) === 36 || Number(this.token) === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长 37电气副部长 - searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber, isElectrical).then(response => { + searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListPeople, isElectrical, check1, this.startTime[0], this.startTime[1]).then(response => { this.pickListTable1 = response.data.rows this.total3 = response.data.total }) @@ -754,7 +764,6 @@ export default { request(param).then(res => { if (res.data[0].result === '1') { this.$message.success('操作成功') - this.pickingListNumber = '' this.searchList() } else { this.$message.error('操作失败') @@ -793,6 +802,9 @@ export default { handleSelectionChange(val) { this.multipleSelection = val }, + handleSelectionChange1(val) { + this.multipleSelection1 = val + }, // 选入 selectInto() { if (this.PartType === '离线采购件') { diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue index 2daef2e2..dd0f8609 100644 --- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue +++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue @@ -17,16 +17,16 @@ :label="item.label" :value="item.value"/> - 分组 - - - - 规格及型号 - + + + + + + + + + + 加工总工时（小时）: 计划总工时（小时）: @@ -34,89 +34,94 @@ 查询 - - + + - + - + - + - + - + - + - + - + - + - - - - + - + - + - + +
+ +
+ +