From 997835429a1d66643364091e8437ebbbeb8ff97a Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
index 2359b22..c993065 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
@@ -6,7 +6,7 @@
<a-row :gutter="24">
<a-col :md="9" :sm="9">
<a-form-item label="鏃堕棿">
- <a-range-picker @change="dateParamChange" v-model="dates" format="YYYY-MM-DD HH:mm:ss" showTime/>
+ <a-range-picker @change="dateParamChange" v-model="dates" format="YYYY-MM-DD HH:mm:ss"/>
</a-form-item>
</a-col>
<a-col :md="4" :sm="4">
@@ -26,17 +26,18 @@
<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>
</div>
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator" style="display: inline;">
- <a-button v-has="'user.addrequip'" @click="handleAdd" type="primary" icon="plus">缁翠慨鏂板
+ <a-button @click="handleAdd" type="primary" icon="plus">鏂板
</a-button>
- <a-button v-has="'user.add'" @click="handleAddXIU" type="primary" icon="plus">浼戠彮鏂板
- </a-button>
+ <!--<a-button v-has="'user.add'" @click="handleAddXIU" type="primary" icon="plus">浼戠彮鏂板-->
+ <!--</a-button>-->
</div>
<!-- table鍖哄煙-begin -->
@@ -63,11 +64,10 @@
</a-table>
</div>
<!-- table鍖哄煙-end -->
- <device-repair-model ref="modalForm" @ok="modalFormOk"></device-repair-model>
- <device-repair-model-add ref="modalFormadd" @ok="modalFormOk"></device-repair-model-add>
+ <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"></repair-model>-->
-
+ <!--<repair-model ref="repairModelFrom" @ok="modalFormOk">0</repair-model>-->
</a-card>
</template>
@@ -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 = [];
@@ -481,7 +483,7 @@
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
// that.$message.success(res.message);
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:res.message
});
@@ -495,16 +497,19 @@
}
});
},
+ /**
+ * 鎵撳紑鏂板缁翠慨鎴栦紤鐝脊绐�
+ */
handleAdd() {
this.$refs.modalForm.add(this.node)
this.$refs.modalForm.title = '鏂板'
this.$refs.modalForm.disableSubmit = false
},
- handleAddXIU() {
- this.$refs.modalFormadd.add()
- this.$refs.modalFormadd.title = '鏂板'
- this.$refs.modalFormadd.disableSubmit = false
- },
+ // handleAddXIU() {
+ // this.$refs.modalFormadd.add()
+ // this.$refs.modalFormadd.title = '鏂板'
+ // this.$refs.modalFormadd.disableSubmit = false
+ // },
pQuery(parentId) {
this.queryParam.parentId = parentId[0]
if(this.selectedRowKeys.length >= 1) {
@@ -538,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