From 02a429af66cd83c20e27daba56d1481417577114 Mon Sep 17 00:00:00 2001
From: mrlee <470349233@qq.com>
Date: Mon, 31 Aug 2026 19:17:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=9F=E4=BA=A7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/plugin/produce/config/installed.php        |  2 +-
 .../resource/template/web/pages/query/index.vue    |  7 +++----
 frontend/web/app/apps/produce/api/query.ts         | 14 ++++----------
 .../web/app/apps/produce/pages/query/index.vue     |  7 +++----
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/backend/plugin/produce/config/installed.php b/backend/plugin/produce/config/installed.php
index 7bb33e2..7777ba3 100644
--- a/backend/plugin/produce/config/installed.php
+++ b/backend/plugin/produce/config/installed.php
@@ -1,4 +1,4 @@
 <?php return array (
   'version' => '1.0.0',
-  'installed_at' => '2026-08-30 15:44:35',
+  'installed_at' => '2026-08-31 17:20:32',
 );
\ No newline at end of file
diff --git a/backend/plugin/produce/resource/template/web/pages/query/index.vue b/backend/plugin/produce/resource/template/web/pages/query/index.vue
index cbf483c..bf32d8e 100644
--- a/backend/plugin/produce/resource/template/web/pages/query/index.vue
+++ b/backend/plugin/produce/resource/template/web/pages/query/index.vue
@@ -22,7 +22,6 @@
         <el-empty v-if="timelineLoaded && !timelineLoading && !timeline.items.length" description="该订单暂无相关记录" :image-size="90" />
         <div v-else-if="timeline.items.length" class="timeline-list">
           <el-table :data="timeline.items" stripe class="timeline-table" empty-text="暂无时间线记录">
-            <el-table-column prop="event_date" label="发生时间" width="170" />
             <el-table-column label="记录类型" width="112">
               <template #default="scope"><el-tag :type="tagType(scope.row.record_type)" effect="light" round>{{ scope.row.record_type_name }}</el-tag></template>
             </el-table-column>
@@ -40,8 +39,7 @@
             <el-table-column label="工序节点" min-width="160" show-overflow-tooltip>
               <template #default="scope">
                 <div class="timeline-node-cell">
-                  <strong>{{ scope.row.process_name || '未指定工序' }}</strong>
-                  <small v-if="scope.row.step_name">工位：{{ scope.row.step_name }}</small>
+                  {{ [scope.row.process_name, scope.row.step_name].filter(Boolean).join(' / ') || '—' }}
                 </div>
               </template>
             </el-table-column>
@@ -74,6 +72,7 @@
                 </div>
               </template>
             </el-table-column>
+            <el-table-column prop="event_date" label="时间" width="170" />
             <el-table-column prop="remark" label="备注" min-width="180" show-overflow-tooltip />
           </el-table>
         </div>
@@ -95,13 +94,13 @@
           <el-form-item><el-button type="primary" :loading="recordLoading" @click="loadRecords">查询</el-button></el-form-item>
         </el-form>
         <el-table v-loading="recordLoading" :data="recordPage.items" stripe class="record-table" empty-text="暂无查询记录" @row-dblclick="showRecordDetail">
-          <el-table-column prop="event_date" label="发生时间" width="170" />
           <el-table-column prop="record_type_name" label="记录类型" width="112"><template #default="scope"><el-tag :type="tagType(scope.row.record_type)" effect="light" round>{{ scope.row.record_type_name }}</el-tag></template></el-table-column>
           <el-table-column prop="order_no" label="订单号" min-width="160" show-overflow-tooltip />
           <el-table-column prop="product_code" label="产品编码" min-width="145" show-overflow-tooltip />
           <el-table-column label="工序节点" min-width="160" show-overflow-tooltip><template #default="scope">{{ [scope.row.process_name, scope.row.step_name].filter(Boolean).join(' / ') || '—' }}</template></el-table-column>
           <el-table-column label="状态 / 结果" min-width="145" show-overflow-tooltip><template #default="scope">{{ [scope.row.status_name, scope.row.result_name].filter(Boolean).join(' · ') || '—' }}</template></el-table-column>
           <el-table-column label="操作人" min-width="125" show-overflow-tooltip><template #default="scope">{{ scope.row.operator || scope.row.user_code || '未记录' }}</template></el-table-column>
+          <el-table-column prop="event_date" label="时间" width="170" />
           <el-table-column prop="remark" label="备注" min-width="190" show-overflow-tooltip />
         </el-table>
         <div class="pagination-row"><span>共 {{ recordPage.total }} 条</span><el-pagination v-model:current-page="recordPage.page" v-model:page-size="recordPage.limit" layout="prev, pager, next, sizes" :page-sizes="[20, 50, 100]" :total="recordPage.total" @current-change="loadRecords" @size-change="loadRecords" /></div>
diff --git a/frontend/web/app/apps/produce/api/query.ts b/frontend/web/app/apps/produce/api/query.ts
index 0c57c6f..58cb956 100644
--- a/frontend/web/app/apps/produce/api/query.ts
+++ b/frontend/web/app/apps/produce/api/query.ts
@@ -9,20 +9,14 @@ export interface ProduceQueryRecord {
   order_no?: string
   product_code?: string
   process_name?: string
-  step_name?: string
-  status_name?: string
-  result_name?: string
-  operator?: string
-  user_code?: string
-  quantity?: number | null
-  event_at?: number
-  event_date?: string | null
-  remark?: string
-  // 异常提报和维修记录详情
   exception_reason?: string
   exception_content?: string
   material_category?: string
   fault_description?: string
+  quantity?: number | null
+  event_at?: number
+  event_date?: string | null
+  remark?: string
 }
 
 export interface ProduceQueryPage {
diff --git a/frontend/web/app/apps/produce/pages/query/index.vue b/frontend/web/app/apps/produce/pages/query/index.vue
index cbf483c..bf32d8e 100644
--- a/frontend/web/app/apps/produce/pages/query/index.vue
+++ b/frontend/web/app/apps/produce/pages/query/index.vue
@@ -22,7 +22,6 @@
         <el-empty v-if="timelineLoaded && !timelineLoading && !timeline.items.length" description="该订单暂无相关记录" :image-size="90" />
         <div v-else-if="timeline.items.length" class="timeline-list">
           <el-table :data="timeline.items" stripe class="timeline-table" empty-text="暂无时间线记录">
-            <el-table-column prop="event_date" label="发生时间" width="170" />
             <el-table-column label="记录类型" width="112">
               <template #default="scope"><el-tag :type="tagType(scope.row.record_type)" effect="light" round>{{ scope.row.record_type_name }}</el-tag></template>
             </el-table-column>
@@ -40,8 +39,7 @@
             <el-table-column label="工序节点" min-width="160" show-overflow-tooltip>
               <template #default="scope">
                 <div class="timeline-node-cell">
-                  <strong>{{ scope.row.process_name || '未指定工序' }}</strong>
-                  <small v-if="scope.row.step_name">工位：{{ scope.row.step_name }}</small>
+                  {{ [scope.row.process_name, scope.row.step_name].filter(Boolean).join(' / ') || '—' }}
                 </div>
               </template>
             </el-table-column>
@@ -74,6 +72,7 @@
                 </div>
               </template>
             </el-table-column>
+            <el-table-column prop="event_date" label="时间" width="170" />
             <el-table-column prop="remark" label="备注" min-width="180" show-overflow-tooltip />
           </el-table>
         </div>
@@ -95,13 +94,13 @@
           <el-form-item><el-button type="primary" :loading="recordLoading" @click="loadRecords">查询</el-button></el-form-item>
         </el-form>
         <el-table v-loading="recordLoading" :data="recordPage.items" stripe class="record-table" empty-text="暂无查询记录" @row-dblclick="showRecordDetail">
-          <el-table-column prop="event_date" label="发生时间" width="170" />
           <el-table-column prop="record_type_name" label="记录类型" width="112"><template #default="scope"><el-tag :type="tagType(scope.row.record_type)" effect="light" round>{{ scope.row.record_type_name }}</el-tag></template></el-table-column>
           <el-table-column prop="order_no" label="订单号" min-width="160" show-overflow-tooltip />
           <el-table-column prop="product_code" label="产品编码" min-width="145" show-overflow-tooltip />
           <el-table-column label="工序节点" min-width="160" show-overflow-tooltip><template #default="scope">{{ [scope.row.process_name, scope.row.step_name].filter(Boolean).join(' / ') || '—' }}</template></el-table-column>
           <el-table-column label="状态 / 结果" min-width="145" show-overflow-tooltip><template #default="scope">{{ [scope.row.status_name, scope.row.result_name].filter(Boolean).join(' · ') || '—' }}</template></el-table-column>
           <el-table-column label="操作人" min-width="125" show-overflow-tooltip><template #default="scope">{{ scope.row.operator || scope.row.user_code || '未记录' }}</template></el-table-column>
+          <el-table-column prop="event_date" label="时间" width="170" />
           <el-table-column prop="remark" label="备注" min-width="190" show-overflow-tooltip />
         </el-table>
         <div class="pagination-row"><span>共 {{ recordPage.total }} 条</span><el-pagination v-model:current-page="recordPage.page" v-model:page-size="recordPage.limit" layout="prev, pager, next, sizes" :page-sizes="[20, 50, 100]" :total="recordPage.total" @current-change="loadRecords" @size-change="loadRecords" /></div>