From cfe71072ab00f913eb6f4bd4fda7780639132b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Fri, 28 Nov 2025 15:33:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=89=AB=E6=8F=8F=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/warehouse/handlingUnitOperationLog.js |   7 +
 .../modules/automatedWarehouse/agvTask.vue    |   4 +-
 .../handlingUnitOperationLog.vue              | 256 ++++++++++++++++++
 .../automatedWarehouse/palletOperationLog.vue |  10 +-
 4 files changed, 271 insertions(+), 6 deletions(-)
 create mode 100644 src/api/warehouse/handlingUnitOperationLog.js
 create mode 100644 src/views/modules/automatedWarehouse/handlingUnitOperationLog.vue

diff --git a/src/api/warehouse/handlingUnitOperationLog.js b/src/api/warehouse/handlingUnitOperationLog.js
new file mode 100644
index 0000000..13c525f
--- /dev/null
+++ b/src/api/warehouse/handlingUnitOperationLog.js
@@ -0,0 +1,7 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+// ================== 标签操作记录 - rqrq ==================
+
+// 分页查询标签操作记录列表 - rqrq
+export const searchHandlingUnitOperationLogList = data => createAPI('/warehouse/handlingunitoperationlog/list', 'POST', data);
+
diff --git a/src/views/modules/automatedWarehouse/agvTask.vue b/src/views/modules/automatedWarehouse/agvTask.vue
index 6e864b3..d8ac088 100644
--- a/src/views/modules/automatedWarehouse/agvTask.vue
+++ b/src/views/modules/automatedWarehouse/agvTask.vue
@@ -146,10 +146,11 @@
           <el-table-column prop="fromLocation" label="起始库位" width="80" align="center"></el-table-column>
           <el-table-column prop="toLocation" label="目标库位" width="80" align="center"></el-table-column>
            <el-table-column prop="toArea" label="目标区域" width="80" align="center"></el-table-column>
+          <el-table-column prop="toAreaName" label="区域名称" width="100" align="center"></el-table-column>
           <el-table-column prop="palletId" label="托盘ID" width="80" align="center"></el-table-column>
           <el-table-column prop="palletType" label="托盘类型" width="80" align="center"></el-table-column>
           <el-table-column prop="priority" label="优先级" width="80" align="center"></el-table-column>
-          <el-table-column prop="wcsTaskId" label="WCS任务ID" width="100" align="center"></el-table-column>
+<!--          <el-table-column prop="wcsTaskId" label="WCS任务ID" width="100" align="center"></el-table-column>-->
           <el-table-column prop="errorCode" label="错误代码" width="120" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.errorCode" style="color: red;">{{ scope.row.errorCode }}</span>
@@ -652,6 +653,7 @@ export default {
         "托盘ID": "palletId",
         "托盘类型": "palletType",
         "目标区域": "toArea",
+        "区域名称": "toAreaName",
         "AGV编码": "agvCode",
         "优先级": "priority",
         "状态": "status",
diff --git a/src/views/modules/automatedWarehouse/handlingUnitOperationLog.vue b/src/views/modules/automatedWarehouse/handlingUnitOperationLog.vue
new file mode 100644
index 0000000..ab88db0
--- /dev/null
+++ b/src/views/modules/automatedWarehouse/handlingUnitOperationLog.vue
@@ -0,0 +1,256 @@
+<template>
+  <div class="mod-config yzz">
+    <!-- 查询表单 - rqrq -->
+    <el-form :inline="true" label-position="top" class="query-form">
+      <el-form-item label="工厂编码">
+        <el-input v-model="queryData.site" style="width: 120px" placeholder="请输入工厂编码"></el-input>
+      </el-form-item>
+      <el-form-item label="条码号">
+        <el-input v-model="queryData.searchSerialNo" style="width: 150px" placeholder="请输入条码号"></el-input>
+      </el-form-item>
+      <el-form-item label="操作类型">
+        <el-select v-model="queryData.searchOperationType" style="width: 140px" clearable placeholder="请选择">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="扫入" value="扫入"></el-option>
+          <el-option label="扫出" value="扫出"></el-option>
+          <el-option label="自动分拣" value="自动分拣"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="操作者">
+        <el-input v-model="queryData.searchOperator" style="width: 120px" placeholder="请输入操作者"></el-input>
+      </el-form-item>
+      <el-form-item label="任务号">
+        <el-input v-model="queryData.searchTaskNo" style="width: 150px" placeholder="请输入任务号"></el-input>
+      </el-form-item>
+      <el-form-item label="开始时间">
+        <el-date-picker
+          v-model="queryData.startDate"
+          type="datetime"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          style="width: 160px"
+          placeholder="请选择开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间">
+        <el-date-picker
+          v-model="queryData.endDate"
+          type="datetime"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          style="width: 160px"
+          placeholder="请选择结束时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label=" ">
+        <el-button type="primary" @click="searchTable()" class="yzzButtonAn">查询</el-button>
+        <el-button @click="resetQuery()" class="yzzButtonAn">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 主表格 - rqrq -->
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      highlight-current-row
+      v-loading="dataListLoading"
+      style="width: 100%;">
+
+      <el-table-column prop="id" header-align="center" align="center" min-width="50" label="ID"></el-table-column>
+      <el-table-column prop="serialNo" header-align="center" align="center" min-width="150" label="条码号" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="site" header-align="center" align="center" min-width="80" label="站点"></el-table-column>
+      <el-table-column prop="operationType" header-align="center" align="center" min-width="100" label="操作类型">
+        <template slot-scope="scope">
+          <el-tag :type="getOperationTypeColor(scope.row.operationType)" size="mini">
+            {{ getOperationTypeText(scope.row.operationType) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="operationReason" header-align="center" align="left" min-width="200" label="操作原因" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="fieldName" header-align="center" align="center" min-width="120" label="字段名" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="oldValue" header-align="center" align="center" min-width="100" label="旧值" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="newValue" header-align="center" align="center" min-width="100" label="新值" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="operator" header-align="center" align="center" min-width="100" label="操作者"></el-table-column>
+      <el-table-column prop="operationTime" header-align="center" align="center" min-width="160" label="操作时间">
+        <template slot-scope="scope">
+          {{ formatDate(scope.row.operationTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="taskNo" header-align="center" align="center" min-width="150" label="关联任务" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="remark" header-align="center" align="center" min-width="150" label="备注" show-overflow-tooltip></el-table-column>
+    </el-table>
+
+    <!-- 分页 - rqrq -->
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 1000]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+import { searchHandlingUnitOperationLogList } from "@/api/warehouse/handlingUnitOperationLog.js"
+
+export default {
+  data() {
+    return {
+      // 页面状态 - rqrq
+      height: 500,
+      dataListLoading: false,
+
+      // 数据列表 - rqrq
+      dataList: [],
+
+      // 查询条件 - rqrq
+      queryData: {
+        site: this.$store.state.user.site,
+        searchSerialNo: '',
+        searchOperationType: '',
+        searchOperator: '',
+        searchTaskNo: '',
+        startDate: '',
+        endDate: ''
+      },
+
+      // 分页信息 - rqrq
+      pageIndex: 1,
+      pageSize: 20,
+      totalPage: 0
+    }
+  },
+
+  mounted() {
+    this.$nextTick(() => {
+      this.height = window.innerHeight - 220
+    })
+
+    // 加载初始数据 - rqrq
+    this.getDataList()
+  },
+
+  methods: {
+    // 查询表格数据 - rqrq
+    searchTable() {
+      this.pageIndex = 1
+      this.getDataList()
+    },
+
+    // 获取数据列表 - rqrq
+    getDataList() {
+      this.dataListLoading = true
+
+      const params = {
+        ...this.queryData,
+        page: this.pageIndex,
+        limit: this.pageSize
+      }
+
+      searchHandlingUnitOperationLogList(params).then(({data}) => {
+        this.dataListLoading = false
+        if (data && data.code === 0) {
+          this.dataList = data.page.list || []
+          this.pageIndex = data.page.currPage
+          this.totalPage = data.page.totalCount
+        } else {
+          this.dataList = []
+          this.$message.error(data.msg || '查询失败')
+        }
+      }).catch(() => {
+        this.dataListLoading = false
+        this.dataList = []
+        this.$message.error('查询失败，请稍后重试')
+      })
+    },
+
+    // 重置查询条件 - rqrq
+    resetQuery() {
+      this.queryData = {
+        site: this.$store.state.user.site,
+        searchSerialNo: '',
+        searchOperationType: '',
+        searchOperator: '',
+        searchTaskNo: '',
+        startDate: '',
+        endDate: ''
+      }
+      this.searchTable()
+    },
+
+    // 每页数变化 - rqrq
+    sizeChangeHandle(val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+
+    // 当前页变化 - rqrq
+    currentChangeHandle(val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+
+    // 获取操作类型文本 - rqrq
+    getOperationTypeText(type) {
+      const typeMap = {
+        'CREATE': '创建标签',
+        'UPDATE': '更新字段',
+        'DELETE': '删除',
+        'MERGE': '合并',
+        'SPLIT': '拆分',
+        'FREEZE': '冻结',
+        'UNFREEZE': '解冻',
+        'MOVE': '移库',
+        'RESERVE': '预留',
+        'UNRESERVE': '取消预留'
+      }
+      return typeMap[type] || type
+    },
+
+    // 获取操作类型颜色 - rqrq
+    getOperationTypeColor(type) {
+      const colorMap = {
+        'CREATE': 'success',
+        'UPDATE': 'primary',
+        'DELETE': 'danger',
+        'MERGE': 'warning',
+        'SPLIT': 'info',
+        'FREEZE': 'danger',
+        'UNFREEZE': 'success',
+        'MOVE': 'info',
+        'RESERVE': 'warning',
+        'UNRESERVE': 'success'
+      }
+      return colorMap[type] || ''
+    },
+
+    // 格式化日期 - rqrq
+    formatDate(dateStr) {
+      if (!dateStr) return ''
+      const date = new Date(dateStr)
+      const year = date.getFullYear()
+      const month = String(date.getMonth() + 1).padStart(2, '0')
+      const day = String(date.getDate()).padStart(2, '0')
+      const hours = String(date.getHours()).padStart(2, '0')
+      const minutes = String(date.getMinutes()).padStart(2, '0')
+      const seconds = String(date.getSeconds()).padStart(2, '0')
+
+      if (hours === '00' && minutes === '00' && seconds === '00') {
+        return `${year}-${month}-${day}`
+      }
+      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
+    }
+  }
+}
+</script>
+
+<style scoped>
+.query-form {
+  margin-top: 1px;
+  margin-left: 0px;
+}
+</style>
+
diff --git a/src/views/modules/automatedWarehouse/palletOperationLog.vue b/src/views/modules/automatedWarehouse/palletOperationLog.vue
index 11538b8..4c22256 100644
--- a/src/views/modules/automatedWarehouse/palletOperationLog.vue
+++ b/src/views/modules/automatedWarehouse/palletOperationLog.vue
@@ -11,7 +11,7 @@
       <el-form-item label="操作类型">
         <el-select v-model="queryData.searchOperationType" style="width: 140px" clearable placeholder="请选择">
           <el-option label="全部" value=""></el-option>
-          <el-option label="调用托盘" value="CALL"></el-option>
+          <el-option label="调用托盘" value="调用托盘"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="操作者">
@@ -53,7 +53,7 @@
       v-loading="dataListLoading"
       style="width: 100%;">
 
-      <el-table-column prop="id" header-align="center" align="center" min-width="80" label="日志ID"></el-table-column>
+      <el-table-column prop="id" header-align="center" align="center" min-width="50" label="ID"></el-table-column>
       <el-table-column prop="palletId" header-align="center" align="center" min-width="120" label="托盘号" show-overflow-tooltip></el-table-column>
       <el-table-column prop="site" header-align="center" align="center" min-width="80" label="站点"></el-table-column>
       <el-table-column prop="operationType" header-align="center" align="center" min-width="100" label="操作类型">
@@ -63,8 +63,8 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column prop="operationReason" header-align="center" align="center" min-width="150" label="操作原因" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="fieldName" header-align="center" align="center" min-width="120" label="字段名" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="operationReason" header-align="center" align="left" min-width="200" label="操作原因" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="fieldName" header-align="center" align="center" min-width="120" label="属性名" show-overflow-tooltip></el-table-column>
       <el-table-column prop="oldValue" header-align="center" align="center" min-width="100" label="旧值" show-overflow-tooltip></el-table-column>
       <el-table-column prop="newValue" header-align="center" align="center" min-width="100" label="新值" show-overflow-tooltip></el-table-column>
       <el-table-column prop="operator" header-align="center" align="center" min-width="100" label="操作者"></el-table-column>
@@ -73,7 +73,7 @@
           {{ formatDate(scope.row.operationTime) }}
         </template>
       </el-table-column>
-      <el-table-column prop="taskNo" header-align="center" align="center" min-width="150" label="任务号" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="taskNo" header-align="center" align="center" min-width="150" label="关联任务" show-overflow-tooltip></el-table-column>
       <el-table-column prop="remark" header-align="center" align="center" min-width="150" label="备注" show-overflow-tooltip></el-table-column>
     </el-table>