From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/modules/malfunctionRepair/EquipmentList.vue | 86 +++++++++++++++++++++++++++++++++++++------
1 files changed, 74 insertions(+), 12 deletions(-)
diff --git a/src/views/eam/modules/malfunctionRepair/EquipmentList.vue b/src/views/eam/modules/malfunctionRepair/EquipmentList.vue
index 04bc746..e488ada 100644
--- a/src/views/eam/modules/malfunctionRepair/EquipmentList.vue
+++ b/src/views/eam/modules/malfunctionRepair/EquipmentList.vue
@@ -11,6 +11,53 @@
>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
+ <div class="table-page-search-wrapper">
+ <a-form
+ layout="inline"
+ @keyup.enter.native="searchQuery"
+ >
+ <a-row :gutter="24">
+ <a-col
+ :md="6"
+ :sm="8"
+ >
+ <a-form-item label="缁熶竴缂栧彿">
+ <a-input
+ placeholder="璇疯緭鍏ョ粺涓�缂栧彿"
+ v-model="queryParam.num"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+
+ <a-col
+ :md="6"
+ :sm="8"
+ >
+ <a-form-item label="璁惧鍚嶇О">
+ <a-input
+ placeholder="璇疯緭鍏ヨ澶囧悕绉版绱�"
+ v-model="queryParam.name"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="8"
+ >
+ <a-button
+ type="primary"
+ @click="searchQuery"
+ icon="search"
+ >鏌ヨ</a-button>
+ <a-button
+ @click="searchReset"
+ icon="reload"
+ style="margin-left:8px;"
+ >閲嶇疆</a-button>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
<a-table
ref="table"
size="middle"
@@ -90,7 +137,7 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'num',
},
@@ -123,13 +170,6 @@
methods: {
-
- searchQuery() {
- this.loadData(1);
- },
- searchReset() {
- this.loadData(1)
- },
list() {
this.selectedRowKeys = [];
this.selectedRowRecord = [];
@@ -173,6 +213,30 @@
handleCancel() {
this.close();
+ },
+ loadData(arg) {
+ if (!this.url.list) {
+ this.$message.error('璇疯缃畊rl.list灞炴��!')
+ return
+ }
+ //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
+ if (arg === 1) {
+ this.ipagination.current = 1
+ }
+ this.onClearSelected()
+ this.queryParam.equipmentStatus = '1';
+ var params = this.getQueryParams()//鏌ヨ鏉′欢
+ this.loading = true
+ getAction(this.url.list, params).then((res) => {
+ if (res.success) {
+ this.dataSource = res.result.records
+ this.ipagination.total = res.result.total
+ }
+ if (res.code === 510) {
+ this.$message.warning(res.message)
+ }
+ this.loading = false
+ })
},
},
@@ -227,8 +291,7 @@
height: 90% !important;
overflow-y: hidden;
}
-
-/deep/ .notshow {
+ .notshow {
display: none;
}
@@ -247,8 +310,7 @@
.dataUnKnow {
color: #1890ff;
}
-
-/deep/ .frozenRowClass {
+ .frozenRowClass {
color: #c9c9c9;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3