meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
liushuai
2019-04-16 10:35:06 +08:00
parent e83552ed4d
commit b219eb7978
6 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/request.js
View File

@@ -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 // 请求超时时间

8
src/views/TechnologyCenter/ImportParts/index.vue
View File

@@ -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') {

6
src/views/TechnologyCenter/ImportParts/specificationData.vue
View File

@@ -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 {

6
src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
View File

@@ -186,7 +186,7 @@
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="成品尺寸" align="center" min-width="100">
<el-table-column label="求购重量" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.重量 }}
</template>
@@ -395,7 +395,7 @@
<td colspan="2" style="text-align: center;width: 10%">材料</td>
<td colspan="2" style="text-align: center;width: 8%">单位</td>
<td colspan="2" style="text-align: center;width: 8%">数量</td>
<td colspan="2" style="text-align: center;width: 20%">成品尺寸</td>
<td colspan="2" style="text-align: center;width: 20%">请购重量</td>
<td style="text-align: center;width: 17%">备注</td>
</tr>
<tr v-for="(list, index) in tableData3" :key="index" style="height: 35px">
@@ -405,7 +405,7 @@
<td colspan="2" style="text-align: center;width: 10%">{{ list.材料 }}</td>
<td colspan="2" style="text-align: center;width: 8%">{{ list.单位 }}</td>
<td colspan="2" style="text-align: center;width: 8%">{{ list.批次数量 }}</td>
<td colspan="2" style="text-align: center;width: 20%">{{ list.成品尺寸 }}</td>
<td colspan="2" style="text-align: center;width: 20%">{{ list.重量 }}</td>
<td style="text-align: center;width: 17%">{{ list.备注1 }}</td>
</tr>
</table>

4
src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue
View File

@@ -109,9 +109,9 @@
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="成品尺寸" align="center" min-width="100">
<el-table-column label="请购重量" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.备料打印 }}
{{ scope.row.重量 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="100">

8
src/views/WorkshopProcurement/StockPreparation/index.vue
View File

@@ -115,9 +115,9 @@
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="成品尺寸" align="center" min-width="100">
<el-table-column label="请购重量" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.备料打印 }}
{{ scope.row.重量 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="100">
@@ -202,7 +202,7 @@
<td colspan="2" style="text-align: center;width: 10%">材料</td>
<td colspan="2" style="text-align: center;width: 8%">单位</td>
<td colspan="1" style="text-align: center;width: 8%">数量</td>
<td colspan="2" style="text-align: center;width: 20%">成品尺寸</td>
<td colspan="2" style="text-align: center;width: 20%">请购重量</td>
<td colspan="2" style="text-align: center;width: 8%">重量</td>
<td colspan="2" style="text-align: center;width: 11%">总重量</td>
</tr>
@@ -213,7 +213,7 @@
<td colspan="2" style="text-align: center;width: 10%">{{ list.材料 }}</td>
<td colspan="2" style="text-align: center;width: 8%">{{ list.单位 }}</td>
<td colspan="1" style="text-align: center;width: 8%">{{ list.批次数量 }}</td>
<td colspan="2" style="text-align: center;width: 20%">{{ list.成品尺寸 }}</td>
<td colspan="2" style="text-align: center;width: 20%">{{ list.重量 }}</td>
<td colspan="2" style="text-align: center;width: 8%">{{ list.重量1 }}</td>
<td colspan="2" style="text-align: center;width: 9%">{{ list.批次数量 * list.重量1 }}</td>
</tr>