x

frontend/src/modules/inventory/components/SalesOrdersTab.vue

@@ -10,6 +10,8 @@ const {
   formatDateTime,
   formatDate,
   getSalesOrderStatusLabel,
+  getDeliveryStatusLabel,
+  getPaymentStatusLabel,
   loadProductionOrders,
   loadFinishedProducts,
   loadCustomers,
@@ -309,30 +311,36 @@ onMounted(() => {
       <el-table-column label="实际收款">
         <template #default="{ row }">{{ row.paid_at ? formatDateTime(row.paid_at) : '-' }}</template>
       </el-table-column>
-      <el-table-column label="订单状态">
+      <el-table-column label="订单状态" width="160">
         <template #default="{ row }">
-          <el-tag :type="row.status === 'paid' ? 'success' : row.status === 'delivered' ? 'warning' : 'info'">
-            {{ getSalesOrderStatusLabel(row.status) }}
-          </el-tag>
+          <div style="display: flex; gap: 4px;">
+            <el-tag
+              :type="row.delivery_status === 'delivered' ? 'warning' : row.delivery_status === 'cancelled' ? 'danger' : 'info'"
+              size="small"
+            >{{ getDeliveryStatusLabel(row.delivery_status) }}</el-tag>
+            <el-tag
+              :type="row.payment_status === 'paid' ? 'success' : 'info'"
+              size="small"
+            >{{ getPaymentStatusLabel(row.payment_status) }}</el-tag>
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="操作" width="240">
         <template #default="{ row }">
-          <el-dropdown style="margin-right: 8px;">
-            <el-button size="small">
-              状态 ▾
-            </el-button>
+          <el-dropdown style="margin-right: 8px;" v-if="row.delivery_status !== 'cancelled' && row.payment_status !== 'paid'">
+            <el-button size="small">状态 ▾</el-button>
             <template #dropdown>
               <el-dropdown-menu>
-                <el-dropdown-item @click="updateStatus(row.id, 'delivered')">已交付</el-dropdown-item>
-                <el-dropdown-item @click="updateStatus(row.id, 'paid')">已收款</el-dropdown-item>
+                <el-dropdown-item v-if="row.delivery_status === 'manufacturing'" @click="updateStatus(row.id, 'delivered')">已交付</el-dropdown-item>
+                <el-dropdown-item v-if="row.delivery_status === 'delivered' && row.payment_status !== 'paid'" @click="updateStatus(row.id, 'paid')">已收款</el-dropdown-item>
+                <el-dropdown-item v-if="row.payment_status !== 'paid'" @click="updateStatus(row.id, 'cancelled')" style="color: #f56c6c;">作废</el-dropdown-item>
               </el-dropdown-menu>
             </template>
           </el-dropdown>
           <el-button
             type="primary"
             size="small"
-            :disabled="row.status === 'paid'"
+            :disabled="row.payment_status === 'paid' || row.delivery_status === 'cancelled'"
             @click="editOrder(row)"
           >
             编辑