1

src/views/modules/automatedWarehouse/palletMergeQuery.vue

@@ -292,7 +292,11 @@ export default {
       }
 
       this.submitLoading = true
-      
+      this.$confirm(`确定进行[合托]操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         // 调用后端提交合托方法（预留）- rqrq
         submitPalletMerge(this.selectedRows).then(({data}) => {
           if (data && data.code === 0) {
@@ -311,6 +315,9 @@ export default {
         }).finally(() => {
           this.submitLoading = false
         })
+      }).catch(() => {
+        this.submitLoading = false
+      })
     }
   }
 }