From 4581c2db7a67111acbb97fbc36b347800cccf34f Mon Sep 17 00:00:00 2001 From: liushuai Date: Mon, 10 Dec 2018 19:42:03 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=EF=BC=8C=E9=9B=B6=E4=BB=B6=E5=88=86=E9=85=8D=EF=BC=8C=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E9=87=87=E8=B4=AD=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/PartAssignment.js | 11 + src/api/TechnologyCenter/ImportParts.js | 8 +- .../CreatingProcurementContracts.js | 4 +- src/icons/svg/ImportChangeParts.svg | 1 + .../PartAssignment/index.vue | 218 +++++++------ .../ImportChangeParts/index.vue | 8 +- .../ImportChangeParts/specificationData1.vue | 3 +- .../TechnologyCenter/ImportParts/index.vue | 81 ++--- .../ImportParts/specificationData.vue | 3 +- .../TechnologyCenter/QueryParts/index.vue | 7 +- .../ArrivalStateSearch/index.vue | 21 +- .../CreatingProcurementContracts/index.vue | 308 +++++++++--------- .../DepartmentBuyerRequestFund/index.vue | 8 +- .../FundApproval1/index.vue | 4 +- .../FundApproval2/index.vue | 4 +- .../FundApproval3/index.vue | 4 +- .../InvoiceStateSearch/index.vue | 2 +- .../PayStateSearch/index.vue | 4 +- .../ProcurementContractApproval/index.vue | 42 ++- .../ProcurementContractEnquiry/index.vue | 42 ++- .../PurchaseContractChange/index.vue | 85 +++-- 21 files changed, 497 insertions(+), 371 deletions(-) create mode 100644 src/icons/svg/ImportChangeParts.svg diff --git a/src/api/ManufacturingCenter/PartAssignment.js b/src/api/ManufacturingCenter/PartAssignment.js index 1b39134a..771c20de 100644 --- a/src/api/ManufacturingCenter/PartAssignment.js +++ b/src/api/ManufacturingCenter/PartAssignment.js @@ -156,6 +156,17 @@ export function purchaseRequisition1(RequisitionList, projectName, projectFloatV } }) } +export function purchaseRequisition2(projectFloatValue, machineFloatValue, groupFloatValue, BasicPartsNumber, NumberOfParts, time) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间管理_采购部采购_基本件_传递数据', + param: `组件流水号=${groupFloatValue}&基本件流水号组=${BasicPartsNumber}&项目流水号=${projectFloatValue}&机床流水号=${machineFloatValue}&物料计划到货时间=${time}&零件数量组=${NumberOfParts}` + } + }) +} export function MoveOut(num, num1) { return request({ url: '', diff --git a/src/api/TechnologyCenter/ImportParts.js b/src/api/TechnologyCenter/ImportParts.js index 87d185cb..4ac07334 100644 --- a/src/api/TechnologyCenter/ImportParts.js +++ b/src/api/TechnologyCenter/ImportParts.js @@ -279,26 +279,26 @@ export function searchGroupNum1(project, name) { }) } // 传递零件 -export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, type, transmit, num6, id) { +export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, id) { return request({ url: '', method: 'post', data: { type: '2', name: 'PDM_零件明细表_基本件_大量导入', - param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id } }) } // 传递零件 -export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, type, transmit, num6, id, oldId) { +export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, id, oldId, oldNum) { return request({ url: '', method: 'post', data: { type: '2', name: 'PDM_零件明细表_整改件_大量导入', - param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&前id=' + oldId + param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&前id=' + oldId + '&前图号或者型号=' + oldNum } }) } diff --git a/src/api/WorkshopProcurement/CreatingProcurementContracts.js b/src/api/WorkshopProcurement/CreatingProcurementContracts.js index ab3db574..1ac2a3ec 100644 --- a/src/api/WorkshopProcurement/CreatingProcurementContracts.js +++ b/src/api/WorkshopProcurement/CreatingProcurementContracts.js @@ -149,14 +149,14 @@ export function searchSheetContract(num1) { }) } // 生成采购合同 -export function doneContract(num1, RequisitionNumber, name1, time1, time2, method, num2, text, freight, num3, partsNum, priceGroup, payGroup, planGroup, taxGroup, currency, num4, id) { +export function doneContract(num1, RequisitionNumber, name1, time1, time2, num2, text, freight, num3, partsNum, priceGroup, taxGroup, currency, num4, id, AdvanceCharge) { return request({ url: '', method: 'post', data: { type: '2', name: '车间管理_基本件采购_请购单和请购单明细_增加数据', - param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&付款方式=${method}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&付款比例组=${payGroup}&计划付款时间组=${planGroup}&税率组=${taxGroup}&币种流水号组=${currency}` + param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&税率组=${taxGroup}&币种流水号组=${currency}&预付款=${AdvanceCharge}` } }) } diff --git a/src/icons/svg/ImportChangeParts.svg b/src/icons/svg/ImportChangeParts.svg new file mode 100644 index 00000000..5d0be802 --- /dev/null +++ b/src/icons/svg/ImportChangeParts.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index ca5358cd..daf11a83 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -101,7 +101,7 @@ @@ -275,6 +275,11 @@ {{ scope.row.组号 }} + + + + + + + +