mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'projects/mesxc-test' into projects/mesxc-lb

Browse Source
This commit is contained in:
Melete 2024-03-04 14:04:37 +08:00
commit 0a1175075d
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/views/equipment/base/inspection/Confirm/add-or-updata.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: DY * @LastEditors: DY
* @LastEditTime: 2024-03-01 18:57:31 * @LastEditTime: 2024-03-04 11:14:28
* @Description: * @Description:
--> -->
<template> <template>
@ -431,16 +431,16 @@ export default {
} }
this.$nextTick(() => { this.$nextTick(() => {
this.getConfirmed().then(confirm => { this.getConfirmed().then(confirm => {
let checkPersonParam = ''; // let checkPersonParam = '';
if (!this.dataForm.checkPerson || this.dataForm.checkPerson.trim() == '') { // if (!this.dataForm.checkPerson || this.dataForm.checkPerson.trim() == '') {
/** 如有必要，更新巡检人 */ // /** 如有必要，更新巡检人 */
checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`; // checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
} else { // } else {
checkPersonParam = `&checkPerson=${this.dataForm.checkPerson}` // checkPersonParam = `&checkPerson=${this.dataForm.checkPerson}`
} // }
this.$axios({ this.$axios({
url: url:
`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam, `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
method: 'put', method: 'put',
data: [this.dataForm.id], data: [this.dataForm.id],
}).then(res =>{ }).then(res =>{

31
src/views/equipment/base/inspection/Confirm/index.vue
View File

@ -179,13 +179,14 @@ export default {
this.$modal this.$modal
.confirm('是否确认所有选中巡检单"?') .confirm('是否确认所有选中巡检单"?')
.then(() => { .then(() => {
let checkPersonParam = ''; // let checkPersonParam = '';
if (!row.checkPerson || row.checkPerson.trim() == '') { // if (!row.checkPerson || row.checkPerson.trim() == '') {
/** 如有必要，更新巡检人 */ // /** 如有必要，更新巡检人 */
checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`; // 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 = ''; // let checkPersonParam = '';
const nickname = this.$store.getters.nickname; // const nickname = this.$store.getters.nickname;
if (!row.checkPerson || row.checkPerson.trim() == '') { // if (!row.checkPerson || row.checkPerson.trim() == '') {
/** 如有必要，更新巡检人 */ // /** 如有必要，更新巡检人 */
checkPersonParam = `&checkPerson=${nickname}`; // checkPersonParam = `&checkPerson=${nickname}`;
} else { // } else {
checkPersonParam = `&checkPerson=${row.checkPerson}` // 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],
}); });