Commit 80143fbf authored by “lixuyan”'s avatar “lixuyan”

装配任务执行页面加检验员

parent a090df02
...@@ -50,18 +50,18 @@ ...@@ -50,18 +50,18 @@
:lg="6" :lg="6"
:sm="12" :sm="12"
><label class="label">计划完工时间:</label>{{ headerData.scheduledEnd }}</el-col> ><label class="label">计划完工时间:</label>{{ headerData.scheduledEnd }}</el-col>
<el-col <!-- <el-col
:md="12" :md="12"
:lg="6" :lg="6"
:sm="12" :sm="12"
><label v-show="false" class="label">{{ ><label v-show="false" class="label">{{
headerData.isQualified ? "不合格品" : "" headerData.isQualified ? "不合格品" : ""
}}</label></el-col> }}</label></el-col> -->
<!-- <el-col <el-col
:md="12" :md="12"
:lg="6" :lg="6"
:sm="12" :sm="12"
><label class="label">检验员:</label>{{ headerData.scheduledEnd }}</el-col> --> ><label class="label">检验员:</label><span :title="headerData.inspectPerson" style="cursor:pointer">{{ headerData.inspectPerson }}</span></el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :lg="3" :md="6" :sm="6" :xs="12"> <el-col :lg="3" :md="6" :sm="6" :xs="12">
...@@ -711,6 +711,14 @@ export default { ...@@ -711,6 +711,14 @@ export default {
'openProps': [ 'openProps': [
{ {
'name': 'extProcessPlan' 'name': 'extProcessPlan'
},
{
'name': 'prodTask',
'openProps': [
{
'name': 'extProcessSkillUser'
}
]
} }
], ],
'sortItem': [ 'sortItem': [
...@@ -726,6 +734,15 @@ export default { ...@@ -726,6 +734,15 @@ export default {
.then((res) => { .then((res) => {
if (res && res.items.content.length) { if (res && res.items.content.length) {
var data = res.items.content[0] var data = res.items.content[0]
const inspectPerson = []
data.prodTask.forEach(element => {
if (element.subTypeName === 'CheckOut') {
if (element.extProcessSkillUser) {
inspectPerson.push(element.extProcessSkillUser.dxUserInfo.name)
}
}
})
console.log(3434, inspectPerson)
that.headerData = { that.headerData = {
id: data.id, id: data.id,
serialNumber: data.extProcessPlan.serialNumber, serialNumber: data.extProcessPlan.serialNumber,
...@@ -742,7 +759,8 @@ export default { ...@@ -742,7 +759,8 @@ export default {
workDescription: data.extProcessPlan.workDescription, workDescription: data.extProcessPlan.workDescription,
versionChangeDesc: data.workDescription, versionChangeDesc: data.workDescription,
prepareDescription: data.extProcessPlan.prepareDescription, prepareDescription: data.extProcessPlan.prepareDescription,
noteName: data.extProcessPlan.noteName noteName: data.extProcessPlan.noteName,
inspectPerson: inspectPerson.join(' ')
// 不合格 // 不合格
} }
that.getWorkingProcedure() that.getWorkingProcedure()
......
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