Skip to content

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

添加驳回记录

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