diff --git a/admin/src/views/pm/maintenance/order/index.vue b/admin/src/views/pm/maintenance/order/index.vue
index c7e75ce..8723038 100644
--- a/admin/src/views/pm/maintenance/order/index.vue
+++ b/admin/src/views/pm/maintenance/order/index.vue
@@ -148,8 +148,8 @@
label="操作">
{{ '修改' }}
- {{ '办结' }}
- {{ '撤销' }}
+ {{ '办结' }}
+ {{ '重新处理' }}
删除
@@ -378,7 +378,7 @@ import DictTag from '@/components/DictTag'
},
// 撤销办结订单
revokeOrder (id) {
- this.$confirm('确定要撤销该订单吗?', '提示', {
+ this.$confirm('确定要重新处理报修单吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@@ -389,13 +389,12 @@ import DictTag from '@/components/DictTag'
status: '0', // 0是待处理状态
remark: ''
}).then(res => {
- this.$message.success('撤销成功')
+ this.$message.success('操作成功')
this.getDataList()
}).catch(() => {
- this.$message.error('撤销失败')
+ this.$message.error('操作失败')
})
}).catch(() => {
- this.$message.info('已取消撤销')
})
},
}
diff --git a/app/pages/supply_chain/repair/components/DispatchRecord.vue b/app/pages/supply_chain/repair/components/DispatchRecord.vue
index 47d635a..5cdba9c 100644
--- a/app/pages/supply_chain/repair/components/DispatchRecord.vue
+++ b/app/pages/supply_chain/repair/components/DispatchRecord.vue
@@ -49,7 +49,7 @@
业主确认
- {{ item.ownerConfirm === '1' ? '是' : '否' }}
+ {{ item.ownerConfirm || '否' }}