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

Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0

Browse Source
This commit is contained in:
jiangfuzhuang
2019-05-31 18:44:11 +08:00
parent c5a29599fc 74b2189cfb
commit 09c230a650
6 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/ManufacturingCenter/ProcessingStatus.js
View File

@@ -66,7 +66,7 @@ export function getExport(num) {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: `select 机床流水号,组件流水号,车间生产管理工艺_零件工艺计划.工艺计划流水号,车间生产管理工艺_零件工艺计划.零件图号_零件工艺计划,车间生产管理工艺_零件工序_视图.零件名称,待加工工序顺序,车间生产管理工艺_零件工序.工序流水号,车间生产管理工艺_零件工序.工艺编号,车间生产管理工艺_基础表_工艺名称.工艺名称,批次数量,材料 name: `select 机床流水号,机床图号,组件流水号,组号,车间生产管理工艺_零件工艺计划.工艺计划流水号,车间生产管理工艺_零件工艺计划.零件图号_零件工艺计划,车间生产管理工艺_零件工序_视图.零件名称,待加工工序顺序,车间生产管理工艺_零件工序.工序流水号,车间生产管理工艺_零件工序.工艺编号,车间生产管理工艺_基础表_工艺名称.工艺名称,批次数量,材料
from ( select 工艺计划流水号,min(工序顺序) as 待加工工序顺序 from ( select 工艺计划流水号,min(工序顺序) as 待加工工序顺序
from 车间生产管理工艺_零件工序_视图 from 车间生产管理工艺_零件工序_视图
where 完成日期_短 is null and 考核状态 = 6 where 完成日期_短 is null and 考核状态 = 6

2
src/views/Assembly/DeliveryApplication/index.vue
View File

@@ -13,7 +13,7 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div> <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option> </el-option>
</el-select> </el-select>
<!-- <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>--> <!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>-->
</el-row> </el-row>
</el-card> </el-card>
<el-card> <el-card>

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

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

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

@@ -176,7 +176,7 @@
{{ scope.row.任务名称 }} {{ scope.row.任务名称 }}
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
{{ scope.row.任务开始时间 }} {{ scope.row.任务开始时间 }}
</template> </template>
@@ -216,7 +216,7 @@
{{ scope.row.任务名称 }} {{ scope.row.任务名称 }}
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
{{ scope.row.任务开始时间 }} {{ scope.row.任务开始时间 }}
</template> </template>
@@ -261,7 +261,7 @@
{{ scope.row.任务名称 }} {{ scope.row.任务名称 }}
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
{{ scope.row.任务开始时间 }} {{ scope.row.任务开始时间 }}
</template> </template>
@@ -306,7 +306,7 @@
{{ scope.row.任务名称 }} {{ scope.row.任务名称 }}
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
{{ scope.row.任务开始时间 }} {{ scope.row.任务开始时间 }}
</template> </template>
@@ -351,7 +351,7 @@
{{ scope.row.任务名称 }} {{ scope.row.任务名称 }}
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
{{ scope.row.任务开始时间 }} {{ scope.row.任务开始时间 }}
</template> </template>

29
src/views/ManufacturingCenter/StatusQuery/index.vue
View File

@@ -50,28 +50,28 @@
<el-table <el-table
v-loading="loading0" v-loading="loading0"
:data="tableData" :data="tableData"
style="width: 100%;max-height: 610px" style="width: 100%;max-height: 600px"
height="610" height="600"
size="mini" size="mini"
highlight-current-row highlight-current-row
border> border>
<el-table-column align="center" label="序号" type="index" width="50px"/> <el-table-column align="center" label="序号" type="index" width="60px"/>
<el-table-column align="center" label="机床图号" width="100px"> <el-table-column align="center" label="机床图号" width="170px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组号" width="60px"> <el-table-column align="center" label="组号" width="140px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="零件图号" width="150px"> <el-table-column align="center" label="零件图号" width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="零件名称" width="100px"> <el-table-column align="center" label="零件名称" width="180px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
@@ -81,17 +81,17 @@
{{ scope.row.投产总数量 }} {{ scope.row.投产总数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="投产时间" width="100px"> <el-table-column align="center" label="投产时间" width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.传递时间 }} {{ scope.row.传递时间 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="零件状态" min-width="960px"> <el-table-column align="center" label="零件状态" width="750px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-steps id="StatusQuery" :active="scope.row.考核状态" finish-status="success" simple> <el-steps :active="scope.row.考核状态" finish-status="success" simple>
<el-step title="投产" /> <el-step title="投产" />
<el-step title="工艺定额" /> <el-step title="工艺" />
<!--<el-step title="定额" />--> <el-step title="定额" />
<el-step title="平衡" /> <el-step title="平衡" />
<el-step title="完成" /> <el-step title="完成" />
<el-step title="入库" /> <el-step title="入库" />
@@ -491,8 +491,3 @@ export default {
margin: 10px 0 10px 10px; margin: 10px 0 10px 10px;
} }
</style> </style>
<style>
#StatusQuery {
padding: 8px 30px;
}
</style>

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

@@ -94,6 +94,11 @@
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="原材料名称" align="center" min-width="150">
<template slot-scope="scope">
{{ 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"> <template slot-scope="scope">
{{ scope.row.材料 }} {{ scope.row.材料 }}
@@ -109,11 +114,6 @@
{{ scope.row.批次数量 }} {{ scope.row.批次数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="请购重量" align="center" min-width="100">
<template slot-scope="scope">
{{ 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"> <template slot-scope="scope">
{{ scope.row.备注1 }} {{ scope.row.备注1 }}