Compare commits

...

3 Commits

Author SHA1 Message Date
helloDy
f8d033c97a Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-02-28 16:15:16 +08:00
helloDy
ecb447c052 巡检 2024-02-28 16:14:41 +08:00
dd6f07a9b0 Merge pull request 'projects/mesxc-dy' (#216) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #216
2024-02-28 15:09:46 +08:00
2 changed files with 25 additions and 18 deletions

View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
* @LastEditTime: 2024-02-28 14:45:58
* @LastEditTime: 2024-02-28 16:05:10
* @Description:
-->
<template>
@ -409,25 +409,32 @@ export default {
});
},
async confirmIns() {
await this.getConfirmed().then(confirm => {
this.$axios({
url:
'/base/equipment-check-order/confirm?confirmPerson=' +
this.$store.getters.userId,
method: 'put',
data: [this.dataForm.id],
}).then(res =>{
if (res.code == 0) {
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return;
}
this.$nextTick(() => {
this.getConfirmed().then(confirm => {
this.$axios({
url:
'/base/equipment-check-order/confirm?confirmPerson=' +
this.$store.getters.userId,
method: 'put',
data: [this.dataForm.id],
}).then(res =>{
if (res.code == 0) {
this.visible = false;
this.$emit("refreshDataList");
this.$message.success('已确认');
}
})
}).catch(() => {
this.visible = false;
this.$emit("refreshDataList");
this.$message.success('已确认');
}
}).catch(() => {
this.visible = false;
this.$emit("refreshDataList");
this.$message.success('取消确认');
this.$message.success('取消确认');
})
})
})
});
},
//
dataFormSubmit() {

View File

@ -177,7 +177,7 @@ export default {
return;
}
this.$modal
.confirm('是否确认所有选中保养单"?')
.confirm('是否确认所有选中巡检单"?')
.then(() => {
return this.$axios({
url: '/base/equipment-check-order/confirm?confirmPerson=' + this.$store.getters.userId,