Commit d062d331 authored by 沈翠玲's avatar 沈翠玲

问题清单:生产排产和生产报工

parent 6ca96cf4
...@@ -77,11 +77,6 @@ ...@@ -77,11 +77,6 @@
<el-table-column label="工作单元" width="120" align="center" prop="workunitName" /> <el-table-column label="工作单元" width="120" align="center" prop="workunitName" />
<el-table-column label="外协单号" width="150" align="center" prop="assistProcessCode" /> <el-table-column label="外协单号" width="150" align="center" prop="assistProcessCode" />
<el-table-column label="生产工单编号" width="150" align="center" prop="workorderCode" /> <el-table-column label="生产工单编号" width="150" align="center" prop="workorderCode" />
<el-table-column label="产品物料编码" width="120" align="center" prop="sapItemCode" />
<el-table-column label="产品物料名称" min-width="250" show-overflow-tooltip align="center" prop="itemName" />
<el-table-column label="规格型号" width="100" align="center" prop="specification" />
<el-table-column label="指令号" width="120" align="center" prop="clientCmd" />
<el-table-column label="标准SIZE" width="120" align="center" prop="standardSize" />
<el-table-column label="报工数量" align="center" prop="feedbackTime" width="180"> <el-table-column label="报工数量" align="center" prop="feedbackTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getSumNumber(scope.row) }}</span> <span>{{ getSumNumber(scope.row) }}</span>
...@@ -90,6 +85,11 @@ ...@@ -90,6 +85,11 @@
<el-table-column label="合格数量" width="100" align="center" prop="quantityQualify" /> <el-table-column label="合格数量" width="100" align="center" prop="quantityQualify" />
<el-table-column label="不合格数量" width="100" align="center" prop="quantityUnqualify" /> <el-table-column label="不合格数量" width="100" align="center" prop="quantityUnqualify" />
<el-table-column label="报工人" width="100" align="center" prop="nickName" /> <el-table-column label="报工人" width="100" align="center" prop="nickName" />
<el-table-column label="产品物料编码" width="120" align="center" prop="sapItemCode" />
<el-table-column label="产品物料名称" min-width="250" show-overflow-tooltip align="center" prop="itemName" />
<el-table-column label="规格型号" width="100" align="center" prop="specification" />
<el-table-column label="指令号" width="120" align="center" prop="clientCmd" />
<el-table-column label="标准SIZE" width="120" align="center" prop="standardSize" />
<el-table-column label="报工时间" align="center" prop="feedbackTime" width="180"> <el-table-column label="报工时间" align="center" prop="feedbackTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.feedbackTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.feedbackTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
......
...@@ -249,19 +249,22 @@ ...@@ -249,19 +249,22 @@
label="作业单元名称" label="作业单元名称"
align="center" align="center"
prop="workunitName" prop="workunitName"
:show-overflow-tooltip="true"
width="200" width="200"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="scope.row.status === 'UN_ASSIGN'|| scope.row.status === 'PREPARE'" v-model="scope.row.workunitName"> <el-tooltip :content="scope.row.workunitName">
<el-button <el-input v-if="scope.row.status === 'UN_ASSIGN'|| scope.row.status === 'PREPARE'" v-model="scope.row.workunitName">
slot="append" <el-button
icon="el-icon-search" slot="append"
@click="currentData = scope.row, $refs['WorkunitSelect'].showFlag = true" icon="el-icon-search"
></el-button> @click="currentData = scope.row, $refs['WorkunitSelect'].showFlag = true"
</el-input> ></el-button>
<span v-else>{{ </el-input>
scope.row.workunitName <span v-else>{{
}}</span> scope.row.workunitName
}}</span>
</el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment