|
@@ -179,13 +179,14 @@ export default { |
|
|
this.$modal |
|
|
this.$modal |
|
|
.confirm('是否确认所有选中巡检单"?') |
|
|
.confirm('是否确认所有选中巡检单"?') |
|
|
.then(() => { |
|
|
.then(() => { |
|
|
let checkPersonParam = ''; |
|
|
|
|
|
if (!row.checkPerson || row.checkPerson.trim() == '') { |
|
|
|
|
|
/** 如有必要,更新巡检人 */ |
|
|
|
|
|
checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// let checkPersonParam = ''; |
|
|
|
|
|
// if (!row.checkPerson || row.checkPerson.trim() == '') { |
|
|
|
|
|
// /** 如有必要,更新巡检人 */ |
|
|
|
|
|
// checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`; |
|
|
|
|
|
// } |
|
|
return this.$axios({ |
|
|
return this.$axios({ |
|
|
url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam, |
|
|
|
|
|
|
|
|
// url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam, |
|
|
|
|
|
url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`, |
|
|
method: 'put', |
|
|
method: 'put', |
|
|
data: this.$refs['waiting-list-table'].selectedPlan.map( |
|
|
data: this.$refs['waiting-list-table'].selectedPlan.map( |
|
|
(item) => item.id |
|
|
(item) => item.id |
|
@@ -399,17 +400,17 @@ export default { |
|
|
this.$modal |
|
|
this.$modal |
|
|
.confirm('是否确认巡检单"' + row.name + '"?') |
|
|
.confirm('是否确认巡检单"' + row.name + '"?') |
|
|
.then(() => { |
|
|
.then(() => { |
|
|
let checkPersonParam = ''; |
|
|
|
|
|
const nickname = this.$store.getters.nickname; |
|
|
|
|
|
if (!row.checkPerson || row.checkPerson.trim() == '') { |
|
|
|
|
|
/** 如有必要,更新巡检人 */ |
|
|
|
|
|
checkPersonParam = `&checkPerson=${nickname}`; |
|
|
|
|
|
} else { |
|
|
|
|
|
checkPersonParam = `&checkPerson=${row.checkPerson}` |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// let checkPersonParam = ''; |
|
|
|
|
|
// const nickname = this.$store.getters.nickname; |
|
|
|
|
|
// if (!row.checkPerson || row.checkPerson.trim() == '') { |
|
|
|
|
|
// /** 如有必要,更新巡检人 */ |
|
|
|
|
|
// checkPersonParam = `&checkPerson=${nickname}`; |
|
|
|
|
|
// } else { |
|
|
|
|
|
// checkPersonParam = `&checkPerson=${row.checkPerson}` |
|
|
|
|
|
// } |
|
|
return this.$axios({ |
|
|
return this.$axios({ |
|
|
url: |
|
|
url: |
|
|
`/base/equipment-check-order/confirm?confirmPerson=${nickname}` + checkPersonParam, |
|
|
|
|
|
|
|
|
`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`, |
|
|
method: 'put', |
|
|
method: 'put', |
|
|
data: [row.id], |
|
|
data: [row.id], |
|
|
}); |
|
|
}); |
|
|