From b7ad54294da15dccc59f7b6c879af3e000024d9d Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 19 六月 2025 17:51:30 +0800
Subject: [PATCH] 1、全局树组件多选设备抽屉组件增加点击树节点名称也可以选中当前节点 2、设备监控页面布局图查看设备详情时首次进入清空上一次设备信息（由于数据为定时刷新不能每次获取数据均清空） 3、设备类型管理页面调整设备类型图片尺寸以解决表格错行问题 4、设备管理页面添加或编辑设备弹窗选择设备时增加点击行即可选中

---
 src/views/tms/modules/inboundOrder/JSelectSharpenListModal.vue |   52 ++++++++++++++++++++++------------------------------
 1 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/src/views/tms/modules/inboundOrder/JSelectSharpenListModal.vue b/src/views/tms/modules/inboundOrder/JSelectSharpenListModal.vue
index f83c694..0b22be9 100644
--- a/src/views/tms/modules/inboundOrder/JSelectSharpenListModal.vue
+++ b/src/views/tms/modules/inboundOrder/JSelectSharpenListModal.vue
@@ -60,7 +60,11 @@
 export default {
   name: 'JSelectToolingModal',
   components: {},
-  props: {},
+  props: {
+    classifyId:{
+        type:String
+      }
+  },
   data() {
     return {
       queryParam: {},
@@ -78,43 +82,37 @@
         {
           title: '宸ュ叿缂栫爜',
           align: 'center',
-          dataIndex: 'toolingNum',
+          dataIndex: 'toolCode',
           sorter: true,
         },
         {
-          title: '宸ュ叿鍚嶇О',
-          align: 'center',
-          dataIndex: 'toolingName',
-          sorter: true,
-        },
-        {
-          title: '鍞竴缂栫爜',
+          title: '宸ュ叿缂栧彿',
           align: 'center',
           dataIndex: 'onlyCode',
           sorter: true,
         },
         {
-          title: '鍏ュ簱鏁伴噺',
+          title: '宸ュ叿鍚嶇О',
           align: 'center',
-          dataIndex: 'inStorageQuantity',
+          dataIndex: 'chineseName',
           sorter: true,
         },
         {
-          title: '宸ュ叿鍒嗙被',
+          title: '宸ュ叿绫诲瀷',
           align: 'center',
-          dataIndex: 'toolingCategoryName',
+          dataIndex: 'applicationTypeName',
           sorter: true,
         },
         {
-          title: '瑙勬牸鍨嬪彿',
+          title: '鍨嬪彿/鍥惧彿',
           align: 'center',
-          dataIndex: 'model',
+          dataIndex: 'toolModel',
           sorter: true,
         },
-        {
-          title: '鍗曚綅',
+         {
+          title: '鏁伴噺',
           align: 'center',
-          dataIndex: 'unitName',
+          dataIndex: 'quantity',
           sorter: true,
         },
       ],
@@ -135,17 +133,14 @@
         showSizeChanger: true,
         total: 0,
       },
-      isorter: {
-        column: 'num',
-        order: 'desc',
-      },
       departTree: [],
       visible: false,
       loading: false,
       url: {
         // list: '/base/tooling/list',
-         list: '/sharpen/sharpenDetail/querySharpenList',
+         list: '/tms/toolLedgerDetail/querySharpenTool',
       },
+      classifyId:''
     }
   },
   computed: {
@@ -175,11 +170,12 @@
       let that = this
       this.loading = true
       let params = this.getQueryParams() //鏌ヨ鏉′欢
-      params["sharpenStatus"] = 1
+      params.status = "5"
+      params.classifyId = this.classifyId
       await getAction(this.url.list, params).then((res) => {
         if (res.success) {
           for (let i = 0; i < res.result.records.length; i++) {
-            if (that.oldSlelectRows.indexOf(res.result.records[i].toolingId) > -1) {
+            if (that.oldSlelectRows.indexOf(res.result.records[i].id) > -1) {
               res.result.records[i].distable = true
             } else {
               res.result.records[i].distable = false
@@ -200,7 +196,7 @@
       this.loadData(1)
     },
     getQueryParams() {
-      let param = Object.assign({}, this.queryParam, this.isorter)
+      let param = Object.assign({}, this.queryParam)
       param.field = this.getQueryField()
       param.pageNo = this.ipagination.current
       param.pageSize = this.ipagination.pageSize
@@ -228,10 +224,6 @@
     },
     handleTableChange(pagination, filters, sorter) {
       //TODO 绛涢��
-      if (Object.keys(sorter).length > 0) {
-        this.isorter.column = sorter.field
-        this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc'
-      }
       this.ipagination = pagination
       this.loadData()
     },

--
Gitblit v1.9.3