diff --git a/src/api/ManufacturingCenter/PartAssignment.js b/src/api/ManufacturingCenter/PartAssignment.js index de76d929..bb552ce5 100644 --- a/src/api/ManufacturingCenter/PartAssignment.js +++ b/src/api/ManufacturingCenter/PartAssignment.js @@ -118,19 +118,30 @@ export function searchDetailed(num) { method: 'post', data: { type: '1', - name: '车间管理_基本件采购_请购单明细_查询数据', + name: '车间管理_基本件采购_请购单明细_查询数据_外购件', param: '请购单流水号=' + num } }) } -export function purchaseRequisition(RequisitionList, projectName, projectFloatValue, MachineToolNumber, machineFloatValue, groupName, groupFloatValue, BasicPartsNumber, MaterialName, NumberOfParts, PartType, time, MaterialNum) { +export function searchDetailed1(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间管理_基本件采购_请购单明细_查询数据_基本件', + param: '请购单流水号=' + num + } + }) +} +export function purchaseRequisition(RequisitionList, projectName, projectFloatValue, MachineToolNumber, machineFloatValue, groupName, groupFloatValue, BasicPartsNumber, MaterialName, PartToolNumber, Material, NumberOfParts, PartType, time, MaterialNum) { return request({ url: '', method: 'post', data: { type: '2', name: '车间管理_基本件采购_请购单明细_请购', - param: '请购单流水号=' + RequisitionList + '&项目名称=' + projectName + '&项目流水号=' + projectFloatValue + '&机床图号=' + MachineToolNumber + '&机床流水号=' + machineFloatValue + '&组号=' + groupName + '&组件流水号=' + groupFloatValue + '&基本件流水号=' + BasicPartsNumber + '&物料名称=' + MaterialName + '&零件数量=' + NumberOfParts + '&零件类型=' + PartType + '&物料计划到货时间=' + time + '&物料流水号=' + MaterialNum + param: '请购单流水号=' + RequisitionList + '&项目名称=' + projectName + '&项目流水号=' + projectFloatValue + '&机床图号=' + MachineToolNumber + '&机床流水号=' + machineFloatValue + '&组号=' + groupName + '&组件流水号=' + groupFloatValue + '&基本件流水号=' + BasicPartsNumber + '&物料名称=' + MaterialName + '&零件图号=' + PartToolNumber + '&材料=' + Material + '&零件数量=' + NumberOfParts + '&零件类型=' + PartType + '&物料计划到货时间=' + time + '&物料流水号=' + MaterialNum } }) } diff --git a/src/api/WorkshopProcurement/ArrivalStateSearch.js b/src/api/WorkshopProcurement/ArrivalStateSearch.js index d0801afc..9e9ac3c6 100644 --- a/src/api/WorkshopProcurement/ArrivalStateSearch.js +++ b/src/api/WorkshopProcurement/ArrivalStateSearch.js @@ -31,7 +31,19 @@ export function searchArrivalNum(num) { method: 'post', data: { type: '1', - name: '车间管理_合同物料到货情况_查询数据', + name: '车间管理_合同物料到货情况_查询数据_外购件', + param: `采购合同流水号=${num}` + } + }) +} +// 查询到货情况 +export function searchArrivalNum1(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间管理_合同物料到货情况_查询数据_基本件', param: `采购合同流水号=${num}` } }) diff --git a/src/api/WorkshopProcurement/CreatingProcurementContracts.js b/src/api/WorkshopProcurement/CreatingProcurementContracts.js index 16135d69..ab7507e1 100644 --- a/src/api/WorkshopProcurement/CreatingProcurementContracts.js +++ b/src/api/WorkshopProcurement/CreatingProcurementContracts.js @@ -44,6 +44,28 @@ export function searchData(num) { } }) } +export function searchData1(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间管理_基本件采购_请购单明细_查询数据_外购件', + param: '请购单流水号=' + num + } + }) +} +export function searchData2(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间管理_基本件采购_请购单明细_查询数据_基本件', + param: '请购单流水号=' + num + } + }) +} // 初始化付款时间节点 export function initPayTimeNode() { return request({ @@ -116,14 +138,14 @@ export function searchSheetContract(num1) { }) } // 生成采购合同 -export function doneContract(num1, RequisitionNumber, name1, time1, time2, method, num2, text, freight, num3, partsNum, priceGroup, dayGroup, payGroup, planGroup, taxGroup, currency, num4, id) { +export function doneContract(num1, RequisitionNumber, name1, time1, time2, method, num2, text, freight, num3, partsNum, priceGroup, payGroup, planGroup, taxGroup, currency, num4, id) { return request({ url: '', method: 'post', data: { type: '2', name: '车间管理_基本件采购_请购单和请购单明细_增加数据', - param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&付款方式=${method}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&发货天数组=${dayGroup}&付款比例组=${payGroup}&计划付款时间组=${planGroup}&税率组=${taxGroup}&币种流水号组=${currency}` + param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&付款方式=${method}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&付款比例组=${payGroup}&计划付款时间组=${planGroup}&税率组=${taxGroup}&币种流水号组=${currency}` } }) } diff --git a/src/api/WorkshopProcurement/ProcurementContractApproval.js b/src/api/WorkshopProcurement/ProcurementContractApproval.js index 5992fc60..85945460 100644 --- a/src/api/WorkshopProcurement/ProcurementContractApproval.js +++ b/src/api/WorkshopProcurement/ProcurementContractApproval.js @@ -43,7 +43,19 @@ export function searchTable2(num) { method: 'post', data: { type: '1', - name: '车间采购管理_采购合同明细_查询数据', + name: '车间采购管理_采购合同_查询数据_外购件', + param: '采购合同流水号=' + num + } + }) +} +// 采购合同明细查询 +export function searchTable3(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购合同_查询数据_基本件', param: '采购合同流水号=' + num } }) diff --git a/src/api/WorkshopProcurement/ProcurementContractEnquiry.js b/src/api/WorkshopProcurement/ProcurementContractEnquiry.js index 5034b36b..b0ca1546 100644 --- a/src/api/WorkshopProcurement/ProcurementContractEnquiry.js +++ b/src/api/WorkshopProcurement/ProcurementContractEnquiry.js @@ -43,7 +43,19 @@ export function searchTable2(num) { method: 'post', data: { type: '1', - name: '车间采购管理_采购合同明细_查询数据', + name: '车间采购管理_采购合同_查询数据_外购件', + param: '采购合同流水号=' + num + } + }) +} +// 采购合同明细查询 +export function searchTable3(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购合同_查询数据_基本件', param: '采购合同流水号=' + num } }) diff --git a/src/api/WorkshopProcurement/ProjectTotalSearch.js b/src/api/WorkshopProcurement/ProjectTotalSearch.js index 3a5a46d3..dcc933bc 100644 --- a/src/api/WorkshopProcurement/ProjectTotalSearch.js +++ b/src/api/WorkshopProcurement/ProjectTotalSearch.js @@ -30,7 +30,19 @@ export function searchProjectTotal1(num) { method: 'post', data: { type: '1', - name: '车间采购管理_项目总价_明细_查询数据', + name: '车间采购管理_项目总价_明细_查询数据_外购件', + param: `项目流水号=${num}` + } + }) +} +// 初始化项目金额统计表 +export function searchProjectTotal2(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_项目总价_明细_查询数据_基本件', param: `项目流水号=${num}` } }) diff --git a/src/api/WorkshopProcurement/PurchaseContractChange.js b/src/api/WorkshopProcurement/PurchaseContractChange.js index 0b7866af..bc8cae34 100644 --- a/src/api/WorkshopProcurement/PurchaseContractChange.js +++ b/src/api/WorkshopProcurement/PurchaseContractChange.js @@ -54,7 +54,19 @@ export function searchTable2(num) { method: 'post', data: { type: '1', - name: '车间采购管理_采购合同明细_查询数据', + name: '车间采购管理_采购合同_查询数据_外购件', + param: '采购合同流水号=' + num + } + }) +} +// 采购合同明细查询 +export function searchTable5(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购合同_查询数据_基本件', param: '采购合同流水号=' + num } }) @@ -79,7 +91,18 @@ export function searchTable4(num) { method: 'post', data: { type: '1', - name: '车间采购管理_采购合同明细变更_查询数据', + name: '车间采购管理_采购合同明细变更_查询数据_外购件', + param: '采购合同变更流水号=' + num + } + }) +} +export function searchTable6(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购合同明细变更_查询数据_基本件', param: '采购合同变更流水号=' + num } }) diff --git a/src/views/Assembly/AssemblyPlan/index.vue b/src/views/Assembly/AssemblyPlan/index.vue index 4b70def5..696552ad 100644 --- a/src/views/Assembly/AssemblyPlan/index.vue +++ b/src/views/Assembly/AssemblyPlan/index.vue @@ -62,7 +62,7 @@ @@ -144,9 +144,9 @@ export default { this.machineNumberValue ? this.check1 = 1 : this.check1 = 0 searchTable(this.check, this.projectValue, this.check1, this.machineNumberValue, this.check2, this.startEndDate[0], this.startEndDate[1], this.pageCurrent, this.pageSize).then(response => { for (let i = 0; i < response.data.rows.length; i++) { - console.log(response.data.rows[i].项目计划完成时间) - if (response.data.rows[i].项目计划完成时间 !== '') { - response.data.rows[i].项目计划完成时间 = (response.data.rows[i].项目计划完成时间).split(' ')[0] + console.log(response.data.rows[i].发货节点) + if (response.data.rows[i].发货节点 !== '') { + response.data.rows[i].发货节点 = (response.data.rows[i].发货节点).split(' ')[0] } } this.tableData = response.data.rows diff --git a/src/views/Assembly/PrintingAssemblyProcessCard/index.vue b/src/views/Assembly/PrintingAssemblyProcessCard/index.vue index cb92e4b8..0414c418 100644 --- a/src/views/Assembly/PrintingAssemblyProcessCard/index.vue +++ b/src/views/Assembly/PrintingAssemblyProcessCard/index.vue @@ -99,9 +99,9 @@ {{ list.工艺内容及装配具体要求 }} {{ list.质检 }} {{ list.工时 }} - {{ list.装配员 }} - {{ list.检验员 }} - {{ list.备注 }} + + + diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index afda4cbd..f83a97bf 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -74,19 +74,19 @@ - + - + - + @@ -228,6 +228,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -282,7 +336,6 @@ - @@ -323,12 +376,11 @@ 确定 -