From db071d2c2dd7cefd141b4c935cb8c9c0c327097e Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Thu, 20 Nov 2025 17:53:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=8F=B0=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/toolsManage/index.js                | 17 ++++++++
 src/views/toolsManage/toolsLedger/index.vue | 47 ++++++++++++++-------
 2 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/src/api/toolsManage/index.js b/src/api/toolsManage/index.js
index a9d40e0e..5ec8c9c6 100644
--- a/src/api/toolsManage/index.js
+++ b/src/api/toolsManage/index.js
@@ -143,3 +143,20 @@ export const updateByIdApi = (data = {}) => {
     data: data,
   })
 }
+
+// 工具详情-弹框
+export const getToolByTypeIdApi = (data = {}) => {
+  return request({
+    url: '/material-mall/toolLedger/getToolByTypeId',
+    method: 'GET',
+    params: data,
+  })
+}
+
+export const getToolByProApi = (data = {}) => {
+  return request({
+    url: '/material-mall/toolLedger/getToolByPro',
+    method: 'GET',
+    params: data,
+  })
+}
\ No newline at end of file
diff --git a/src/views/toolsManage/toolsLedger/index.vue b/src/views/toolsManage/toolsLedger/index.vue
index ec4a7a50..8b87be1a 100644
--- a/src/views/toolsManage/toolsLedger/index.vue
+++ b/src/views/toolsManage/toolsLedger/index.vue
@@ -191,7 +191,7 @@
 </template>
 
 <script>
-import { getToolLedgerListApi, getToolSelectApi } from '@/api/toolsManage'
+import { getToolLedgerListApi, getToolSelectApi, getToolByTypeIdApi, getToolByProApi } from '@/api/toolsManage'
 import { formatTime } from '@/utils/bonus'
 
 export default {
@@ -253,7 +253,7 @@ export default {
                   'span',
                   {
                     style: { color: '#409EFF', cursor: 'pointer' },
-                    on: { click: () => this.handleDialog(row, '1') },
+                    on: { click: () => this.handleDialog(row, '3') },
                   },
                   row.inNum,
                 )
@@ -285,7 +285,7 @@ export default {
                   'span',
                   {
                     style: { color: '#409EFF', cursor: 'pointer' },
-                    on: { click: () => this.handleDialog(row, '0') },
+                    on: { click: () => this.handleDialog(row, '2') },
                   },
                   row.repairNum,
                 )
@@ -315,8 +315,20 @@ export default {
       dialogColumns: [
         { label: '工具名称', prop: 'parentTypeName' },
         { label: '规格型号', prop: 'typeName' },
-        { label: '设备编码', prop: 'maCode' },
-        { label: '数量', prop: 'num' },
+        {
+          label: '设备编码',
+          prop: 'toolCode',
+          render: (h, { row }) => {
+            return row.toolCode ? h('span', {}, row.toolCode) : h('span', {}, '-')
+          },
+        },
+        {
+          label: '数量',
+          prop: 'totalNum',
+          render: (h, { row }) => {
+            return row.totalNum ? h('span', {}, row.totalNum) : h('span', {}, '1')
+          },
+        },
         { label: '所在工程', prop: 'proName' },
       ],
       dialogList: [],
@@ -401,13 +413,12 @@ export default {
       this.getSelectList()
     },
     handleDialog(row, type) {
-      console.log('🚀 ~ type:', type == 0)
-      this.dialogTitle =  '工具详情'
-      if (type == 0) {
-        this.dialogColumns = this.dialogColumns.filter(item => item.prop != 'proName')
+      this.dialogTitle = '工具详情'
+      if (type == 0 || type == 2) {
+        this.dialogColumns = this.dialogColumns.filter((item) => item.prop != 'proName')
         console.log('🚀 ~ this.dialogColumns:', this.dialogColumns)
       } else {
-        if (!this.dialogColumns.some(item => item.prop == 'proName')) {
+        if (!this.dialogColumns.some((item) => item.prop == 'proName')) {
           this.dialogColumns.push({ label: '所在工程', prop: 'proName' })
         }
       }
@@ -416,8 +427,7 @@ export default {
       setTimeout(() => {
         this.$refs.dialogForm.resetFields()
         this.dialogForm.typeId = row.typeId
-        this.dialogForm.startTime = this.queryParams.timeRange ? this.queryParams.timeRange[0] : ''
-        this.dialogForm.endTime = this.queryParams.timeRange ? this.queryParams.timeRange[1] : ''
+        this.dialogForm.type = type
         this.getDialogList()
       }, 100)
     },
@@ -438,9 +448,16 @@ export default {
       try {
         this.isLoading = true
         const params = { ...this.dialogForm }
-        const res = await getInventoryLogDetailsApi(params)
-        this.dialogList = res.data.rows || []
-        this.dlgTotal = res.data.total || 0
+        let res = null
+        if (this.dialogForm.type == '0' || this.dialogForm.type == '2') {
+          params.status = this.dialogForm.type
+          res = await getToolByTypeIdApi(params)
+        } else {
+          params.status = this.dialogForm.type == '3' ? '0' : '1'
+          res = await getToolByProApi(params)
+        }
+        this.dialogList = res.rows || []
+        this.dlgTotal = res.total || 0
       } catch (error) {
       } finally {
         this.isLoading = false