From ae3ad906ed4b09f72fc716957c4dbbe16341b38f Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 26 十二月 2023 11:39:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/EquipmentListOfTester.vue | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/views/eam/EquipmentListOfTester.vue b/src/views/eam/EquipmentListOfTester.vue
index 30d3c6f..8b39870 100644
--- a/src/views/eam/EquipmentListOfTester.vue
+++ b/src/views/eam/EquipmentListOfTester.vue
@@ -121,6 +121,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">
@@ -430,7 +445,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 +538,11 @@
dataIndex: 'equipmentCategoryId_dictText',
},
{
+ title: '鏄惁鐢熶骇绾胯澶�',
+ align: "center",
+ dataIndex: 'isLineEquip_dictText',
+ },
+ {
title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'num',
@@ -582,6 +602,16 @@
align: "center",
dataIndex: 'technologyStatusVerificationType_dictText',
},
+ {
+ title: '鐢熶骇绾跨紪鍙�',
+ align: "center",
+ dataIndex: 'lineId_dictText',
+ },
+ {
+ title: '涓昏澶�?',
+ align: "center",
+ dataIndex: 'isMeta_dictText',
+ },
// {
// title: '宸ュ尯',
// align: "center",
--
Gitblit v1.9.3