#229 projects/mesxc-dy

Scalone
juzi scala 3 commity/ów z projects/mesxc-dy do projects/mesxc-test 6 miesięcy temu
  1. +9
    -9
      src/views/equipment/base/inspection/Confirm/add-or-updata.vue
  2. +16
    -15
      src/views/equipment/base/inspection/Confirm/index.vue

+ 9
- 9
src/views/equipment/base/inspection/Confirm/add-or-updata.vue Wyświetl plik

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


+ 16
- 15
src/views/equipment/base/inspection/Confirm/index.vue Wyświetl plik

@@ -179,13 +179,14 @@ export default {
this.$modal
.confirm('是否确认所有选中巡检单"?')
.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({
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',
data: this.$refs['waiting-list-table'].selectedPlan.map(
(item) => item.id
@@ -399,17 +400,17 @@ export default {
this.$modal
.confirm('是否确认巡检单"' + row.name + '"?')
.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({
url:
`/base/equipment-check-order/confirm?confirmPerson=${nickname}` + checkPersonParam,
`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
method: 'put',
data: [row.id],
});


Ładowanie…
Anuluj
Zapisz