1

src/views/modules/automatedWarehouse/palletMergeQuery.vue

@@ -292,9 +292,13 @@ export default {
       }
 
       this.submitLoading = true
-      
+      this.$confirm(`确定进行[合托]操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         // 调用后端提交合托方法（预留）- rqrq
-      submitPalletMerge(this.selectedRows).then(({ data }) => {
+        submitPalletMerge(this.selectedRows).then(({data}) => {
           if (data && data.code === 0) {
             this.$message({
               message: '提交成功',
@@ -304,13 +308,16 @@ export default {
             // 刷新列表 - rqrq
             this.searchTable()
           } else {
-          this.$alert(data.msg || '提交失败', '错误', { confirmButtonText: '确定' })
+            this.$alert(data.msg || '提交失败', '错误', {confirmButtonText: '确定'})
           }
         }).catch(() => {
           this.$message.error('提交失败')
         }).finally(() => {
           this.submitLoading = false
         })
+      }).catch(() => {
+        this.submitLoading = false
+      })
     }
   }
 }