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

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
chenjianan
2019-05-31 13:51:55 +08:00
parent c39dcf2fd1 a2cda2c46c
commit 7e2107c098
9 changed files with 332 additions and 922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

908
src/views/ManufacturingCenter/CreateIntakeList/index.vue
View File

File diff suppressed because it is too large Load Diff

4
src/views/ManufacturingCenter/ProcessingStatus/index.vue
View File

@@ -398,8 +398,8 @@ export default {
getExport(this.Group).then(res => {
console.log(res.data)
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['图号及规格', '制品名称', '计划数', '材料', '当前工序名']
const filterVal = ['零件图号_零件工艺计划', '零件名称', '批次数量', '材料', '工艺名称']
const tHeader = ['机床', '组号', '图号及规格', '制品名称', '计划数', '材料', '当前工序名']
const filterVal = ['机床图号', '组号', '零件图号_零件工艺计划', '零件名称', '批次数量', '材料', '工艺名称']
const list = res.data
const data = this.formatJson(filterVal, list)
excel.export_json_to_excel({

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

@@ -176,7 +176,7 @@
{{ scope.row.任务名称 }}
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" min-width="100px">
<el-table-column label="计划开始时间" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.任务开始时间 }}
</template>
@@ -216,7 +216,7 @@
{{ scope.row.任务名称 }}
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" min-width="100px">
<el-table-column label="计划开始时间" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.任务开始时间 }}
</template>
@@ -261,7 +261,7 @@
{{ scope.row.任务名称 }}
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" min-width="100px">
<el-table-column label="计划开始时间" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.任务开始时间 }}
</template>
@@ -306,7 +306,7 @@
{{ scope.row.任务名称 }}
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" min-width="100px">
<el-table-column label="计划开始时间" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.任务开始时间 }}
</template>
@@ -351,7 +351,7 @@
{{ scope.row.任务名称 }}
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" min-width="100px">
<el-table-column label="计划开始时间" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.任务开始时间 }}
</template>