From 78624302fe6f67721419e9e43ed1691bc5d5b399 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Thu, 4 Jun 2026 17:05:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assetManage/errorLog/index.vue | 25 ++++++++++++++++--------
 src/views/assetManage/inOutLog/index.vue |  5 ++++-
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/views/assetManage/errorLog/index.vue b/src/views/assetManage/errorLog/index.vue
index 8d2fda2..cd6ae22 100644
--- a/src/views/assetManage/errorLog/index.vue
+++ b/src/views/assetManage/errorLog/index.vue
@@ -51,21 +51,27 @@
         <el-table-column prop="unitname" label="计量单位" width="80px" align="center" :show-overflow-tooltip="true" />
         <el-table-column prop="departmentname" label="使用部门" :show-overflow-tooltip="true" />
         <el-table-column prop="blongdepartmentname" label="所属部门" min-width="140px" :show-overflow-tooltip="true" />
-        <el-table-column prop="glrname" label="管理人" :show-overflow-tooltip="true" />
+        <el-table-column prop="glrname" label="管理人" width="100px" :show-overflow-tooltip="true" />
         <el-table-column prop="cfd" label="存放地" min-width="140px" :show-overflow-tooltip="true" />
         <el-table-column prop="departmentname" label="所属部门" min-width="100px" :show-overflow-tooltip="true" />
-        <el-table-column prop="operatorName" label="操作人" min-width="100px">
+        <el-table-column prop="taskTime" label="记录时间" width="150px">
           <template slot-scope="scope">
-            <span v-if="scope.row.operatorName">{{ scope.row.operatorName }}</span>
-            <span v-else>——</span>
+            <div>{{ scope.row.taskTime | parseTime }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="taskTime" label="记录时间" width="150px">
+        <el-table-column prop="manualProcessingTime" label="处理时间" width="150px">
           <template slot-scope="scope">
-            <div>{{ scope.row.taskTime | parseTime }}</div>
+            <div>{{ scope.row.manualProcessingTime | parseTime }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="videoId" label="操作" align="center" width="100">
+        <el-table-column prop="manualProcessingMessage" label="处理信息" min-width="150px" :show-overflow-tooltip="true" />
+        <el-table-column prop="operatorName" label="操作人" min-width="100px">
+          <template slot-scope="scope">
+            <span v-if="scope.row.operatorName">{{ scope.row.operatorName }}</span>
+            <span v-else>——</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="videoId" label="操作" align="center" width="100" fixed="right">
           <template slot-scope="scope">
             <el-button v-if="scope.row.videoId" size="mini" @click="handleViewVideo(scope.row)">
               <i class="iconfont icon-yulan" />
@@ -114,7 +120,7 @@ export default {
   name: 'InOutLog',
   components: { pagination, crudOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '出入库日志', url: 'api/asset/getAbnormalDataCommitBySearch', crudMethod: { ...crudAsset }, optShow: {
+    return CRUD({ title: '出入库异常日志', url: 'api/asset/getAbnormalDataCommitBySearch', crudMethod: { ...crudAsset }, optShow: {
       add: false,
       edit: false,
       del: false,
@@ -282,4 +288,7 @@ export default {
 .el-table .el-button{
   padding: 7px 10px !important;
 }
+::v-deep .el-table__fixed-right{
+  background-color: #fff !important;
+}
 </style>
diff --git a/src/views/assetManage/inOutLog/index.vue b/src/views/assetManage/inOutLog/index.vue
index 678a3fb..fad7774 100644
--- a/src/views/assetManage/inOutLog/index.vue
+++ b/src/views/assetManage/inOutLog/index.vue
@@ -184,7 +184,7 @@
             </el-table-column>
             <el-table-column prop="startprice" label="单价" width="80px" align="right" :formatter="(row) => formatMoney(row.startprice)" />
             <el-table-column prop="capitalnum" label="数量" align="right" />
-            <el-table-column prop="videoId" label="操作" align="center" width="100">
+            <el-table-column prop="videoId" label="操作" align="center" width="100" fixed="right">
               <template slot-scope="scope">
                 <el-button v-if="scope.row.videoId" size="mini" @click="handleViewVideo(scope.row)">
                   <i class="iconfont icon-yulan" />
@@ -521,4 +521,7 @@ export default {
 .el-table .el-button{
   padding: 7px 10px !important;
 }
+::v-deep .el-table__fixed-right{
+  background-color: #fff !important;
+}
 </style>