Commit f2c3820c authored by 旭艳's avatar 旭艳

修改适航任务的检验完成

parent d395ed44
......@@ -845,9 +845,19 @@ export default {
if (this.headerData.planStateCode === 'Delivery' || status) {
this.headerData.disabled = false
}
var curRow = that.workingProcedure.find(
(p) => p.statusCode === 'Not'
)
let curRow
if (this.$route.query.title === '适航任务执行') {
curRow = that.workingProcedure.find(
(p) => p.statusCode === 'UnderTest'
)
} else {
curRow = that.workingProcedure.find(
(p) => p.statusCode === 'Not'
)
}
// var curRow = that.workingProcedure.find(
// (p) => p.statusCode === 'Not'
// )
if (curRow) {
that.selectOptions(curRow.id)
} else {
......@@ -867,7 +877,13 @@ export default {
var row = this.workingProcedure.filter(
(p) => p.id === this.procedureId
)[0]
var jurisdiction = row.statusCode === 'Yes'
let jurisdiction
if (this.$route.query.title === '适航任务执行') {
jurisdiction = row.statusCode === 'UnderTest'
} else {
jurisdiction = row.statusCode === 'Yes'
}
// var jurisdiction = row.statusCode === 'Yes'
this.editor = {
id: row.id,
title: row.title,
......@@ -1144,6 +1160,7 @@ export default {
.jqSignature('getDataURL')
var img = $('<img>').attr('src', dataUrl)
$('.js-signature').append(img)
this.inspectionCompleted(dataUrl)
},
/** *
* 试验申请
......@@ -1225,7 +1242,11 @@ export default {
type: 'warning'
})
.then(() => {
that.inspectionCompleted()
if (this.$route.query.title === '适航任务执行') {
that.electronicSignatureVersion()
} else {
that.inspectionCompleted()
}
})
.catch(() => {
this.$message({
......@@ -1237,10 +1258,16 @@ export default {
/**
*检验完成
*/
inspectionCompleted() {
inspectionCompleted(dataUrl) {
var that = this
let url
if (this.$route.query.title === '适航任务执行') {
url = `/JoExecuteOpPlan/completeOp?joOpId=${that.procedureId}&joAoId=${that.headerData.id}&dmriImg=${dataUrl}`
} else {
url = `/JoExecuteOpPlan/completeOp?joOpId=${that.procedureId}&joAoId=${that.headerData.id}`
}
get(
`/JoExecuteOpPlan/completeOp?joOpId=${that.procedureId}&joAoId=${that.headerData.id}`,
url,
{}
)
.then((res) => {
......
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