From c7619152dfb1e07242323cba195832eb9b3a509e Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期日, 24 十二月 2023 14:09:09 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
index 5346318..bccdd0f 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
@@ -4,7 +4,7 @@
<div style="width: 100%; background-color: #fff" class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :md="9" :sm="9">
+ <a-col :md="7" :sm="7">
<a-form-item label="鏃堕棿">
<a-range-picker @change="dateParamChange" v-model="dates" format="YYYY-MM-DD HH:mm:ss"/>
</a-form-item>
@@ -19,16 +19,23 @@
<a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" v-model="queryParams.equipmentName"></a-input>
</a-form-item>
</a-col>
- <a-col :md="2" :sm="3" :xs="3">
- <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
- </a-col>
<a-col :md="2" :sm="2" :xs="2">
- <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
+ <a-space>
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
+ <a-button type="primary" @click="handleExportXls('缁翠慨浼戠彮绠＄悊')" icon="download">瀵煎嚭</a-button>
+ </a-space>
</a-col>
- <a-col :lg="2" :md="3" :sm="3" :xs="3">
- <!--<a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>-->
- <a-button type="primary" @click="handleExportXls('缁翠慨浼戠彮绠＄悊')" icon="download">瀵煎嚭</a-button>
- </a-col>
+ <!--<a-col :md="2" :sm="3" :xs="3">-->
+ <!--<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>-->
+ <!--</a-col>-->
+ <!--<a-col :md="2" :sm="2" :xs="2">-->
+ <!--<a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>-->
+ <!--</a-col>-->
+ <!--<a-col :lg="2" :md="3" :sm="3" :xs="3">-->
+ <!--<!–<a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>–>-->
+ <!--<a-button type="primary" @click="handleExportXls('缁翠慨浼戠彮绠＄悊')" icon="download">瀵煎嚭</a-button>-->
+ <!--</a-col>-->
</a-row>
</a-form>
</div>
@@ -92,10 +99,12 @@
import JEllipsis from '@/components/jeecg/JEllipsis'
import Tooltip from 'ant-design-vue/es/tooltip'
import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
+ import ACol from 'ant-design-vue/es/grid/Col'
export default {
name: 'DeviceRepairList',
mixins: [JeecgListMixin],
components: {
+ ACol,
Tooltip,
DeviceRepairModel,
DeviceRepairModelAdd,
--
Gitblit v1.9.3