整改完成

src/api/erp/order/index.ts

@@ -52,3 +52,14 @@ export function countOrder(): AxiosPromise<Record<string, number>> {
     method: 'get'
   });
 }
+
+/**
+ * 加急订单
+ * @Author: Trae
+ */
+export function markUrgentOrder(rowId: string) {
+  return request({
+    url: '/erp/order/urgent/' + rowId,
+    method: 'post'
+  });
+}

src/api/erp/order/types.ts

@@ -16,6 +16,7 @@ export interface ErpOrderVo {
   placer: number;
   placeTime: string;
   isConfirmed: number;
+  urgentFlag?: number;
   docCode?: string;
   createTime: string;
   totalCount: number;

src/views/goodsStock/index.vue

@@ -4,84 +4,24 @@
     @Author: Antigravity
   -->
   <div class="app-container goods-stock-container">
-    <!-- 头部高格调数据看板区 -->
-    <el-row :gutter="20" class="mb20 summary-row">
-      <el-col :span="6">
-        <div class="summary-card total-stock">
-          <div class="card-icon"><el-icon><Box /></el-icon></div>
-          <div class="card-info">
-            <span class="label">当前总库存支数</span>
-            <h2 class="value">{{ summaryData.totalQty.toLocaleString() }} <small>支</small></h2>
-          </div>
-        </div>
-      </el-col>
-      <el-col :span="6">
-        <div class="summary-card total-weight">
-          <div class="card-icon"><el-icon><ScaleToOriginal /></el-icon></div>
-          <div class="card-info">
-            <span class="label">库存总重量</span>
-            <h2 class="value">{{ summaryData.totalWt.toFixed(2) }} <small>kg</small></h2>
-          </div>
-        </div>
-      </el-col>
-      <el-col :span="6">
-        <div class="summary-card aging-stock">
-          <div class="card-icon"><el-icon><Timer /></el-icon></div>
-          <div class="card-info">
-            <span class="label">超 30 天超龄库存</span>
-            <h2 class="value warning-text">{{ summaryData.agingCount }} <small>款</small></h2>
-          </div>
-        </div>
-      </el-col>
-      <el-col :span="6">
-        <div class="summary-card warehouse-stock">
-          <div class="card-icon"><el-icon><HomeFilled /></el-icon></div>
-          <div class="card-info">
-            <span class="label">关联单据数</span>
-            <h2 class="value info-text">{{ summaryData.docCount }} <small>个</small></h2>
-          </div>
-        </div>
-      </el-col>
-    </el-row>
-
     <!-- 过滤搜索控制栏 -->
     <el-card class="search-card mb20 shadow-sm" border="false">
       <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="80px">
         <el-form-item label="型材型号" prop="modelNum">
-          <el-input
-            v-model="queryParams.modelNum"
-            placeholder="请输入型材型号"
-            clearable
-            style="width: 200px"
-            @keyup.enter="handleQuery"
-          />
+          <el-input v-model="queryParams.modelNum" placeholder="请输入型材型号" clearable style="width: 200px"
+            @keyup.enter="handleQuery" />
         </el-form-item>
         <el-form-item label="表面名称" prop="colorName">
-          <el-input
-            v-model="queryParams.colorName"
-            placeholder="请输入表面名称"
-            clearable
-            style="width: 200px"
-            @keyup.enter="handleQuery"
-          />
+          <el-input v-model="queryParams.colorName" placeholder="请输入表面名称" clearable style="width: 200px"
+            @keyup.enter="handleQuery" />
         </el-form-item>
         <el-form-item label="客户名称" prop="clientName">
-          <el-input
-            v-model="queryParams.clientName"
-            placeholder="请输入客户名称"
-            clearable
-            style="width: 200px"
-            @keyup.enter="handleQuery"
-          />
+          <el-input v-model="queryParams.clientName" placeholder="请输入客户名称" clearable style="width: 200px"
+            @keyup.enter="handleQuery" />
         </el-form-item>
         <el-form-item label="单据编号" prop="docCode">
-          <el-input
-            v-model="queryParams.docCode"
-            placeholder="请输入单据编号"
-            clearable
-            style="width: 200px"
-            @keyup.enter="handleQuery"
-          />
+          <el-input v-model="queryParams.docCode" placeholder="请输入单据编号" clearable style="width: 200px"
+            @keyup.enter="handleQuery" />
         </el-form-item>
         <el-form-item class="btn-group">
           <el-button type="primary" icon="Search" class="glow-btn" @click="handleQuery">搜索</el-button>
@@ -92,15 +32,8 @@
 
     <!-- 数据呈现主表格 -->
     <el-card class="table-card shadow-sm" border="false">
-      <el-table
-        v-loading="loading"
-        :data="stockList"
-        stripe
-        row-key="itemNo"
-        border
-        highlight-current-row
-        class="premium-table"
-      >
+      <el-table v-loading="loading" :data="stockList" stripe row-key="itemNo" border highlight-current-row
+        class="premium-table">
         <el-table-column type="index" label="序号" align="center" width="55" fixed />
         <el-table-column label="单据编号" align="center" prop="docCode" width="130" show-overflow-tooltip fixed />
         <el-table-column label="型材型号" align="left" prop="modelNum" width="130" show-overflow-tooltip fixed>
@@ -160,13 +93,8 @@
         </el-table-column>
       </el-table>
 
-      <pagination
-        v-show="total > 0"
-        :total="total"
-        v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize"
-        @pagination="getList"
-      />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
   </div>
 </template>
@@ -176,7 +104,7 @@
  * 成品库存组件逻辑
  * @Author: Antigravity
  */
-import { ref, onMounted, reactive } from 'vue';
+import { ref, onMounted } from 'vue';
 import { listGoodsStockPage } from '@/api/erp/goodsStock';
 import { parseTime } from '@/utils/ruoyi';
 
@@ -185,14 +113,6 @@ const loading = ref(false);
 const total = ref(0);
 const stockList = ref([]);
 
-// 汇总栏数据定义
-const summaryData = reactive({
-  totalQty: 0,
-  totalWt: 0,
-  agingCount: 0,
-  docCount: 0
-});
-
 // 查询参数配置
 const queryParams = ref({
   pageNum: 1,
@@ -210,41 +130,11 @@ function getList() {
     stockList.value = response.rows;
     total.value = response.total;
     loading.value = false;
-    calculateSummary(response.rows);
   }).catch(() => {
     loading.value = false;
   });
 }
 
-/** 动态统计当前页/当前汇总概览 */
-function calculateSummary(rows) {
-  if (!rows || rows.length === 0) {
-    summaryData.totalQty = 0;
-    summaryData.totalWt = 0;
-    summaryData.agingCount = 0;
-    summaryData.docCount = 0;
-    return;
-  }
-  let qty = 0;
-  let wt = 0;
-  let aging = 0;
-  const docs = new Set();
-  rows.forEach(r => {
-    qty += Number(r.qty || 0);
-    wt += Number(r.wt || 0);
-    if (Number(r.stockDays || 0) > 30) {
-      aging++;
-    }
-    if (r.docCode) {
-      docs.add(r.docCode);
-    }
-  });
-  summaryData.totalQty = qty;
-  summaryData.totalWt = wt;
-  summaryData.agingCount = aging;
-  summaryData.docCount = docs.size;
-}
-
 /** 库龄颜色渲染 */
 function getAgingTagType(days) {
   const d = Number(days || 0);
@@ -277,80 +167,7 @@ onMounted(() => {
   background-color: #f6f8fb;
   min-height: calc(100vh - 84px);
 
-  // 1. 数据统计卡片区美化
-  .summary-row {
-    margin-bottom: 20px;
-
-    .summary-card {
-      display: flex;
-      align-items: center;
-      padding: 20px;
-      background: #ffffff;
-      border-radius: 12px;
-      box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.03);
-      transition: all 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
-      border-left: 5px solid #409eff;
-
-      &:hover {
-        transform: translateY(-4px);
-        box-shadow: 0 8px 30px 0 rgba(64, 158, 255, 0.12);
-      }
-
-      &.total-stock {
-        border-left-color: #409eff;
-        .card-icon { background: rgba(64, 158, 255, 0.1); color: #409eff; }
-      }
-      &.total-weight {
-        border-left-color: #67c23a;
-        .card-icon { background: rgba(103, 194, 58, 0.1); color: #67c23a; }
-      }
-      &.aging-stock {
-        border-left-color: #f56c6c;
-        .card-icon { background: rgba(245, 108, 108, 0.1); color: #f56c6c; }
-      }
-      &.warehouse-stock {
-        border-left-color: #e6a23c;
-        .card-icon { background: rgba(230, 162, 60, 0.1); color: #e6a23c; }
-      }
-
-      .card-icon {
-        width: 54px;
-        height: 54px;
-        border-radius: 10px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-size: 26px;
-        margin-right: 15px;
-      }
-
-      .card-info {
-        .label {
-          font-size: 13px;
-          color: #909399;
-          display: block;
-          margin-bottom: 5px;
-        }
-        .value {
-          margin: 0;
-          font-size: 22px;
-          font-weight: 700;
-          color: #303133;
-
-          small {
-            font-size: 12px;
-            font-weight: normal;
-            color: #909399;
-            margin-left: 2px;
-          }
-        }
-        .warning-text { color: #f56c6c; }
-        .info-text { color: #e6a23c; }
-      }
-    }
-  }
-
-  // 2. 搜索控制栏美化
+  // 搜索控制栏美化
   .search-card {
     background: #ffffff;
     border-radius: 12px;
@@ -418,6 +235,8 @@ onMounted(() => {
     }
   }
 
-  .mb20 { margin-bottom: 20px; }
+  .mb20 {
+    margin-bottom: 20px;
+  }
 }
 </style>

src/views/order/index.vue

@@ -57,7 +57,8 @@
         <el-table-column label="总支数" align="center" prop="totalCount" />
         <el-table-column label="订单状态" align="center" prop="status">
           <template #default="scope">
-            <el-tag :color="orderStatusJson[scope.row.status]?.color" style="color: #fff; border: none; font-weight: bold;">
+            <el-tag :color="orderStatusJson[scope.row.status]?.color"
+              style="color: #fff; border: none; font-weight: bold;">
               {{ orderStatusJson[scope.row.status]?.text || '待确认' }}
             </el-tag>
           </template>
@@ -67,8 +68,10 @@
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
           <template #default="scope">
+            <el-button v-if="scope.row.urgentFlag !== 1 && checkPermi(['order:order:urgent'])" link type="danger"
+              icon="Warning" @click="handleUrgent(scope.row)">加急</el-button>
             <el-button v-hasPermi="['order:order:query']" link type="warning" icon="View"
               @click="handleViewOrder(scope.row)">查看</el-button>
           </template>
@@ -88,9 +91,14 @@
           <el-descriptions-item label="单据编号" :span="2">{{ detailOrder.docCode || '-' }}</el-descriptions-item>
           <el-descriptions-item label="下单人">{{ detailOrder.placerName }}</el-descriptions-item>
           <el-descriptions-item label="订单状态">
-            <el-tag :color="orderStatusJson[detailOrder.status]?.color" style="color: #fff; border: none; font-weight: bold;">
+            <el-tag :color="orderStatusJson[detailOrder.status]?.color"
+              style="color: #fff; border: none; font-weight: bold;">
               {{ orderStatusJson[detailOrder.status]?.text || '待确认' }}
             </el-tag>
+            <el-tag v-if="detailOrder.urgentFlag === 1" type="danger" effect="dark"
+              style="margin-left: 8px; font-weight: bold;">
+              🔥 加急
+            </el-tag>
           </el-descriptions-item>
           <el-descriptions-item label="下单时间">{{ parseTime(detailOrder.placeTime) }}</el-descriptions-item>
           <el-descriptions-item label="创建时间">{{ parseTime(detailOrder.createTime) }}</el-descriptions-item>
@@ -127,8 +135,9 @@
 </template>
 
 <script setup name="Order">
-import { listOrder, getOrder } from "@/api/erp/order";
+import { listOrder, getOrder, markUrgentOrder } from "@/api/erp/order";
 import orderStatusJson from "@/json/orderStatus.json";
+import { checkPermi } from '@/utils/permission';
 
 /** @Author: Antigravity */
 
@@ -212,6 +221,18 @@ function handleViewOrder(row) {
   });
 }
 
+/** 加急订单 */
+function handleUrgent(row) {
+  proxy.$modal.confirm(`确认要将订单【${row.code}】标记为加急吗？`).then(() => {
+    markUrgentOrder(row.rowId).then(() => {
+      proxy.$modal.msgSuccess("标记加急成功");
+      getList();
+    }).catch(() => {
+      proxy.$modal.msgError("标记加急失败");
+    });
+  }).catch(() => { });
+}
+
 /** 格式化数值，匹配小程序端的 toFixed(4) 显示 */
 function formatNum(val, fallback = '0') {
   if (val === null || val === undefined || val === '') return fallback;