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
2020-02-27 08:35:46 +08:00
parent 7e81b57ab4
commit b740e50051
14 changed files with 568 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/views/ManufacturingCenter/CreatePreparationBill/index.vue
View File

@@ -147,7 +147,7 @@
</template>
<script>
import { searchtable, searchtable2, edit, edit2, getExport } from '@/api/ManufacturingCenter/CreatePreparationBill'
import { searchtable, edit, edit2, getExport } from '@/api/ManufacturingCenter/CreatePreparationBill'
import { exportExcelMethod } from './exportExcel'
import $ from 'jquery'
export default {
@@ -226,27 +226,8 @@ export default {
// this.tableData.push({
// 重量: response.data.rows[0].重量
// })
this.Data = response.data.rows
this.tableData = response.data.rows
this.total = response.data.total
}
}).then(() => {
for (let i = 0; i < this.Data.length; i++) {
searchtable2(this.Data[i].工艺计划流水号).then(response => {
this.tableData.push({
工艺计划流水号: this.Data[i].工艺计划流水号,
零件名称: this.Data[i].零件名称,
零件图号: this.Data[i].零件图号,
备料打印: this.Data[i].备料打印,
是否外购备料: this.Data[i].是否外购备料,
工艺要求: response.data[0].工艺要求,
材料: this.Data[i].材料,
重量: this.Data[i].重量,
批次数量: this.Data[i].批次数量,
是否加急: this.Data[i].是否加急,
备料任务接受时间: this.Data[i].备料任务接受时间,
备料任务分配时间: this.Data[i].备料任务分配时间
})
})
this.loading = false
}
})

40
src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
View File

@@ -250,26 +250,30 @@ export default {
})
},
exportExcel() {
if (this.machineNameValue !== '' && this.machineNameValue !== null) {
this.check1 = 1
if (this.tableData.length !== 0) {
if (this.machineNameValue !== '' && this.machineNameValue !== null) {
this.check1 = 1
} else {
this.check1 = 0
}
let check7
this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '')
var param = []
param[0] = ['机床流水号_check', this.check1]
param[1] = ['机床流水号', this.machineNameValue]
param[2] = ['报废日期_check', check7]
if (check7 === 0) {
param[3] = ['开始时间', '']
param[4] = ['结束时间', '']
} else {
param[3] = ['开始时间', this.outTime[0]]
param[4] = ['结束时间', this.outTime[1]]
}
var Data = this.CreateData('2001', '报表_报废零件查询', param)
this.exportExcel_NPOI(Data)
} else {
this.check1 = 0
this.$message.warning('暂无数据')
}
let check7
this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '')
var param = []
param[0] = ['机床流水号_check', this.check1]
param[1] = ['机床流水号', this.machineNameValue]
param[2] = ['报废日期_check', check7]
if (check7 === 0) {
param[3] = ['开始时间', '']
param[4] = ['结束时间', '']
} else {
param[3] = ['开始时间', this.outTime[0]]
param[4] = ['结束时间', this.outTime[1]]
}
var Data = this.CreateData('2001', '报表_报废零件查询', param)
this.exportExcel_NPOI(Data)
},
handleSizeChange(val) {
this.pageSize = val

10
src/views/ManufacturingCenter/MachiningParts/index.vue
View File

@@ -46,16 +46,16 @@
{{ scope.row.终端编号 }}
</template>
</el-table-column>
<el-table-column label="操作者" prop="姓名" show-overflow-tooltip align="center" width="60px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="开始加工时间" show-overflow-tooltip align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.开始加工时间 ? scope.row.开始加工时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column label="操作者" prop="姓名" show-overflow-tooltip align="center" width="60px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="70px" fixed="right">
<template slot-scope="scope">
<el-button