From d74e75eff9ea49b32c4abf7896549f98b92ff9df Mon Sep 17 00:00:00 2001 From: liushuai Date: Wed, 5 Dec 2018 20:05:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=87=87=E8=B4=AD=E5=90=88?= =?UTF-8?q?=E5=90=8C=E9=83=A8=E5=88=86=E5=92=8C=E9=9B=B6=E4=BB=B6=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/PartAssignment.js | 8 +- .../CreatingProcurementContracts.js | 11 ++ src/utils/request.js | 2 +- .../AssemblyProcessPlanning/index.vue | 1 + .../PartAssignment/index.vue | 20 +-- .../ContractInformationManagement/index.vue | 1 + .../TechnologyCenter/ImportParts/index.vue | 5 +- .../CreatingProcurementContracts/index.vue | 129 ++++++------------ .../PurchaseContractChange/index.vue | 13 +- 9 files changed, 85 insertions(+), 105 deletions(-) diff --git a/src/api/ManufacturingCenter/PartAssignment.js b/src/api/ManufacturingCenter/PartAssignment.js index bb552ce5..1b39134a 100644 --- a/src/api/ManufacturingCenter/PartAssignment.js +++ b/src/api/ManufacturingCenter/PartAssignment.js @@ -134,25 +134,25 @@ export function searchDetailed1(num) { } }) } -export function purchaseRequisition(RequisitionList, projectName, projectFloatValue, MachineToolNumber, machineFloatValue, groupName, groupFloatValue, BasicPartsNumber, MaterialName, PartToolNumber, Material, NumberOfParts, PartType, time, MaterialNum) { +export function purchaseRequisition(RequisitionList, projectName, projectFloatValue, MachineToolNumber, machineFloatValue, groupName, groupFloatValue, BasicPartsNumber, MaterialName, PartToolNumber, Material, NumberOfParts, PartType, time, MaterialNum, ReMarks) { return request({ url: '', method: 'post', data: { type: '2', name: '车间管理_基本件采购_请购单明细_请购', - param: '请购单流水号=' + RequisitionList + '&项目名称=' + projectName + '&项目流水号=' + projectFloatValue + '&机床图号=' + MachineToolNumber + '&机床流水号=' + machineFloatValue + '&组号=' + groupName + '&组件流水号=' + groupFloatValue + '&基本件流水号=' + BasicPartsNumber + '&物料名称=' + MaterialName + '&零件图号=' + PartToolNumber + '&材料=' + Material + '&零件数量=' + NumberOfParts + '&零件类型=' + PartType + '&物料计划到货时间=' + time + '&物料流水号=' + MaterialNum + param: '请购单流水号=' + RequisitionList + '&项目名称=' + projectName + '&项目流水号=' + projectFloatValue + '&机床图号=' + MachineToolNumber + '&机床流水号=' + machineFloatValue + '&组号=' + groupName + '&组件流水号=' + groupFloatValue + '&基本件流水号=' + BasicPartsNumber + '&物料名称=' + MaterialName + '&零件图号=' + PartToolNumber + '&材料=' + Material + '&零件数量=' + NumberOfParts + '&零件类型=' + PartType + '&物料计划到货时间=' + time + '&物料流水号=' + MaterialNum + '&备注=' + ReMarks } }) } -export function purchaseRequisition1(RequisitionList, projectName, projectFloatValue, MachineToolNumber, machineFloatValue, groupName, groupFloatValue, StandardPartsAndOutsourcing, MaterialName, MaterialSpecification, MaterialModel, NumberOfParts, PartType, time, MaterialNum) { +export function purchaseRequisition1(RequisitionList, projectName, projectFloatValue, MachineToolNumber, machineFloatValue, groupName, groupFloatValue, StandardPartsAndOutsourcing, MaterialName, MaterialSpecification, MaterialModel, NumberOfParts, PartType, time, MaterialNum, ReMarks) { return request({ url: '', method: 'post', data: { type: '2', name: '车间管理_基本件采购_请购单明细_请购', - param: '请购单流水号=' + RequisitionList + '&项目名称=' + projectName + '&项目流水号=' + projectFloatValue + '&机床图号=' + MachineToolNumber + '&机床流水号=' + machineFloatValue + '&组号=' + groupName + '&组件流水号=' + groupFloatValue + '&标准件和外购件流水号=' + StandardPartsAndOutsourcing + '&物料名称=' + MaterialName + '&物料规格=' + MaterialSpecification + '&物料型号=' + MaterialModel + '&零件数量=' + NumberOfParts + '&零件类型=' + PartType + '&物料计划到货时间=' + time + '&物料流水号=' + MaterialNum + param: '请购单流水号=' + RequisitionList + '&项目名称=' + projectName + '&项目流水号=' + projectFloatValue + '&机床图号=' + MachineToolNumber + '&机床流水号=' + machineFloatValue + '&组号=' + groupName + '&组件流水号=' + groupFloatValue + '&标准件和外购件流水号=' + StandardPartsAndOutsourcing + '&物料名称=' + MaterialName + '&物料规格=' + MaterialSpecification + '&物料型号=' + MaterialModel + '&零件数量=' + NumberOfParts + '&零件类型=' + PartType + '&物料计划到货时间=' + time + '&物料流水号=' + MaterialNum + '&备注=' + ReMarks } }) } diff --git a/src/api/WorkshopProcurement/CreatingProcurementContracts.js b/src/api/WorkshopProcurement/CreatingProcurementContracts.js index ab7507e1..ab3db574 100644 --- a/src/api/WorkshopProcurement/CreatingProcurementContracts.js +++ b/src/api/WorkshopProcurement/CreatingProcurementContracts.js @@ -66,6 +66,17 @@ export function searchData2(num) { } }) } +export function update(num, time, remarks) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间管理_基本件采购_请购单明细_编辑数据', + param: '请购单明细流水号=' + num + '&物料计划到货时间=' + time + '&备注=' + remarks + } + }) +} // 初始化付款时间节点 export function initPayTimeNode() { return request({ diff --git a/src/utils/request.js b/src/utils/request.js index a9554197..432ec366 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -15,7 +15,7 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/Assembly/AssemblyProcessPlanning/index.vue b/src/views/Assembly/AssemblyProcessPlanning/index.vue index 92e53c03..70b32703 100644 --- a/src/views/Assembly/AssemblyProcessPlanning/index.vue +++ b/src/views/Assembly/AssemblyProcessPlanning/index.vue @@ -827,6 +827,7 @@ export default { this.processNameClassValue = '' this.processNameValue = '' this.processRequestValue = '' + this.processName = [] this.Procedure = row.装配工序流水号 this.number = row.序号 }, diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index f83a97bf..2a71ed34 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -177,7 +177,7 @@ - 物料计划到货时间： + 交货期： 车间请购 - 采购部门采购 - 车间生产 + 采购部门采购 + 车间生产 @@ -255,7 +255,7 @@ {{ scope.row.零件类型 }} - + @@ -309,7 +309,7 @@ {{ scope.row.零件类型 }} - + @@ -427,6 +427,7 @@ export default { MaterialSpecification: [], MaterialModel: [], NumberOfParts: [], + ReMarks: [], projectName: '', MachineToolNumber: '', groupName: '', @@ -668,6 +669,7 @@ export default { this.PartToolNumber[i] = val[i].零件图号 this.Material[i] = val[i].材料 this.NumberOfParts[i] = val[i].零件数量 + this.ReMarks[i] = val[i].备注 } } else if (this.PartType === '外购件') { this.MaterialNum = [] @@ -683,6 +685,7 @@ export default { this.MaterialSpecification[i] = val[i].物料规格 this.MaterialModel[i] = val[i].物料型号 this.NumberOfParts[i] = val[i].零件数量 + this.ReMarks[i] = val[i].备注 } } else if (this.PartType === '标准件') { this.MaterialNum = [] @@ -698,6 +701,7 @@ export default { this.MaterialSpecification[i] = val[i].物料规格 this.MaterialModel[i] = val[i].物料型号 this.NumberOfParts[i] = val[i].零件数量 + this.ReMarks[i] = val[i].备注 } } }, @@ -707,7 +711,7 @@ export default { this.result = 0 if (this.PartType === '基本件') { for (let i = 0; i < this.BasicPartsNumber.length; i++) { - purchaseRequisition(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.BasicPartsNumber[i], this.MaterialName[i], this.PartToolNumber[i], this.Material[i], this.NumberOfParts[i], 3, this.time, this.MaterialNum[i]).then(response => { + purchaseRequisition(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.BasicPartsNumber[i], this.MaterialName[i], this.PartToolNumber[i], this.Material[i], this.NumberOfParts[i], 3, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => { this.result += parseInt(response.data[0].result) console.log(this.result) if (this.result === this.BasicPartsNumber.length) { @@ -729,7 +733,7 @@ export default { } } else if (this.PartType === '外购件') { for (let i = 0; i < this.StandardPartsAndOutsourcing.length; i++) { - purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 2, this.time, this.MaterialNum[i]).then(response => { + purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 2, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => { this.result += parseInt(response.data[0].result) if (this.result === this.StandardPartsAndOutsourcing.length) { this.$message.success('请购成功') @@ -749,7 +753,7 @@ export default { } } else if (this.PartType === '标准件') { for (let i = 0; i < this.StandardPartsAndOutsourcing.length; i++) { - purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 1, this.time, this.MaterialNum[i]).then(response => { + purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 1, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => { this.result += parseInt(response.data[0].result) if (this.result === this.StandardPartsAndOutsourcing.length) { this.$message.success('请购成功') diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue index 2fbd0e4f..053e523d 100644 --- a/src/views/MarketingCenter/ContractInformationManagement/index.vue +++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue @@ -665,6 +665,7 @@ export default { }) }, handleEdit(row) { + console.log(row) this.title = '编辑' this.dialogFormVisible1 = true this.form.contractNumber = row.合同编号 diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue index 9d67e2b4..b3340237 100644 --- a/src/views/TechnologyCenter/ImportParts/index.vue +++ b/src/views/TechnologyCenter/ImportParts/index.vue @@ -167,6 +167,7 @@ export default { this.disabled = false return } else { + console.log(this.worksheet[j], 2222) this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = '' this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = '' this.worksheet[j].L1 ? review = this.worksheet[j].L1.v : review = '' @@ -179,8 +180,7 @@ export default { this.worksheet[j].Q2 ? totalNum = parseInt(this.worksheet[j].Q2.v.replace(/[^0-9]/ig, '')) : totalNum = '' this.worksheet[j].R2 ? contractNum = this.worksheet[j].R2.v : contractNum = '' this.worksheet[j].M2 ? groupNum = this.worksheet[j].M2.v : groupNum = '' - const len = parseInt(this.worksheet[j]['!ref'].split(':')[1].substring(1)) - 3 - for (let i = 0; i < len; i++) { + for (let i = 0; i < 999; i++) { const attr = i + 4 drawingNum = this.worksheet[j][`B${attr}`] ? this.worksheet[j][`B${attr}`].v : '' name = this.worksheet[j][`D${attr}`] ? this.worksheet[j][`D${attr}`].v : '' @@ -237,6 +237,7 @@ export default { } } } catch (e) { + alert(3) this.err++ this.$message.error(`导入数据错误`) console.log(`导入数据错误${e}`) diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue index 6ae9b18f..a0f75bc3 100644 --- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue +++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue @@ -25,8 +25,8 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -159,12 +90,7 @@ - - - - - - + @@ -189,9 +115,21 @@ {{ scope.row.金额 }} - + + + + @@ -206,7 +144,7 @@ - + @@ -231,9 +169,21 @@ {{ scope.row.金额 }} - + + + + @@ -405,7 +355,7 @@