Skip to content

T
TF-MOM-WEB
Commit c8420f24 authored by 旭艳's avatar 旭艳
Browse files
Options

添加驳回记录

parent 3bee3490
Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 106 deletions
applications/dee-mes/src/views/taskExecution/components/chatBox/index.vue
View file @ c8420f24
<template> <template>
<dee-dialog <dee-dialog
v-if="visible" v-if="visible"
title="检验驳回" :title="title"
:dialog-visible.sync="visible" :dialog-visible.sync="visible"
custom-class="mobile-dialog" custom-class="mobile-dialog"
width="90%" width="90%"
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<ul v-for="item in list" :key="item.id" class="atalk"> <ul v-for="item in list" :key="item.id" class="atalk">
<li class="textLeft"> <li class="textLeft">
<img <img
src="/icons/photo.jpg" src="@/icons/photo.jpg"
alt="信息" alt="信息"
class="img" class="img"
> >
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</div> </div>
</div> </div>
<!-- 发送消息 --> <!-- 发送消息 -->
<div class="sendbox"> <div v-if="row === 1" class="sendbox">
<el-input <el-input
v-model.trim="wordone" v-model.trim="wordone"
class="inputword" class="inputword"
...@@ -118,7 +118,7 @@ export default { ...@@ -118,7 +118,7 @@ export default {
post(`/OBJRejectHistory/search`, params) post(`/OBJRejectHistory/search`, params)
.then((res) => { .then((res) => {
this.list = [] this.list = []
res.items.map((item) => { res.items.content.map((item) => {
if (!item.remake) return if (!item.remake) return
this.list.push({ this.list.push({
name: item.creator.userName, name: item.creator.userName,
...@@ -182,6 +182,11 @@ export default { ...@@ -182,6 +182,11 @@ export default {
this.wordone = '' this.wordone = ''
this.closeTimeNum = 3 this.closeTimeNum = 3
this.row = row this.row = row
if (this.row === 1) {
this.title = '检验驳回'
} else {
this.title = '驳回记录'
}
this.infoInit() this.infoInit()
}, },
// 关闭弹框 // 关闭弹框
...@@ -307,7 +312,7 @@ export default { ...@@ -307,7 +312,7 @@ export default {
} }
.btnsend { .btnsend {
border: 1px solid #409eff; border: 1px solid #409eff;
background: url("/icons/send.jpg") no-repeat left top; background: url("../../../../icons/send.jpg") no-repeat left top;
} }
} }
</style> </style>
applications/dee-mes/src/views/taskExecution/index.vue
View file @ c8420f24
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
:disabled="isOK" :disabled="isOK"
content="驳回记录" content="驳回记录"
class="gooey-menu-item" class="gooey-menu-item"
@click="!isOK && $refs.InspectionRejected.open()" @click="!isOK && $refs.InspectionRejected.open(2)"
> >
<el-badge :value="editor.countOBJReject" class="item"> <el-badge :value="editor.countOBJReject" class="item">
<i class="el-icon-chat-line-round" /> <i class="el-icon-chat-line-round" />
...@@ -383,7 +383,7 @@ ...@@ -383,7 +383,7 @@
:disabled="isOK || !editor.jurisdiction" :disabled="isOK || !editor.jurisdiction"
content="检验驳回" content="检验驳回"
@click=" @click="
!isOK && editor.jurisdiction && $refs.InspectionRejected.open() !isOK && editor.jurisdiction && $refs.InspectionRejected.open(1)
" "
> >
<el-badge :value="editor.countOBJReject" class="item"> <el-badge :value="editor.countOBJReject" class="item">
...@@ -749,9 +749,9 @@ export default { ...@@ -749,9 +749,9 @@ export default {
{ {
'items': [ 'items': [
{ {
'fieldName': 'extProcessOperation.targetExtProcessUsageLink.sourceId', 'fieldName': 'targetExtProcessUsageLink.sourceId',
'operator': 'EQ', 'operator': 'EQ',
'value': 209390392023000 'value': that.headerData.aoId
} }
], ],
'operator': 'AND' 'operator': 'AND'
...@@ -760,9 +760,6 @@ export default { ...@@ -760,9 +760,6 @@ export default {
'items': [], 'items': [],
'operator': 'AND' 'operator': 'AND'
}, },
'openProps': [
{
'name': 'extProcessOperation',
'openProps': [ 'openProps': [
{ {
'name': 'objFileLinks', 'name': 'objFileLinks',
...@@ -771,17 +768,20 @@ export default { ...@@ -771,17 +768,20 @@ export default {
'name': 'target' 'name': 'target'
} }
] ]
}
]
}, },
{
'name': 'joExecuteOpPlan',
'openProps': [
{ {
'name': 'jrExecuteOpPlans' 'name': 'jrExecuteOpPlans'
} }
]
}
], ],
'sortItem': [ 'sortItem': [
{ {
'fieldName': 'modifyTime', 'fieldName': 'code',
'sortOrder': 'desc' 'sortOrder': 'asc'
} }
], ],
'toValidateKeys': '' 'toValidateKeys': ''
...@@ -791,48 +791,47 @@ export default { ...@@ -791,48 +791,47 @@ export default {
if (res && res.items) { if (res && res.items) {
that.workingProcedure = (res.items || []).map((p) => { that.workingProcedure = (res.items || []).map((p) => {
return { return {
id: p.id, id: p.joExecuteOpPlan[0].id,
tableId: p.extProcessOperation.id, tableId: p.id,
serialNumber: p.extProcessOperation.code, serialNumber: p.code,
title: p.extProcessOperation.name, title: p.name,
html: p.longdescription, html: p.joExecuteOpPlan[0].longdescription,
keyOperation: p.extProcessOperation.keyOperation, keyOperation: p.keyOperation,
checkFlag: p.extProcessOperation.checkFlag === 'true', checkFlag: p.checkFlag === 'true',
airFlag: p.extProcessOperation.airFlag === 'AAD' || p.extProcessOperation.airFlag === '目击', airFlag: p.airFlag === 'AAD' || p.airFlag === '目击',
versionKey: p.extProcessOperation.gaceVersion, versionKey: p.gaceVersion,
statusCode: p.status, statusCode: p.joExecuteOpPlan[0].status,
isQualified: p.isQualified, isQualified: p.joExecuteOpPlan[0].isQualified,
countOBJReject: p.countOBJReject, countOBJReject: p.joExecuteOpPlan[0].countOBJReject,
countRecord: p.countRecord, countRecord: p.joExecuteOpPlan[0].countRecord,
countProblem: p.countProblem, countProblem: p.joExecuteOpPlan[0].countProblem,
countDebugging: p.countDebugging, countDebugging: p.joExecuteOpPlan[0].countDebugging,
countQuality: p.countQuality, countQuality: p.joExecuteOpPlan[0].countQuality,
revoke: p.revoke, revoke: p.joExecuteOpPlan[0].revoke,
// 工装 // 工装
isOKClothesLink: p.isOKClothesLink, isOKClothesLink: p.joExecuteOpPlan[0].isOKClothesLink,
isOKToolLink: p.isOKToolLink, isOKToolLink: p.joExecuteOpPlan[0].isOKToolLink,
deviceLink: p.deviceLink, deviceLink: p.joExecuteOpPlan[0].deviceLink,
operator: p.jrExecuteOpPlans.length && operator: p.joExecuteOpPlan.length &&
p.jrExecuteOpPlans[0].operatorUser p.joExecuteOpPlan[0].jrExecuteOpPlans.length && p.joExecuteOpPlan[0].jrExecuteOpPlans[0].operatorUser
? p.jrExecuteOpPlans[0].operatorUser.userName + ? p.joExecuteOpPlan[0].jrExecuteOpPlans[0].operatorUser.userName +
' ' + ' ' +
p.jrExecuteOpPlans[0].operatorTime p.joExecuteOpPlan[0].jrExecuteOpPlans[0].operatorTime
: '', : '',
testor: testor:
p.jrExecuteOpPlans.length && p.joExecuteOpPlan.length &&
p.jrExecuteOpPlans[0].testor && p.joExecuteOpPlan[0].jrExecuteOpPlans.length && p.joExecuteOpPlan[0].jrExecuteOpPlans[0].testor ? p.joExecuteOpPlan[0].jrExecuteOpPlans[0].testor.userName +
p.jrExecuteOpPlans[0].testor.userName +
' ' + ' ' +
p.jrExecuteOpPlans[0].testorTime, p.joExecuteOpPlan[0].jrExecuteOpPlans[0].testorTime : '',
dmir: { dmir: {
dmriImg: dmriImg:
p.jrExecuteOpPlans.length && p.joExecuteOpPlan.length && p.joExecuteOpPlan[0].jrExecuteOpPlans.length &&
p.jrExecuteOpPlans[0].dmriImg, p.joExecuteOpPlan[0].jrExecuteOpPlans[0].dmriImg,
dmirTime: dmirTime:
p.jrExecuteOpPlans.length && p.joExecuteOpPlan.length && p.joExecuteOpPlan[0].jrExecuteOpPlans.length &&
p.jrExecuteOpPlans[0].dmirTime p.joExecuteOpPlan[0].jrExecuteOpPlans[0].dmirTime
}, },
fileList: p.extProcessOperation.objFileLinks ? p.extProcessOperation.objFileLinks : [] fileList: p.objFileLinks ? p.objFileLinks : []
} }
}) })
var status = that.workingProcedure.every( var status = that.workingProcedure.every(
...@@ -857,59 +856,6 @@ export default { ...@@ -857,59 +856,6 @@ export default {
that.workingProcedureLoading = false that.workingProcedureLoading = false
}) })
}, },
/**
* 获取附件文件数据
*/
getEnclosureFeil() {
// 发送请求
// const param = {
// indices: ['DxProcessOperation'],
// pageFrom: 1,
// pageSize: 9999,
// openProps: [
// {
// name: 'objFileLinks',
// openProps: [
// {
// name: 'target'
// }
// ]
// }
// ],
// searchItems: {
// items: [
// {
// fieldName: 'id',
// operator: 'EQ',
// value: this.editor.tableId
// }
// ],
// operator: 'AND'
// },
// sortItem: [
// {
// fieldName: 'modifyTime',
// sortOrder: 'desc'
// }
// ]
// }
// assemblyExecutionUpload(param)
// .then((res) => {
// if (res.items.content.length && res.items.content[0].objFileLinks) {
// this.enclosureData = res.items.content[0].objFileLinks.map((p) => {
// return {
// originalFileName: p.target.originalFileName,
// fileSize: p.target.fileSize,
// fileExtension: p.target.fileExtension
// }
// })
// } else {
// this.enclosureData = []
// }
// })
// .catch((err) => console.error(err))
// .finally(() => {})
},
selectOptions(id) { selectOptions(id) {
var that = this var that = this
this.procedureId = id this.procedureId = id
...@@ -944,7 +890,6 @@ export default { ...@@ -944,7 +890,6 @@ export default {
isQualified: row.isQualified, isQualified: row.isQualified,
fileList: row.fileList fileList: row.fileList
} }
this.getEnclosureFeil()
this.$nextTick(() => { this.$nextTick(() => {
that.editShow = false that.editShow = false
var inputValue = null var inputValue = null
......
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