From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
index f4c5aa5..5346318 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
@@ -1,5 +1,5 @@
<template>
- <a-card :bordered="false" class="device_list">
+ <div :bordered="false" class="device_list">
<!-- 鏌ヨ鍖哄煙 -->
<div style="width: 100%; background-color: #fff" class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -26,7 +26,8 @@
<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="exportExcel" icon="download">瀵煎嚭</a-button>-->
+ <a-button type="primary" @click="handleExportXls('缁翠慨浼戠彮绠＄悊')" icon="download">瀵煎嚭</a-button>
</a-col>
</a-row>
</a-form>
@@ -63,12 +64,11 @@
</a-table>
</div>
<!-- table鍖哄煙-end -->
- <device-repair-model ref="modalForm" @ok="modalFormOk"></device-repair-model>
+ <device-repair-model ref="modalForm" :equipmentId="queryParams.equipmentId" @ok="modalFormOk"></device-repair-model>
<!--<device-repair-model-add ref="modalFormadd" @ok="modalFormOk"></device-repair-model-add>-->
<device-repair-model-edit ref="modalFormedit" @ok="modalFormOk"></device-repair-model-edit>
<!--<repair-model ref="repairModelFrom" @ok="modalFormOk">0</repair-model>-->
-
- </a-card>
+ </div>
</template>
<script>
@@ -163,6 +163,7 @@
list: '/mdc/mdcEquipmentRepair/pageList',
deleteBatch: '/mdc/mdcEquipmentRepair/delete',
getEquipmentByPid: '/mdc/mdcequipment/getEquipmentByPid',
+ exportXlsUrl:'/mdc/mdcEquipmentRepair/exportXls'
}
}
},
@@ -180,10 +181,13 @@
this.queryParamEquip.equipmentId = val.equipmentId
} else {
this.queryParamEquip.parentId = val.key
- this.queryParams.equipmentId = ''
+ this.queryParams.equipmentId =''
}
- this.searchQuery()
+ }else{
+ this.queryParams.equipmentId=''
+ this.queryParamEquip.parentId = ""
}
+ this.searchQuery()
},
nodePeople(val){
if (JSON.stringify(val) != '{}') {
@@ -384,10 +388,8 @@
if(this.queryParams.typeTree == "1"){
this.queryParams.parentId = this.queryParamEquip.parentId
// this.queryParams.equipmentId = this.queryParamEquip.equipmentId
-
}else{
this.queryParams.parentId = this.queryParamPeople.parentId
-
// this.queryParams.equipmentId = ""
}
this.dataSource = [];
@@ -541,7 +543,7 @@
$("#DeviceList").table2excel({
exclude: ".noExl",
name: "Excel Document Name",
- filename: "璁惧缁翠慨璇︽儏",
+ filename: "缁翠慨浼戠彮绠＄悊",
exclude_img: true,
fileext: ".xls",
exclude_links: true,
--
Gitblit v1.9.3