From 81557cdd78e177df06f2858ae2b7da936112e585 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 25 Dec 2025 13:54:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B5=84=E4=BA=A7=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/asm/asset.vue    |  2 +-
 src/views/asm/assetlog.vue | 33 ++++++++++++++++++++++-----------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/views/asm/asset.vue b/src/views/asm/asset.vue
index 27cc0dd6..ac34d6f1 100644
--- a/src/views/asm/asset.vue
+++ b/src/views/asm/asset.vue
@@ -28,7 +28,7 @@
             :query="query"
             @row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}"
             >
-            <el-table-column label="卡片编号" prop="card_number" width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column label="资产ID" prop="id" width="200" show-overflow-tooltip></el-table-column>
             <el-table-column label="固定资产名称" prop="name" width="200" show-overflow-tooltip></el-table-column>
             <el-table-column label="规格型号" prop="specification" width="200" show-overflow-tooltip></el-table-column>
             <el-table-column label="资产类别" prop="cate_name" width="100" show-overflow-tooltip></el-table-column>
diff --git a/src/views/asm/assetlog.vue b/src/views/asm/assetlog.vue
index ff4d9d18..e04270eb 100644
--- a/src/views/asm/assetlog.vue
+++ b/src/views/asm/assetlog.vue
@@ -1,12 +1,13 @@
 <template>
     <el-container>
         <el-header>
-            <div class="left-panel"></div>
+            <div class="left-panel">
+                <el-button type="primary" @click="handleAdd('入库')" v-auth="'assetlog.create'">资产入库</el-button>
+            </div>
             <div class="right-panel">
-                <!-- <el-button type="primary" @click="handleAdd">新增</el-button> -->
                 <el-input
                     v-model="query.search"
-                    placeholder="设备信息等"
+                    placeholder="关键词"
                     clearable
                     @keyup.enter="$refs.table.refresh()"
                 ></el-input>
@@ -21,13 +22,13 @@
         <el-main class="nopadding">
             <scTable
             ref="table"
-            :apiObj="API.em.repair.list"
+            :apiObj="API.asm.assetlog.list"
             row-key="id"
             stripe
             :query="query"
-            @row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}"
+            @row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;drawerTitle=row.type}"
             >
-            <el-table-column label="设备" prop="equipment_fullname" width="300" show-overflow-tooltip></el-table-column>
+            <el-table-column label="操作类型" prop="type" width="100" show-overflow-tooltip></el-table-column>
             <el-table-column label="流程状态" width="300" show-overflow-tooltip>
                 <template #default="scope">
                                 <el-tag :type="actStateEnum[scope.row.ticket_?.act_state]?.type">
@@ -35,21 +36,31 @@
                     </el-tag>
             <el-tag type="info" effect="plain">{{ scope.row.ticket_?.state_.name }}</el-tag>
           </template>
-            </el-table-column>`
-            <el-table-column label="故障类别" prop="fault_cate" width="100" show-overflow-tooltip></el-table-column>`
-            <el-table-column label="故障描述" prop="fault_description"  show-overflow-tooltip></el-table-column>
-            <el-table-column label="维修人" prop="repair_user_name" width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column label="维修开始时间" prop="repair_start_time" width="200" show-overflow-tooltip></el-table-column>
+            </el-table-column>
+            <el-table-column label="启用日期" prop="start_date"  width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column label="保管部门" prop="keep_dept_name" width="160" show-overflow-tooltip></el-table-column>`
+            <el-table-column label="保管人" prop="keeper_name"  width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="资产条数" width="80" show-overflow-tooltip>
+                <template #default="scope">
+                    {{ scope.row.items?.length }}
+                </template>
+            </el-table-column>
+            <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip></el-table-column>
             </scTable>
         </el-main>
     </el-container>
+    <el-drawer :title="drawerTitle" v-model="drawerVisible" :size="'80%'" destroy-on-close>
+        <assetlogin_form :mode="mode" :t_id="t_id"></assetlogin_form>
+    </el-drawer>
 </template>
 <script setup>
 import { ref } from 'vue'
 import API from '@/api'
 import { actStateEnum, interveneTypeEnum } from "@/utils/enum.js";
+import assetlogin_form from './assetlogin_form.vue'
 const query = ref({});
 const drawerVisible = ref(false);
+const drawerTitle = ref('资产入库');
 const mode = ref('add');
 const t_id = ref(null);
 const handleAdd = () => {