From b219eb79788a85183965bb974ad35d8b4643a18f Mon Sep 17 00:00:00 2001 From: liushuai Date: Tue, 16 Apr 2019 10:35:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- src/views/TechnologyCenter/ImportParts/index.vue | 8 +++++--- .../TechnologyCenter/ImportParts/specificationData.vue | 6 +++--- .../CreatingPurchasingMaterials/index.vue | 6 +++--- .../WorkshopProcurement/OutsourcingStockArrival/index.vue | 4 ++-- src/views/WorkshopProcurement/StockPreparation/index.vue | 8 ++++---- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 0a45cef9..d50e6ea6 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -20,7 +20,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.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue index 9fff4d06..c7a33ef5 100644 --- a/src/views/TechnologyCenter/ImportParts/index.vue +++ b/src/views/TechnologyCenter/ImportParts/index.vue @@ -189,6 +189,7 @@ export default { return } else { if (this.worksheet[j].M2.v === '00-MX') { + this.group = this.worksheet[j].M2.v if (this.worksheet[j].M2.v.substring(0, 1) !== '9') { this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = '' this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = '' @@ -278,7 +279,7 @@ export default { if (classificationCode) { drawingNum += '-' + classificationCode } - await this.insertToSQL(establishment, proofread, review, date, machineName, machineNum, componentName, componentNum, this.group, contractNum, pageNum, totalNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode) + await this.insertToSQL(establishment, proofread, review, date, machineName, machineNum, componentName, componentNum, groupNum, contractNum, pageNum, totalNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode) } else { this.loading = false this.disabled = false @@ -310,8 +311,9 @@ export default { }, async insertToSQL(establishment, proofread, review, date, machineName, machineNum, componentName, componentNum, groupNum, contractNum, pageNum, totalNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode) { try { + console.log(useNum, 232) if (groupNum.indexOf('MX') > -1) { - const response = await importBasics(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, groupNum, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode) + const response = await importBasics(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, this.group, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode) const res = response.data if (res[0].result === '0') { this.$notify.error(`${drawingNum}导入失败`) @@ -320,7 +322,7 @@ export default { this.$notify.error(`${drawingNum}导入重复`) } } else { - const response = await importPurcharse(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, groupNum, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode) + const response = await importPurcharse(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, this.group, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode) const res = response.data console.log(res) if (res[0].result === '0') { diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue index cdfa4898..6f455fb5 100644 --- a/src/views/TechnologyCenter/ImportParts/specificationData.vue +++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue @@ -554,7 +554,7 @@ export default { const index = data.图号或者型号.lastIndexOf('-') data.图号或者型号 = data.图号或者型号.substring(index + 1) if (data.图号或者型号.indexOf('组') > -1) { - const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量) + const total = parseInt(data.备件数量) + parseFloat(data.装机数量) * parseInt(data.部件数量) const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.备件数量, data.部件数量) await sleep(10) if (resp.data[0].result === '0') { @@ -563,7 +563,7 @@ export default { } } else { console.log(222222222) - const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量) + const total = parseInt(data.备件数量) + parseFloat(data.装机数量) * parseInt(data.部件数量) const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.备件数量) await sleep(10) if (resp.data[0].result === '0') { @@ -575,7 +575,7 @@ export default { for (let i = 0; i < this.tableDataAll.length; i++) { let dataType const data = this.tableDataAll[i] - const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量) + const total = parseInt(data.备件数量) + parseFloat(data.装机数量) * parseInt(data.部件数量) if (this.groupName.indexOf('WG') > -1) { dataType = 2 } else { diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue index c5c81d14..2715c39b 100644 --- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue +++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue @@ -186,7 +186,7 @@ {{ scope.row.批次数量 }} - + @@ -395,7 +395,7 @@ 材料 单位 数量 - 成品尺寸 + 请购重量 备注 @@ -405,7 +405,7 @@ {{ list.材料 }} {{ list.单位 }} {{ list.批次数量 }} - {{ list.成品尺寸 }} + {{ list.重量 }} {{ list.备注1 }} diff --git a/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue b/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue index 25bdceb8..60d4cd65 100644 --- a/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue +++ b/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue @@ -109,9 +109,9 @@ {{ scope.row.批次数量 }} - + diff --git a/src/views/WorkshopProcurement/StockPreparation/index.vue b/src/views/WorkshopProcurement/StockPreparation/index.vue index edfb4aee..443194a0 100644 --- a/src/views/WorkshopProcurement/StockPreparation/index.vue +++ b/src/views/WorkshopProcurement/StockPreparation/index.vue @@ -115,9 +115,9 @@ {{ scope.row.批次数量 }} - + @@ -202,7 +202,7 @@ 材料 单位 数量 - 成品尺寸 + 请购重量 重量 总重量 @@ -213,7 +213,7 @@ {{ list.材料 }} {{ list.单位 }} {{ list.批次数量 }} - {{ list.成品尺寸 }} + {{ list.重量 }} {{ list.重量1 }} {{ list.批次数量 * list.重量1 }}