From ddd818f74d59c1fdeeed29714d660d7e49200c04 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 06 三月 2025 15:54:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/tools/EquipmentSelection.vue |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/components/tools/EquipmentSelection.vue b/src/components/tools/EquipmentSelection.vue
index 6553fb7..45db249 100644
--- a/src/components/tools/EquipmentSelection.vue
+++ b/src/components/tools/EquipmentSelection.vue
@@ -7,8 +7,8 @@
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
             <a-col :md="5" :sm="4">
-              <a-form-item label="璁惧缂栫爜">
-                <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮�" v-model="queryParam.num" />
+              <a-form-item label="缁熶竴缂栫爜">
+                <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜" v-model="queryParam.num" />
               </a-form-item>
             </a-col>
             <a-col :md="5" :sm="4">
@@ -86,7 +86,7 @@
       queryParam: {},
       columns: [
         {
-          title: '璁惧缂栫爜',
+          title: '缁熶竴缂栫爜',
           align: 'center',
           dataIndex: 'num',
           width: 120,
@@ -99,13 +99,6 @@
           width: 120,
           ellipsis: true
         },
-        {
-          title: '璧勪骇缂栫爜',
-          align: 'center',
-          dataIndex: 'assetNumber',
-          width: 120
-        },
-
         {
           title: '鐗圭璁惧',
           align: 'center',
@@ -153,7 +146,7 @@
       ],
       selectColumns: [
         {
-          title: '璁惧缂栫爜',
+          title: '缁熶竴缂栫爜',
           align: 'center',
           dataIndex: 'num',
           width: 120,

--
Gitblit v1.9.3