审核;查看审核记录;分页查询BUG修复

src/api/erp/color/index.ts

@@ -7,7 +7,7 @@ import { AxiosPromise } from 'axios';
  */
 export function listColor(): AxiosPromise<any[]> {
     return request({
-        url: '/erp/colorKind/all',
+        url: '/erp/colorKind/list',
         method: 'get'
     });
 }

src/api/erp/model/index.ts

@@ -8,7 +8,7 @@ import { AxiosPromise } from 'axios';
  */
 export function listModel(query: any): AxiosPromise<any[]> {
   return request({
-    url: '/erp/model/all',
+    url: '/erp/model/list',
     method: 'get',
     params: query
   });

src/api/erp/orderAudit/index.ts

@@ -0,0 +1,14 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+
+/**
+ * 获取订单的审核历史
+ * @param orderId 订单ID
+ * @Author: Antigravity
+ */
+export function getAuditHistory(orderId: string): AxiosPromise<any[]> {
+  return request({
+    url: '/erp/orderAudit/history/' + orderId,
+    method: 'get'
+  });
+}

src/views/order/index.vue

@@ -11,8 +11,12 @@
       </el-form-item>
       <el-form-item label="订单状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="订单状态" clearable style="width: 200px">
+          <el-option label="已撤销" :value="-1" />
           <el-option label="待审核" :value="0" />
-          <el-option label="已审核" :value="1" />
+          <el-option label="已驳回" :value="1" />
+          <el-option label="待签批" :value="2" />
+          <el-option label="生产中" :value="3" />
+          <el-option label="已完成" :value="4" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -39,9 +43,13 @@
       <el-table-column label="总支数" align="center" prop="totalCount" />
       <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
-          <el-tag :type="scope.row.status === 1 ? 'success' : 'warning'">
-            {{ scope.row.status === 1 ? '已审核' : '待审核' }}
-          </el-tag>
+          <el-tag v-if="scope.row.status === -1" type="info">已撤销</el-tag>
+          <el-tag v-else-if="scope.row.status === 0" type="warning">待审核</el-tag>
+          <el-tag v-else-if="scope.row.status === 1" type="danger">已驳回</el-tag>
+          <el-tag v-else-if="scope.row.status === 2" type="primary">待签批</el-tag>
+          <el-tag v-else-if="scope.row.status === 3" type="info">生产中</el-tag>
+          <el-tag v-else-if="scope.row.status === 4" type="success">已完成</el-tag>
+          <el-tag v-else type="info">未知</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
@@ -53,6 +61,7 @@
         <template #default="scope">
           <el-button link type="primary" icon="Stamp" @click="handleAudit(scope.row)" v-if="scope.row.status === 0"
             v-hasPermi="['erp:order:audit']">审核</el-button>
+          <el-button link type="primary" icon="Timer" @click="handleViewAuditHistory(scope.row)">审核记录</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -123,6 +132,37 @@
       </template>
     </el-dialog>
 
+    <!-- 审核记录对话框 -->
+    <el-dialog title="审核记录" v-model="auditHistoryOpen" width="600px" append-to-body>
+      <el-timeline v-if="auditHistoryList.length > 0">
+        <el-timeline-item
+          v-for="(item, index) in auditHistoryList"
+          :key="index"
+          hide-timestamp
+          :color="item.auditResult === 1 ? '#67c23a' : '#f56c6c'"
+        >
+          <div class="audit-card" :class="item.auditResult === 1 ? 'card-pass' : 'card-reject'">
+            <div class="audit-card-header">
+              <el-tag :type="item.auditResult === 1 ? 'success' : 'danger'" effect="dark" size="small">
+                {{ item.auditResult === 1 ? '通过' : '驳回' }}
+              </el-tag>
+              <span class="audit-card-auditor">
+                <el-icon><User /></el-icon> {{ item.auditorName || '未知' }}
+              </span>
+            </div>
+            <div v-if="item.rejectReason" class="audit-card-reason">
+              <span class="reason-label">驳回理由</span>
+              <span class="reason-text">{{ item.rejectReason }}</span>
+            </div>
+            <div class="audit-card-time">
+              <el-icon><Clock /></el-icon> {{ parseTime(item.auditTime) }}
+            </div>
+          </div>
+        </el-timeline-item>
+      </el-timeline>
+      <el-empty v-else description="暂无审核记录" />
+    </el-dialog>
+
     <!-- 订单审核对话框 -->
     <el-dialog title="订单审核" v-model="auditOpen" width="500px" append-to-body>
       <el-form ref="auditRef" :model="auditForm" :rules="auditRules" label-width="80px">
@@ -150,6 +190,8 @@
 import { listOrder, getOrder, addOrder, auditOrder } from "@/api/erp/order";
 import { listModel } from "@/api/erp/model";
 import { listColor } from "@/api/erp/color";
+import { getAuditHistory } from "@/api/erp/orderAudit";
+import { User, Clock } from '@element-plus/icons-vue';
 
 /** @Author: Antigravity */
 
@@ -162,6 +204,8 @@ const showSearch = ref(true);
 const total = ref(0);
 const title = ref("");
 const auditOpen = ref(false);
+const auditHistoryOpen = ref(false);
+const auditHistoryList = ref([]);
 
 const modelOptions = ref([]);
 const colorOptions = ref([]);
@@ -255,6 +299,17 @@ function handleAudit(row) {
   auditOpen.value = true;
 }
 
+/** 查看审核记录 */
+function handleViewAuditHistory(row) {
+  auditHistoryList.value = [];
+  auditHistoryOpen.value = true;
+  getAuditHistory(row.rowId).then(res => {
+    auditHistoryList.value = res.data || [];
+  }).catch(() => {
+    proxy.$modal.msgError("获取审核记录失败");
+  });
+}
+
 /** 提交审核 */
 function submitAudit() {
   proxy.$refs["auditRef"].validate(valid => {
@@ -318,3 +373,64 @@ function handleErpOrderDetailSelectionChange(selection) {
 getOptions();
 getList();
 </script>
+
+<style scoped>
+.audit-card {
+  background: #fff;
+  border-radius: 8px;
+  padding: 16px 20px;
+  border-left: 4px solid #ebeef5;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+  transition: box-shadow 0.2s;
+}
+.audit-card:hover {
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.08);
+}
+.audit-card.card-pass {
+  border-left-color: #67c23a;
+}
+.audit-card.card-reject {
+  border-left-color: #f56c6c;
+}
+
+.audit-card-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 12px;
+}
+.audit-card-auditor {
+  font-size: 14px;
+  color: #606266;
+  display: flex;
+  align-items: center;
+  gap: 4px;
+}
+
+.audit-card-reason {
+  background: #fef0f0;
+  border-radius: 6px;
+  padding: 10px 14px;
+  margin-bottom: 12px;
+}
+.reason-label {
+  font-size: 12px;
+  color: #f56c6c;
+  font-weight: 500;
+  display: block;
+  margin-bottom: 4px;
+}
+.reason-text {
+  font-size: 13px;
+  color: #c03639;
+  line-height: 1.5;
+}
+
+.audit-card-time {
+  font-size: 13px;
+  color: #909399;
+  display: flex;
+  align-items: center;
+  gap: 4px;
+}
+</style>