Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/views/wms/receive/detail/index.vue

@@ -86,9 +86,11 @@
             <el-table-column label="操作">
               <template slot-scope="scope">
                 <el-button v-if="scope.row.actionStatus == 0 || scope.row.actionStatus == 1" type="primary"
-                  @click="openReceiptModal(scope.row)">签收</el-button>
-                  <el-button v-if="scope.row.actionStatus == 0 || scope.row.actionStatus == 1" type="danger"
-                  @click="handleReject(scope.row)">拒签</el-button>
+                  @click="openReceiptModal(scope.row)" v-loading="buttonLoading">签收</el-button>
+                <el-button v-if="scope.row.actionStatus == 0 || scope.row.actionStatus == 1" type="danger"
+                  @click="handleReject(scope.row)" v-loading="buttonLoading">拒签</el-button>
+                <el-button v-if="scope.row.actionStatus == 3" type="warning" v-loading="buttonLoading"
+                  @click="handleDelete(scope.row)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -269,12 +271,15 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
+        this.buttonLoading = true;
         updatePendingAction({
           ...row,
           actionStatus: 3, // 3表示拒签
         }).then(response => {
           this.$modal.msgSuccess("拒签成功");
           this.getList();
+        }).finally(() => {
+          this.buttonLoading = false;
         });
       });
     },
@@ -340,9 +345,12 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
+        this.buttonLoading = true;
         delPendingAction(row.actionId).then(response => {
           this.$modal.msgSuccess("删除成功");
           this.getList();
+        }).finally(() => {
+          this.buttonLoading = false;
         });
       });
     },

klp-ui/src/views/wms/receive/report/index.vue

@@ -20,7 +20,7 @@
     <el-card class="summary-card" v-if="summary">
       <template #header>
         <div class="card-header">
-          <span>发货报表汇总</span>
+          <span>收货报表汇总</span>
         </div>
       </template>
       <el-descriptions :column="2" border>
@@ -39,7 +39,7 @@
     <el-card class="table-card" v-if="details && details.length > 0">
       <template #header>
         <div class="card-header">
-          <span>产品发货计划</span>
+          <span>产品收货计划</span>
           <span>共 {{ details.length }} 个计划</span>
         </div>
       </template>
@@ -158,7 +158,7 @@ export default {
         this.summary = res.data?.summary || null
         this.details = res.data?.details || []
       } catch (error) {
-        console.error('获取发货报表失败:', error)
+        console.error('获取收货报表失败:', error)
         this.$message.error('获取数据失败')
         this.summary = null
         this.details = []