#

1

昨天 d953e40c7badd8be505d133ae1bb410e4024229f

 src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html

@@ -871,7 +871,7 @@
                     beforeClose: (action, instance, done) => {
                        if (action === 'confirm') {
                           instance.confirmButtonLoading = true;
                           this.confirmReport(orderNo, done);
                           this.confirmReport(orderNo, instance, done);
                        } else {
                           done();
                        }
@@ -888,13 +888,21 @@
         },

         // 确认上报
         confirmReport(orderNo, done) {
         confirmReport(orderNo, instance, done) {
            this.reportLoading = true;
            const finish = () => {
               this.reportLoading = false;
               if (instance) {
                  instance.confirmButtonLoading = false;
               }
               if (typeof done === 'function') {
                  done();
               }
            };

            const rowsToIssue = (this.tableDataB || []).filter(item => parseInt(item.inspect) === 1);
            if (rowsToIssue.length === 0) {
               this.reportLoading = false;
               if (typeof done === 'function') done();
               finish();
               this.$message.error('没有待下发项');
               return;
            }
@@ -926,8 +934,7 @@
            Promise.all(updates).then(results => {
               const failed = results.find(r => !r.ok);
               if (failed) {
                  this.reportLoading = false;
                  if (typeof done === 'function') done();
                  finish();
                  this.$message.error(failed.msg || '同步beBatch失败');
                  return;
               }
@@ -938,8 +945,7 @@
                  data: { orderNo: orderNo },
                  method: 'POST',
                  success: (res) => {
                     this.reportLoading = false;
                     if (typeof done === 'function') done();
                     finish();
                     if (res.code === 200 || res.success) {
                        this.$message({
                           message: `订单号 ${orderNo} 下发成功`,
@@ -956,8 +962,7 @@
                     }
                  },
                  error: (error) => {
                     this.reportLoading = false;
                     if (typeof done === 'function') done();
                     finish();
                     console.error('下发失败:', error);
                     this.$message.error('下发失败，请检查网络连接');
                  }