This commit is contained in:
Vergil
2020-05-19 10:49:49 +08:00
parent ec119bfcf6
commit 36b0406869
3 changed files with 15 additions and 20 deletions

View File

@@ -81,11 +81,6 @@
{{ scope.row.完成数量 }} {{ scope.row.完成数量 }}
</template> </template>
</el-table-column> </el-table-column>
<!--<el-table-column label="计划工时(分)" align="center" width="70px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.计划工时 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="单件工时(分)" align="center" width="80px"> <el-table-column label="单件工时(分)" align="center" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.修补单件工时 }} {{ scope.row.修补单件工时 }}
@@ -113,7 +108,7 @@
</el-table-column> </el-table-column>
<el-table-column label="编辑人员" align="center" width="90px"> <el-table-column label="编辑人员" align="center" width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.修改人员 }} {{ scope.row.修改人员姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="编辑时间" align="center" width="90px"> <el-table-column label="编辑时间" align="center" width="90px">

View File

@@ -26,17 +26,17 @@
<el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)===1" type="success" size="mini">已到货</el-tag> <el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)===1" type="success" size="mini">已到货</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="项目名称" align="center" width="115px" fixed> <el-table-column label="机床图号" align="center" width="110px" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.项目名称 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件图号" align="center" width="140px" show-overflow-tooltip fixed> <el-table-column label="零件图号" align="center" width="100px" show-overflow-tooltip fixed>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件名称" align="center" width="110px" fixed> <el-table-column label="零件名称" align="center" width="100px" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
@@ -46,22 +46,22 @@
{{ scope.row.批次数量 }} {{ scope.row.批次数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="外协工序" align="center" width="100"> <el-table-column label="外协工序" align="center" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.外协工序 }} {{ scope.row.外协工序 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="外协工时(分)" align="center" width="110"> <el-table-column label="外协工时(分)" align="center" width="70">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.外协工时 }} {{ scope.row.外协工时 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工时费用(元)" align="center" width="110"> <el-table-column label="工时费用(元)" align="center" width="70">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.加工价格_成交 }} {{ scope.row.加工价格_成交 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="外协厂家" align="center" width="140px" show-overflow-tooltip> <el-table-column label="外协厂家" align="center" width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.外协厂家名称 }} {{ scope.row.外协厂家名称 }}
</template> </template>
@@ -71,22 +71,22 @@
{{ scope.row.表单号 }} {{ scope.row.表单号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="外协日期" align="center" width="100"> <el-table-column label="外协日期" align="center" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.任务下达日期 ? scope.row.任务下达日期.split(' ')[0]:scope.row.任务下达日期 }} {{ scope.row.任务下达日期 ? scope.row.任务下达日期.split(' ')[0]:scope.row.任务下达日期 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="计划到货" align="center" width="120"> <el-table-column label="计划到货" align="center" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.到货日期 ? (scope.row.到货日期.split(' ')[0] !== '1900-01-01' ? scope.row.到货日期.split(' ')[0] : '') : scope.row.到货日期 }} {{ scope.row.到货日期 ? (scope.row.到货日期.split(' ')[0] !== '1900-01-01' ? scope.row.到货日期.split(' ')[0] : '') : scope.row.到货日期 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实际到货" align="center" width="120"> <el-table-column label="实际到货" align="center" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.到货时间 ? (scope.row.到货时间.split(' ')[0] !== '1900-01-01' ? scope.row.到货时间.split(' ')[0] : '') : scope.row.到货时间 }} {{ scope.row.到货时间 ? (scope.row.到货时间.split(' ')[0] !== '1900-01-01' ? scope.row.到货时间.split(' ')[0] : '') : scope.row.到货时间 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="外协员" align="center" width="70" show-overflow-tooltip> <el-table-column label="外协员" align="center" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.外协计划员 }} {{ scope.row.外协计划员 }}
</template> </template>

View File

@@ -57,12 +57,12 @@
{{ scope.row.批次数量 }} {{ scope.row.批次数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="计划到货日期" align="center" > <el-table-column label="计划到货" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.到货日期 }} {{ scope.row.到货日期 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货日期" align="center" > <el-table-column label="实际到货" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.到货时间 }} {{ scope.row.到货时间 }}
</template> </template>