|
|
@ -181,25 +181,27 @@
|
|
|
|
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="工单ID" align="center" prop="workorderId" v-if="false"/>
|
|
|
|
<el-table-column label="工单ID" align="center" prop="workorderId" v-if="false"/>
|
|
|
|
<el-table-column width="150" label="子工单编号" align="center" prop="workorderCode"/>
|
|
|
|
<el-table-column width="160" label="子工单编号" align="center" prop="workorderCode"/>
|
|
|
|
<el-table-column label="订单id" align="center" prop="orderId" v-if="false"/>
|
|
|
|
<el-table-column label="订单id" align="center" prop="orderId" v-if="false"/>
|
|
|
|
<el-table-column width="150" label="子订单编码" align="center" prop="orderCode"/>
|
|
|
|
<el-table-column width="150" label="子订单编码" align="center" prop="orderCode"/>
|
|
|
|
<el-table-column label="产品ID" align="center" prop="productId" v-if="false"/>
|
|
|
|
<el-table-column label="产品ID" align="center" prop="productId" v-if="false"/>
|
|
|
|
<el-table-column width="180" label="产品编码" align="center" prop="productCode"
|
|
|
|
<el-table-column width="120" label="产品编码" align="center" prop="productCode"
|
|
|
|
:formatter="productCodeFormate"
|
|
|
|
:formatter="productCodeFormate"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
<el-table-column width="300" label="产品名称" align="center" prop="productName"/>
|
|
|
|
<el-table-column width="180" label="产品名称" align="center" prop="productName"/>
|
|
|
|
<el-table-column label="规格型号" align="center" prop="productSpc" v-if="false"/>
|
|
|
|
<el-table-column label="规格型号" align="center" prop="productSpc" v-if="false"/>
|
|
|
|
<el-table-column width="50" label="单位" align="center" prop="unit"/>
|
|
|
|
<el-table-column width="100" label="投料编码" align="center" prop="materialCode" v-if="false"/>
|
|
|
|
|
|
|
|
<el-table-column width="100" label="投料名称" align="center" prop="materialName"/>
|
|
|
|
<!--
|
|
|
|
<!--
|
|
|
|
<el-table-column label="子单批次信息" width="300" align="center" prop="batchInfo">
|
|
|
|
<el-table-column label="子单批次信息" width="300" align="center" prop="batchInfo">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<div v-for="item in scope.row.batchInfo">{{ item }}</div>
|
|
|
|
<div v-for="item in scope.row.batchInfo">{{ item }}</div>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>-->
|
|
|
|
</el-table-column>-->
|
|
|
|
<el-table-column width="120" label="派工数量" align="center" prop="quantitySplit"/>
|
|
|
|
<el-table-column width="90" label="派工数量" align="center" prop="quantitySplit"/>
|
|
|
|
<el-table-column width="150" label="工艺编码" align="center" prop="routeCode"/>
|
|
|
|
<el-table-column width="50" label="单位" align="center" prop="unit"/>
|
|
|
|
<el-table-column width="200" label="工艺名称" align="center" prop="routeName" />
|
|
|
|
<el-table-column width="90" label="工艺编码" align="center" prop="routeCode"/>
|
|
|
|
|
|
|
|
<el-table-column width="180" label="工艺名称" align="center" prop="routeName" />
|
|
|
|
<!-- show-overflow-tooltip -->
|
|
|
|
<!-- show-overflow-tooltip -->
|
|
|
|
<el-table-column width="300" label="产线设备" align="center" >
|
|
|
|
<el-table-column width="300" label="产线设备" align="center" >
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
@ -209,7 +211,7 @@
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column width="130" label="产线设备编码" align="center" prop="prodLineCode" v-if="false"/>
|
|
|
|
<el-table-column width="130" label="产线设备编码" align="center" prop="prodLineCode" v-if="false"/>
|
|
|
|
<el-table-column width="120" label="工单生产日期" align="center" prop="productDate">
|
|
|
|
<el-table-column width="100" label="工单生产日期" align="center" prop="productDate">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
|
|
|
|
<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
@ -815,7 +817,12 @@ export default {
|
|
|
|
methods: {
|
|
|
|
methods: {
|
|
|
|
//产品编码格式化
|
|
|
|
//产品编码格式化
|
|
|
|
productCodeFormate(row, column, cellValue){
|
|
|
|
productCodeFormate(row, column, cellValue){
|
|
|
|
return cellValue.slice(7,18); //返回值
|
|
|
|
if(cellValue.length>11){
|
|
|
|
|
|
|
|
return cellValue.slice(7,18); //返回值
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
|
|
|
return cellValue; //返回值
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
// 新增-物料搜索
|
|
|
|
// 新增-物料搜索
|
|
|
|