*

lsh

8 小时以前 e1b47924a7f000f043d40fc9359491b6fa5d7873

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

@@ -218,15 +218,21 @@
            <el-table-column prop="danger" label="待判" min-width="100" align="center"></el-table-column>
            <el-table-column prop="memo" label="备注" min-width="100" align="center"></el-table-column>
            <el-table-column prop="status" label="状态" min-width="100" align="center" :formatter="formatStatusB"></el-table-column>
            <!-- 新增操作列 -->
            <el-table-column label="操作" width="120" align="center" fixed="right">
            <!-- 新增操作列，根据status值控制显示 -->
            <el-table-column label="是否上报" width="120" align="center" fixed="right">
               <template slot-scope="scope">
                  <div class="operation-cell">
                     <el-button
                           type="primary"
                           size="mini"
                           @click="handleModify(scope.row)">
                        添加至上报项
                     <el-button v-if="scope.row.status === 2"
                              type="primary"
                              size="mini"
                              @click="handleModifyN(scope.row)">
                        否
                     </el-button>
                     <el-button v-if="scope.row.status === 1"
                              type="primary"
                              size="mini"
                              @click="handleModifyY(scope.row)">
                        是
                     </el-button>
                  </div>
               </template>
@@ -408,8 +414,8 @@
            });
         },

         // 新增：处理修改按钮点击事件
         handleModify(row) {
         // 处理修改按钮点击事件
         handleModifyY(row) {
            if (!this.currentRow) {
               this.$message.error('没有选择主表数据');
               return;
@@ -417,6 +423,7 @@

            const groupOrderNo = this.currentRow.itemName; // 组货单号
            const batch = row.batch; // 箱号
            const status = 2; // 箱号

            this.$confirm(
                  `确定将组货单号： <strong style="color: #409EFF;">${groupOrderNo}</strong> 、箱号： <strong style="color: #409EFF;">${batch}</strong> 添加到上报列吗？`,
@@ -428,7 +435,7 @@
                     dangerouslyUseHTMLString: true
                  }
            ).then(() => {
               this.submitModify(groupOrderNo, batch);
               this.submitModify(groupOrderNo, batch, status);
            }).catch(() => {
               this.$message({
                  type: 'info',
@@ -437,8 +444,38 @@
            });
         },

         // 新增：提交修改到后台
         submitModify(groupOrderNo, batch) {
         // 处理修改按钮点击事件
         handleModifyN(row) {
            if (!this.currentRow) {
               this.$message.error('没有选择主表数据');
               return;
            }

            const groupOrderNo = this.currentRow.itemName; // 组货单号
            const batch = row.batch; // 箱号
            const status = 1; // 箱号

            this.$confirm(
                  `确定将组货单号： <strong style="color: #409EFF;">${groupOrderNo}</strong> 、箱号： <strong style="color: #409EFF;">${batch}</strong> 添加到上报列吗？`,
                  '确认修改',
                  {
                     confirmButtonText: '确认修改',
                     cancelButtonText: '取消',
                     type: 'warning',
                     dangerouslyUseHTMLString: true
                  }
            ).then(() => {
               this.submitModify(groupOrderNo, batch, status);
            }).catch(() => {
               this.$message({
                  type: 'info',
                  message: '已取消修改'
               });
            });
         },

         // 提交修改到后台
         submitModify(groupOrderNo, batch, status) {
            // 显示加载状态
            const loadingInstance = this.$loading({
               lock: true,
@@ -449,17 +486,14 @@

            // 调用后台API提交修改
            $.ajax({
               url: baseUrl + "/api/modify/detail", // 请根据实际API地址修改
               headers: {
                  'token': localStorage.getItem('token'),
                  'Content-Type': 'application/json'
               },
               data: JSON.stringify({
               url: baseUrl + "/order/pakout/orderDetl/batch/report/auth",
               headers: {'token': localStorage.getItem('token')},
               data: top.reObject({
                  item_name: groupOrderNo, // 组货单号
                  batch: batch // 箱号
                  batch: batch, // 箱号
                  status: status // 箱号
               }),
               dataType: 'json',
               method: 'post',
               method: 'POST',
               success: (res) => {
                  loadingInstance.close();

@@ -681,7 +715,7 @@
            if (row.status === 0) {
               return '异常';
            } else if (row.status === 1) {
               return '正常';
               return '不上报';
            } else if (row.status === 2) {
               return '待上报';
            } else if (row.status === 3) {
@@ -710,25 +744,16 @@
         mockTableAData() {
            this.tableDataA = [
               {
                  itemName: 'ZH1001',
                  itemName: 'zh20251110',
                  orderNo: 'ORDER2024001',
                  cstmrName: '示例客户A',
                  settle: 1,
                  cstmrName: 'zh20251110',
                  settle: 10,
                  totalFee: 1500.00,
                  createTime: '2024-01-15 10:30:00',
                  memo: '测试数据'
               },
               {
                  itemName: 'ZH1002',
                  orderNo: 'ORDER2024002',
                  cstmrName: '示例客户B',
                  settle: 1,
                  totalFee: 2300.50,
                  createTime: '2024-01-16 14:20:00',
                  createTime: '2025-11-10T09:50:16.343+0000',
                  memo: '测试数据'
               }
            ];
            this.total = 2;
            this.total = 1;
            this.loading = false;
         },

@@ -742,7 +767,7 @@
                  origin: '1',
                  danger: '1',
                  memo: '',
                  status: 1
                  status: 1 // 状态为1，会显示修改按钮
               }
            ];
            this.detailTotal = 1;