From 399e6c1b3925f4241e6b1cef6ffe055b84fb53f6 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 十二月 2023 17:45:58 +0800
Subject: [PATCH] 修改

---
 src/views/eam/EquipmentListOfAll.vue |   56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue
index bd17f65..db2fdd2 100644
--- a/src/views/eam/EquipmentListOfAll.vue
+++ b/src/views/eam/EquipmentListOfAll.vue
@@ -3,6 +3,23 @@
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24" style="margin-bottom: 1%;">
+          <a-col
+          :span="24"
+          >
+          <a-form-item 
+          label="缁熶竴缂栧彿缇�"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          >
+              <a-textarea
+                placeholder="璇疯緭鍏ユ墍鏈夌粺涓�缂栫爜,椤荤敤绌烘牸闅斿紑,鍚﹀垯鍙兘鏌ヨ鍑洪敊璇俊鎭�"
+                v-model="queryParam.nums"
+                :auto-size="{ minRows: 2, maxRows:2 }"
+              ></a-textarea>
+            </a-form-item>
+          </a-col>
+        </a-row>
         <a-row :gutter="24">
           <a-col :span="6">
             <a-form-item
@@ -121,6 +138,21 @@
               />
             </a-form-item>
           </a-col>
+          <a-col :span="6">
+            <a-form-item
+              label="鏄惁鐢熶骇绾胯澶�"
+              :labelCol="labelCol"
+            :wrapperCol="wrapperCol"
+            >
+              <j-dict-select-tag
+                allow-clear
+                placeholder="璇烽�夋嫨"
+                :triggerChange="true"
+                dictCode="is_product"
+                v-model="queryParam.isLineEquip"
+              />
+            </a-form-item>
+          </a-col>
         </a-row>
         <a-row :gutter="24">
           <a-col :span="6">
@@ -236,7 +268,7 @@
 
       <a-table
         ref="table"
-        size="middle"
+        size="small"
         bordered
         rowKey="id"
         :scroll="{x:true}"
@@ -430,7 +462,7 @@
       <a-tab-pane tab="ABC鏍囪瘑鍙樻洿璁板綍" key="5" forceRender>
         <equipment-update-ABC-list :mainId="selectedMainId" />
       </a-tab-pane>
-      <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇磋褰�" key="6" forceRender>
+      <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇�" key="6" forceRender>
         <equipment-update-warranty-list :mainId="selectedMainId" />
       </a-tab-pane>
       <a-tab-pane tab="鏃ヤ繚鏍囧噯" key="7" forceRender>
@@ -523,6 +555,11 @@
           dataIndex: 'equipmentCategoryId_dictText',
         },
         {
+          title: '鏄惁鐢熶骇绾胯澶�',
+          align: "center",
+          dataIndex: 'isLineEquip_dictText',
+        },
+        {
           title: '缁熶竴缂栫爜',
           align: "center",
           dataIndex: 'num',
@@ -583,11 +620,16 @@
           dataIndex: 'technologyStatusVerificationType_dictText',
         },
        
-        // {
-        //   title: '宸ュ尯',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda1',
-        // },
+        {
+          title: '鐢熶骇绾跨紪鍙�',
+          align: "center",
+          dataIndex: 'lineId_dictText',
+        },
+        {
+          title: '涓昏澶�?',
+          align: "center",
+          dataIndex: 'isMeta_dictText',
+        },
         // {
         //   title: '瀹夊叏閰嶇疆',
         //   align: "center",

--
Gitblit v1.9.3