From 5a07da2b852ff4b73036a364ebd4c8077ab33223 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期四, 28 十二月 2023 11:17:03 +0800
Subject: [PATCH] 提交
---
src/views/eam/EquipmentListOfAll.vue | 69 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 10 deletions(-)
diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue
index bd17f65..6863712 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">
@@ -226,6 +258,7 @@
</a-upload>
<a-button :disabled="selectedRowKeys.length==0" @click="handleUpdateABC" type="primary" icon="font-colors" v-has="'equipmentAccount:add&delete&import&Edit'">ABC鏍囪瘑鍙樻洿</a-button>
<a-button :disabled="selectedRowKeys.length==0" @click="handleUpdateWarranty" type="primary" icon="calendar" v-has="'equipmentAccount:add&delete&import&Edit'">璐ㄤ繚鏈熷彉鏇�</a-button>
+ <a-button @click="handleUpdateKeyEquipment" type="primary" icon="calendar" v-has="'equipmentAccount:add&delete&import&Edit'">璁剧疆鍏抽敭璁惧鏍囪瘑</a-button>
</div>
<!-- table鍖哄煙-begin -->
<div>
@@ -236,7 +269,7 @@
<a-table
ref="table"
- size="middle"
+ size="small"
bordered
rowKey="id"
:scroll="{x:true}"
@@ -430,7 +463,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>
@@ -449,6 +482,7 @@
<aBC-update-edit-model @ok="modalFormOk" :updateList="selectionRows" ref="updateABC"></aBC-update-edit-model>
<warranty-update-model :updateList="selectionRows" ref="updateWarranty"></warranty-update-model>
<EquipmentSparePartsModal ref="modalFormSpareParts" @ok="modalFormOk" />
+ <key-equipment-update-model @ok="modalFormOk" :updateList="selectionRows" ref="keyEquipmentUpdate"></key-equipment-update-model>
</a-card>
</template>
@@ -469,7 +503,7 @@
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
- import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
+ import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
import StandardOfInspection from './modules/equipmentNew/StandardOfInspection.vue'
@@ -477,6 +511,8 @@
import DailyMaintenanceList from './modules/equipmentNew/DailyMaintenanceList.vue'
import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue'
import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
+import KeyEquipmentUpdateModel from './modules/equipmentNew/edit/KeyEquipmentUpdateModel.vue'
+
export default {
name: "EquipmentList",
mixins:[JeecgListMixin,mixinDevice],
@@ -500,6 +536,7 @@
DailyMaintenanceList,
SecondMaintenanceList,
ThirdMaintenanceList,
+ KeyEquipmentUpdateModel,
},
data () {
return {
@@ -521,6 +558,11 @@
title: '璁惧绫诲瀷',
align: "center",
dataIndex: 'equipmentCategoryId_dictText',
+ },
+ {
+ title: '鏄惁鐢熶骇绾胯澶�',
+ align: "center",
+ dataIndex: 'isLineEquip_dictText',
},
{
title: '缁熶竴缂栫爜',
@@ -583,11 +625,16 @@
dataIndex: 'technologyStatusVerificationType_dictText',
},
- // {
- // title: '宸ュ尯',
- // align: "center",
- // dataIndex: 'equipmentUda1',
- // },
+ {
+ title: '鐢熶骇绾跨紪鍙�',
+ align: "center",
+ dataIndex: 'lineId_dictText',
+ },
+ {
+ title: '涓昏澶�?',
+ align: "center",
+ dataIndex: 'isMeta_dictText',
+ },
// {
// title: '瀹夊叏閰嶇疆',
// align: "center",
@@ -920,8 +967,10 @@
},
handleEditSpareParts(record){
this.$refs.modalFormSpareParts.edit(record);
- }
-
+ },
+ handleUpdateKeyEquipment(){
+ this.$refs.keyEquipmentUpdate.add();
+ },
}
}
</script>
--
Gitblit v1.9.3