From b8fd394b8da06c07c077c6f018de9a1f6c62b98c Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 17 四月 2025 14:30:38 +0800
Subject: [PATCH] art: 设备管理-点检工单-查询，列表修改
---
src/views/eam/maintenance/EamInspectionOrderList.vue | 73 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/src/views/eam/maintenance/EamInspectionOrderList.vue b/src/views/eam/maintenance/EamInspectionOrderList.vue
index a64e3cd..3bf317a 100644
--- a/src/views/eam/maintenance/EamInspectionOrderList.vue
+++ b/src/views/eam/maintenance/EamInspectionOrderList.vue
@@ -4,36 +4,30 @@
<div class="table-page-search-wrapper" v-if="isDisplayOperation">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label="宸ュ崟鍙�">
<a-input placeholder="璇疯緭鍏ュ伐鍗曞彿" v-model="queryParam.orderNum"></a-input>
</a-form-item>
</a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="璁惧ID">
- <a-input placeholder="璇疯緭鍏ヨ澶嘔D" v-model="queryParam.equipmentId"></a-input>
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
+ <a-form-item label="璁惧缂栧彿">
+ <lx-search-equipment-select placeholder="璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储" v-model="queryParam.equipmentId"></lx-search-equipment-select>
</a-form-item>
</a-col>
- <template v-if="toggleSearchStatus">
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鐐规鏃ユ湡">
- <j-date placeholder="璇烽�夋嫨鐐规鏃ユ湡" v-model="queryParam.inspectionDate"></j-date>
- </a-form-item>
- </a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鐐规鏃堕棿">
- <j-date placeholder="璇烽�夋嫨鐐规鏃堕棿" v-model="queryParam.operateTime"></j-date>
- </a-form-item>
- </a-col>
- </template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="璁″垝鐐规鏃ユ湡">
+ <a-range-picker v-model="queryParam.inspectionDateRange" @change="onInspectionDateChange" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+ </a-form-item>
+ </a-col>
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鐐规鐘舵��">
+ <j-dict-select-tag placeholder="璇烽�夋嫨鐐规鐘舵��" dict-code="inspection_status" v-model="queryParam.inspectionStatus" />
+ </a-form-item>
+ </a-col>
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
- <a @click="handleToggleSearch" style="margin-left: 8px">
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
- </a>
+ <a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
</span>
</a-col>
</a-row>
@@ -152,11 +146,13 @@
import EamInspectionOrderModal from './modules/EamInspectionOrderModal'
import EamInspectionOrderModalXq from './modules/EamInspectionOrderModalXq.vue'
import { deleteAction, getAction } from '@api/manage'
+ import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
export default {
name: 'EamInspectionOrderList',
mixins: [JeecgListMixin, mixinDevice],
components: {
+ LxSearchEquipmentSelect,
EamInspectionOrderModal,
EamInspectionOrderModalXq
},
@@ -190,10 +186,15 @@
{
title: '璁惧缂栧彿',
align: 'center',
- dataIndex: 'equipmentId_dictText'
+ dataIndex: 'equipmentCode'
},
{
- title: '鏍囧噯缂栫爜',
+ title: '璁惧鍚嶇О',
+ align: 'center',
+ dataIndex: 'equipmentName'
+ },
+ {
+ title: '鏍囧噯鍚嶇О',
align: 'center',
dataIndex: 'standardId_dictText'
},
@@ -206,7 +207,7 @@
}
},
{
- title: '鐐规杩囨湡鏃堕棿',
+ title: '鐐规杩囨湡鏃ユ湡',
align: 'center',
dataIndex: 'expirationTime',
customRender: function(text) {
@@ -224,30 +225,24 @@
dataIndex: 'inspectionStatus_dictText'
},
{
- title: '鐐规鏃堕棿',
- align: 'center',
- dataIndex: 'operateTime',
- customRender: function(text) {
- return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
- }
- },
- {
title: '鐐规浜�',
align: 'center',
dataIndex: 'operator_dictText'
},
{
+ title: '鐐规鏃堕棿',
+ align: 'center',
+ dataIndex: 'operateTime',
+ },
+ {
title: '鐝粍闀跨‘璁�',
align: 'center',
- dataIndex: 'confirmUser'
+ dataIndex: 'confirmUser_dictText'
},
{
title: '纭鏃堕棿',
align: 'center',
dataIndex: 'confirmTime',
- customRender: function(text) {
- return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
- }
}
],
url: {
@@ -413,7 +408,11 @@
}
})
}
- }
+ },
+ onInspectionDateChange: function(value, dateString) {
+ this.queryParam.inspectionDateBegin = dateString[0]
+ this.queryParam.inspectionDateEnd = dateString[1]
+ },
}
}
</script>
--
Gitblit v1.9.3