mt-fe-group/yudao-dev
12
0
派生 0
代码 工单 合并请求 版本发布 百科 动态

Merge pull request 'projects/mesxc-dy' (#229) from projects/mesxc-dy into projects/mesxc-test

浏览代码 
Reviewed-on: #229
这个提交包含在：
朱菊兰 2024-03-04 12:24:25 +08:00
当前提交 ac36dea881
共有 2 个文件被更改，包括 25 次插入 和 24 次删除
显示统计 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

18
src/views/equipment/base/inspection/Confirm/add-or-updata.vue
查看文件

@ -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 =>{

31
src/views/equipment/base/inspection/Confirm/index.vue
查看文件

@ -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],
});