Merge branch 'hurx'

src/views/order/orderAssignment/index.vue

@@ -90,7 +90,7 @@
           <template #default="scope">
             <el-button link type="primary" @click="handleReview(scope.row)">详情</el-button>
             <el-button link type="primary" v-if="scope.row.assignmentStatus != '1'" @click="handleAssignment(scope.row)">分配</el-button>
-            <!-- <el-button link type="primary" v-if="scope.row.assignmentStatus == '1'" @click="handleAssignment(scope.row)">重新分配</el-button> -->
+            <el-button link type="primary" v-if="scope.row.assignmentStatus == '1'" @click="handleAssignment(scope.row)">分配记录</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -282,7 +282,7 @@ const handleAssignment = async (row?: OrderMainVO | null) => {
 
   if (row) {
     // 单个订单分配 - 直接打开统一的分配抽屉
-    splitAssignDialogRef.value?.open(row.id);
+    splitAssignDialogRef.value?.open(row.id, row.assignmentStatus);
   } else {
     // 批量分配 - 只支持整单分配
     if (!ids.value || ids.value.length === 0) {

src/views/order/orderAssignment/splitAssignDialog.vue

@@ -45,7 +45,7 @@
       </div>
 
       <el-tabs v-model="activeTab" class="detail-tabs">
-        <el-tab-pane label="待分配" name="pending">
+        <el-tab-pane label="待分配" name="pending" v-if="assignmentStatus != '1'">
           <div class="tab-actions">
             <el-button type="primary" @click="handleBatchAssign">+ 批量分配</el-button>
           </div>
@@ -282,12 +282,16 @@ const assignedProducts = ref<any[]>([]);
 
 // 分配记录
 const assignRecords = ref<any[]>([]);
+const assignmentStatus = ref('0');
 
 /** 打开订单分配详情抽屉 */
-const open = async (orderId: string | number) => {
+const open = async (orderId: string | number, status: string) => {
   reset();
   drawer.visible = true;
-
+  assignmentStatus.value = status;
+  if (status == '1') {
+    activeTab.value = 'assigned';
+  }
   try {
     // 获取订单详情
     const res = await getOrderMain(orderId);
@@ -494,7 +498,7 @@ const submitAssign = async () => {
     selectedAssignProducts.value = [];
 
     // 刷新抽屉数据
-    await open(orderInfo.value.id);
+    await open(orderInfo.value.id, '0');
     emit('success');
   } catch (error) {
     console.error('分配失败:', error);